nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-27 20:51:00 +01:00
Code Activity

* Cleanup.

Browse source
This commit is contained in:
Eelco Dolstra 2003-07-04 15:29:58 +00:00
parent 207ff2caf0
commit 01b34fe584
3 changed files with 9 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/eval.cc
View file

@ -106,7 +106,7 @@ static void runProgram(const string & program, Environment env)
} catch (exception & e) {
cerr << format("build error: %1%\n") % e.what();
}
  }
_exit(1);
}
@ -159,38 +159,6 @@ Hash hashTerm(ATerm t)
}
#if 0
/* Evaluate a list of arguments into normal form. */
void evalArgs(ATermList args, ATermList & argsNF, Environment & env)
{
argsNF = ATempty;
while (!ATisEmpty(args)) {
ATerm eName, eVal, arg = ATgetFirst(args);
if (!ATmatch(arg, "Tup(<term>, <term>)", &eName, &eVal))
throw badTerm("invalid argument", arg);
string name = evalString(eName);
eVal = evalValue(eVal);
char * s;
if (ATmatch(eVal, "Str(<str>)", &s)) {
env[name] = s;
} else if (ATmatch(eVal, "Hash(<str>)", &s)) {
env[name] = queryValuePath(parseHash(s));
} else throw badTerm("invalid argument value", eVal);
argsNF = ATinsert(argsNF,
ATmake("Tup(Str(<str>), <term>)", name.c_str(), eVal));
args = ATgetNext(args);
}
argsNF = ATreverse(argsNF);
}
#endif
struct RStatus
{
/* !!! the comparator of this hash should match the semantics of
@ -362,7 +330,7 @@ static FState realise(RStatus & status, FState fs)
return nf;
}
throw badTerm("bad file system state expression", fs);
throw badTerm("bad fstate expression", fs);
}