emilytrau/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Strict evaluation and XML printing of lists.

Browse source
This commit is contained in:
Eelco Dolstra 2006-08-24 14:03:39 +00:00
parent 943ab38a0d
commit da25d80152
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libexpr/eval.cc
View file

@ -589,7 +589,6 @@ Expr strictEvalExpr(EvalState & state, Expr e)
e = evalExpr(state, e); e = evalExpr(state, e);
ATermList as; ATermList as;
if (matchAttrs(e, as)) { if (matchAttrs(e, as)) {
ATermList as2 = ATempty; ATermList as2 = ATempty;
for (ATermIterator i(as); i; ++i) { for (ATermIterator i(as); i; ++i) {
@ -599,10 +598,17 @@ Expr strictEvalExpr(EvalState & state, Expr e)
} }
return makeAttrs(ATreverse(as2)); return makeAttrs(ATreverse(as2));
} }
ATermList es;
if (matchList(e, es)) {
ATermList es2 = ATempty;
for (ATermIterator i(es); i; ++i)
es2 = ATinsert(es2, strictEvalExpr(state, *i));
return makeList(ATreverse(es2));
}
ATermList formals; ATermList formals;
ATerm body, pos; ATerm body, pos;
if (matchFunction(e, formals, body, pos)) { if (matchFunction(e, formals, body, pos)) {
ATermList formals2 = ATempty; ATermList formals2 = ATempty;

8
src/nix-instantiate/main.cc
View file

@ -47,7 +47,7 @@ static void printTermAsXML(Expr e, XMLWriter & doc)
XMLAttrs attrs; XMLAttrs attrs;
ATerm s; ATerm s;
int i; int i;
ATermList as, formals; ATermList as, es, formals;
ATerm body, pos; ATerm body, pos;
if (matchStr(e, s)) if (matchStr(e, s))
@ -84,6 +84,12 @@ static void printTermAsXML(Expr e, XMLWriter & doc)
} }
} }
else if (matchList(e, es)) {
XMLOpenElement _(doc, "list");
for (ATermIterator i(es); i; ++i)
printTermAsXML(*i, doc);
}
else if (matchFunction(e, formals, body, pos)) { else if (matchFunction(e, formals, body, pos)) {
XMLOpenElement _(doc, "function"); XMLOpenElement _(doc, "function");