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

* `null' is a normal form.

Browse source
This commit is contained in:
Eelco Dolstra 2004-03-19 14:45:45 +00:00
parent e6253b58cd
commit 79bb0008ec
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/libexpr/eval.cc
View file

@ -186,14 +186,17 @@ Expr evalExpr2(EvalState & state, Expr e)
ATerm name; ATerm name;
/* Normal forms. */ /* Normal forms. */
if (atMatch(m, e) >> "Str" || string cons;
atMatch(m, e) >> "Path" || if (atMatch(m, e) >> cons &&
atMatch(m, e) >> "Uri" || (cons == "Str" ||
atMatch(m, e) >> "Int" || cons == "Path" ||
atMatch(m, e) >> "Bool" || cons == "Uri" ||
atMatch(m, e) >> "Function" || cons == "Null" ||
atMatch(m, e) >> "Attrs" || cons == "Int" ||
atMatch(m, e) >> "List") cons == "Bool" ||
cons == "Function" ||
cons == "Attrs" ||
cons == "List"))
return e; return e;
/* Any encountered variables must be undeclared or primops. */ /* Any encountered variables must be undeclared or primops. */