wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

* Added parsing of manifests in ATerm format.

Browse source
This commit is contained in:
Eelco Dolstra 2010-04-19 12:10:04 +00:00
parent b7ff69eb7c
commit 55b5ddd3ca
3 changed files with 165 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libexpr/get-drvs.cc
View file

@ -7,7 +7,7 @@ namespace nix {
string DrvInfo::queryDrvPath(EvalState & state) const
{
if (drvPath == "") {
if (drvPath == "" && attrs) {
Bindings::iterator i = attrs->find(state.sDrvPath);
PathSet context;
(string &) drvPath = i != attrs->end() ? state.coerceToPath(i->second, context) : "";
@ -18,7 +18,7 @@ string DrvInfo::queryDrvPath(EvalState & state) const
string DrvInfo::queryOutPath(EvalState & state) const
{
if (outPath == "") {
if (outPath == "" && attrs) {
Bindings::iterator i = attrs->find(state.sOutPath);
PathSet context;
(string &) outPath = i != attrs->end() ? state.coerceToPath(i->second, context) : "";
@ -29,7 +29,9 @@ string DrvInfo::queryOutPath(EvalState & state) const
MetaInfo DrvInfo::queryMetaInfo(EvalState & state) const
{
MetaInfo meta;
if (metaInfoRead) return meta;
(bool &) metaInfoRead = true;
Bindings::iterator a = attrs->find(state.sMeta);
if (a == attrs->end()) return meta; /* fine, empty meta information */
@ -50,7 +52,7 @@ MetaInfo DrvInfo::queryMetaInfo(EvalState & state) const
for (unsigned int j = 0; j < i->second.list.length; ++j)
value.stringValues.push_back(state.forceStringNoCtx(*i->second.list.elems[j]));
} else continue;
meta[i->first] = value;
((MetaInfo &) meta)[i->first] = value;
}
return meta;
@ -66,9 +68,11 @@ MetaValue DrvInfo::queryMetaInfo(EvalState & state, const string & name) const
void DrvInfo::setMetaInfo(const MetaInfo & meta)
{
throw Error("not implemented");
metaInfoRead = true;
this->meta = meta;
#if 0
ATermMap metaAttrs;
Value * metaAttrs = state.allocValues(1);
foreach (MetaInfo::const_iterator, i, meta) {
Expr e;
switch (i->second.type) {

5
src/libexpr/get-drvs.hh
View file

@ -29,6 +29,9 @@ struct DrvInfo
private:
string drvPath;
string outPath;
bool metaInfoRead;
MetaInfo meta;
public:
string name;
@ -38,6 +41,8 @@ public:
/* !!! make this private */
Bindings * attrs;
DrvInfo() : metaInfoRead(false) { };
string queryDrvPath(EvalState & state) const;
string queryOutPath(EvalState & state) const;
MetaInfo queryMetaInfo(EvalState & state) const;