lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* When evaluating, automatically call functions with default arguments.

Browse source
This commit is contained in:
Eelco Dolstra 2006-02-08 15:22:30 +00:00
parent f8aadf14c3
commit 8688e83194
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,10 +37,12 @@ void getDerivations(EvalState & state, Expr e, DrvInfos & drvs)
e = evalExpr(state, e); e = evalExpr(state, e);
if (getDerivation(state, e, drv)) if (getDerivation(state, e, drv)) {
drvs.push_back(drv); drvs.push_back(drv);
return;
}
else if (matchAttrs(e, es)) { if (matchAttrs(e, es)) {
ATermMap drvMap; ATermMap drvMap;
queryAllAttrs(e, drvMap); queryAllAttrs(e, drvMap);
for (ATermIterator i(drvMap.keys()); i; ++i) { for (ATermIterator i(drvMap.keys()); i; ++i) {
@ -51,9 +53,10 @@ void getDerivations(EvalState & state, Expr e, DrvInfos & drvs)
; ;
// parseDerivations(state, drvMap.get(*i), drvs); // parseDerivations(state, drvMap.get(*i), drvs);
} }
return;
} }
else if (matchList(e, es)) { if (matchList(e, es)) {
for (ATermIterator i(es); i; ++i) { for (ATermIterator i(es); i; ++i) {
debug(format("evaluating list element")); debug(format("evaluating list element"));
if (getDerivation(state, *i, drv)) if (getDerivation(state, *i, drv))
@ -61,7 +64,23 @@ void getDerivations(EvalState & state, Expr e, DrvInfos & drvs)
else else
getDerivations(state, *i, drvs); getDerivations(state, *i, drvs);
} }
return;
} }
ATermList formals;
ATerm body, pos;
if (matchFunction(e, formals, body, pos)) {
for (ATermIterator i(formals); i; ++i) {
Expr name, def;
if (matchNoDefFormal(*i, name))
throw Error(format("expression evaluates to a function with no-default arguments (`%1%')")
% aterm2String(name));
else if (!matchDefFormal(*i, name, def))
abort(); /* can't happen */
}
getDerivations(state, makeCall(e, makeAttrs(ATermMap())), drvs);
return;
}
throw Error("expression does not evaluate to a derivation (or a set or list of those)");
} }