From 31428c3a0675f7223470af726bc697dc7a228927 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 29 Mar 2010 14:37:56 +0000
Subject: * Started integrating the new evaluator.

---
 src/nix-instantiate/nix-instantiate.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/nix-instantiate')

diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc
index 3822de5c6289..5473db4ac928 100644
--- a/src/nix-instantiate/nix-instantiate.cc
+++ b/src/nix-instantiate/nix-instantiate.cc
@@ -37,6 +37,7 @@ static int rootNr = 0;
 static bool indirectRoot = false;
 
 
+#if 0
 static void printResult(EvalState & state, Expr e,
     bool evalOnly, bool xmlOutput, const ATermMap & autoArgs)
 {
@@ -63,21 +64,28 @@ static void printResult(EvalState & state, Expr e,
         }
     }
 }
+#endif
 
 
 void processExpr(EvalState & state, const Strings & attrPaths,
     bool parseOnly, bool strict, const ATermMap & autoArgs,
     bool evalOnly, bool xmlOutput, Expr e)
 {
+    Value v;
+    state.strictEval(e, v);
+    std::cout << v << std::endl;
+    
+#if 0
     for (Strings::const_iterator i = attrPaths.begin(); i != attrPaths.end(); ++i) {
         Expr e2 = findAlongAttrPath(state, *i, autoArgs, e);
         if (!parseOnly)
             if (strict)
-                e2 = strictEvalExpr(state, e2);
+                e2 = state.strictEval(e2);
             else
                 e2 = evalExpr(state, e2);
         printResult(state, e2, evalOnly, xmlOutput, autoArgs);
     }
+#endif
 }
 
 
-- 
cgit 1.4.1