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

* `nix-instantiate ... --arg NAME VALUE': allow arguments to be passed

Browse source 
to functions from the command line.
* nix-build: started removing backticks.
This commit is contained in:
Eelco Dolstra 2006-07-28 16:03:28 +00:00
parent c11839d7b2
commit 4661282fde
8 changed files with 58 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libexpr/eval.cc
View file

@ -287,20 +287,27 @@ static ATerm concatStrings(EvalState & state, const ATermVector & args)
}
Expr autoCallFunction(Expr e)
Expr autoCallFunction(Expr e, const ATermMap & args)
{
ATermList formals;
ATerm body, pos;
if (matchFunction(e, formals, body, pos)) {
ATermMap actualArgs(128);
for (ATermIterator i(formals); i; ++i) {
Expr name, def; ATerm values, def2;
Expr name, def, value; ATerm values, def2;
if (!matchFormal(*i, name, values, def2)) abort();
if (!matchDefaultValue(def2, def))
if ((value = args.get(name)))
actualArgs.set(name, makeAttrRHS(value, makeNoPos()));
else if (!matchDefaultValue(def2, def))
throw TypeError(format("cannot auto-call a function that has an argument without a default value (`%1%')")
% aterm2String(name));
}
e = makeCall(e, makeAttrs(ATermMap(0)));
e = makeCall(e, makeAttrs(actualArgs));
}
return e;
}