aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr/eval.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/libexpr/eval.cc')
-rw-r--r--src/libexpr/eval.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 07f53a56c..703393084 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -589,7 +589,6 @@ Expr strictEvalExpr(EvalState & state, Expr e)
e = evalExpr(state, e);
ATermList as;
-
if (matchAttrs(e, as)) {
ATermList as2 = ATempty;
for (ATermIterator i(as); i; ++i) {
@@ -599,10 +598,17 @@ Expr strictEvalExpr(EvalState & state, Expr e)
}
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;
ATerm body, pos;
-
if (matchFunction(e, formals, body, pos)) {
ATermList formals2 = ATempty;