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

* Verify that all variables in a Nix expression are defined.

Browse source
This commit is contained in:
Eelco Dolstra 2004-02-03 14:45:34 +00:00
parent 1c9c0a5a46
commit c4f7ae4aa5
4 changed files with 92 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libexpr/eval.cc
View file

@ -64,30 +64,30 @@ ATerm expandRec(ATerm e, ATermList rbnds, ATermList nrbnds)
/* Create the substitution list. */
ATermMap subs;
for (ATermIterator i(rbnds); i; ++i) {
string s;
ATerm name;
Expr e2;
if (!(atMatch(m, *i) >> "Bind" >> s >> e2))
if (!(atMatch(m, *i) >> "Bind" >> name >> e2))
abort(); /* can't happen */
subs.set(s, ATmake("Select(<term>, <str>)", e, s.c_str()));
subs.set(name, ATmake("Select(<term>, <term>)", e, name));
}
/* Create the non-recursive set. */
ATermMap as;
for (ATermIterator i(rbnds); i; ++i) {
string s;
ATerm name;
Expr e2;
if (!(atMatch(m, *i) >> "Bind" >> s >> e2))
if (!(atMatch(m, *i) >> "Bind" >> name >> e2))
abort(); /* can't happen */
as.set(s, substitute(subs, e2));
as.set(name, substitute(subs, e2));
}
/* Copy the non-recursive bindings. !!! inefficient */
for (ATermIterator i(nrbnds); i; ++i) {
string s;
ATerm name;
Expr e2;
if (!(atMatch(m, *i) >> "Bind" >> s >> e2))
if (!(atMatch(m, *i) >> "Bind" >> name >> e2))
abort(); /* can't happen */
as.set(s, e2);
as.set(name, e2);
}
return makeAttrs(as);