maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Started integrating the new evaluation model into Nix.

Browse source 
* Cleaned up command-line syntax.
This commit is contained in:
Eelco Dolstra 2003-06-17 21:12:58 +00:00
parent 7a96da3627
commit 34fcf5fa0c
5 changed files with 143 additions and 679 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/eval.cc
View file

@ -279,7 +279,7 @@ Expr evalValue(Expr e)
string fn = queryValuePath(evalHash(e2));
ATerm e3 = ATreadFromNamedFile(fn.c_str());
if (!e3) throw Error("reading aterm from " + fn);
return e3;
return evalValue(e3);
}
/* Execution primitive. */
@ -298,8 +298,8 @@ Expr evalValue(Expr e)
evalArgs(args, argsNF, env);
Hash sourceHash = hashExpr(
ATmake("Exec(Str(<str>), Hash(<str>), [])",
buildPlatform.c_str(), ((string) prog).c_str()));
ATmake("Exec(Str(<str>), Hash(<str>), <term>)",
buildPlatform.c_str(), ((string) prog).c_str(), argsNF));
/* Do we know a normal form for sourceHash? */
Hash targetHash;