* Finished the ATerm-less parser.

2010-04-12 23:33:23 +00:00
parent 0d272fca79
commit 10e8b1fd15
6 changed files with 68 additions and 102 deletions
@@ -1023,8 +1023,8 @@ void EvalState::createBaseEnv()
    /* Add a wrapper around the derivation primop that computes the
       `drvPath' and `outPath' attributes lazily. */
    string s = "attrs: let res = derivationStrict attrs; in attrs // { drvPath = res.drvPath; outPath = res.outPath; type = \"derivation\"; }";
-    //mkThunk(v, baseEnv, parseExprFromString(s, "/"));
-    //addConstant("derivation", v);
+    mkThunk(v, baseEnv, parseExprFromString(s, "/"));
+    addConstant("derivation", v);

    // Miscellaneous
    addPrimOp("import", 1, prim_import);