From 0c4c5c2020383db9c2d39d7a3420195568d06312 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue, 10 Oct 2006 21:23:35 +0000
Subject: * Quick hack to fix NIX-67: evaluation result differing if the Nix  
 expression resides in the store.

---
 src/libexpr/eval.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/libexpr/eval.cc')

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index fa843b5d3b15..2d54f1fc2325 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -244,9 +244,11 @@ string coerceToStringWithContext(EvalState & state,
     
     e = evalExpr(state, e);
 
+    bool isWrapped = false;
     ATermList es;
     ATerm e2;
     if (matchContext(e, es, e2)) {
+        isWrapped = true;
         e = e2;
         context = ATconcat(es, context);
     }
@@ -258,7 +260,7 @@ string coerceToStringWithContext(EvalState & state,
     if (matchPath(e, s)) {
         isPath = true;
         Path path = aterm2String(s);
-        if (isInStore(path)) {
+        if (isInStore(path) && !isWrapped) {
             context = ATinsert(context, makePath(toATerm(toStorePath(path))));
         }
         return path;
@@ -295,16 +297,18 @@ static ATerm concatStrings(EvalState & state, const ATermVector & args)
     std::ostringstream s;
     bool isPath = false;
 
+    /* Note that if the first argument in the concatenation is a path,
+       then the result is also a path. */
+
     for (ATermVector::const_iterator i = args.begin(); i != args.end(); ++i) {
         bool isPath2;
         s << coerceToStringWithContext(state, context, *i, isPath2);
         if (i == args.begin()) isPath = isPath2;
     }
 
-    Expr result = isPath
+    return wrapInContext(context, isPath
         ? makePath(toATerm(canonPath(s.str())))
-        : makeStr(toATerm(s.str()));
-    return wrapInContext(context, result);
+        : makeStr(toATerm(s.str())));
 }
 
 
-- 
cgit 1.4.1