about summary refs log tree commit diff
path: root/src/libexpr/eval.cc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2010-04-16T13·44+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2010-04-16T13·44+0000
commit02c1dac90934e1b833c4d6bd9280bda27c146d80 (patch)
treee84f70d93fd75d162099275d3facd6ec9037844c /src/libexpr/eval.cc
parent04c4bd3624b094043ff0f2410c1e376a51f457f7 (diff)
* In an nested `with' where the inner with is a variable (`with ...;
  with someVar; ...'), the contents of the variable would be
  clobbered.  (The attributes in the outer `with' were added to the
  variable.)

Diffstat (limited to 'src/libexpr/eval.cc')
-rw-r--r--src/libexpr/eval.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 69e7bd8b3c88..ac475c893173 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -649,6 +649,11 @@ void ExprWith::eval(EvalState & state, Env & env, Value & v)
         Env * env3 = &env;
         for (unsigned int l = prevWith; l; --l, env3 = env3->up) ;
 
+        /* Because the first `with' may be a shallow copy of another
+           attribute set (through a tCopy node), we need to clone its
+           `attrs' before modifying them. */
+        env2.values[0].attrs = new Bindings(*env2.values[0].attrs);
+
         foreach (Bindings::iterator, i, *env3->values[0].attrs) {
             Bindings::iterator j = env2.values[0].attrs->find(i->first);
             if (j == env2.values[0].attrs->end())
@@ -1042,7 +1047,8 @@ void EvalState::printStats()
     printMsg(v, format("  expressions evaluated: %1%") % nrEvaluated);
     printMsg(v, format("  stack space used: %1% bytes") % (&x - deepestStack));
     printMsg(v, format("  max eval() nesting depth: %1%") % maxRecursionDepth);
-    printMsg(v, format("  stack space per eval() level: %1% bytes") % ((&x - deepestStack) / (float) maxRecursionDepth));
+    printMsg(v, format("  stack space per eval() level: %1% bytes")
+        % ((&x - deepestStack) / (float) maxRecursionDepth));
     printMsg(v, format("  environments allocated: %1% (%2% bytes)")
         % nrEnvs % (nrEnvs * sizeof(Env)));
     printMsg(v, format("  values allocated in environments: %1% (%2% bytes)")