about summary refs log tree commit diff
path: root/src/libexpr/eval.hh
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2013-07-15T21·10-0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-08-26T09·31+0200
commitafc6c1bad63e27d68adf49e673f8aafd36495a8a (patch)
tree9cfe21245d123b5d7e525aa2722b1e155d29e736 /src/libexpr/eval.hh
parent6cd6ce56083d0077485896a761520812d039bf10 (diff)
Simplify inherited attribute handling
This reduces the difference between inherited and non-inherited
attribute handling to the choice of which env to use (in recs and lets)
by setting the AttrDef::e to a new ExprVar in the parser rather than
carrying a separate AttrDef::v VarRef member.

As an added bonus, this allows inherited attributes that inherit from a
with to delay forcing evaluation of the with's attributes.

Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'src/libexpr/eval.hh')
-rw-r--r--src/libexpr/eval.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index 9717fb66d95d..b7b527bc4e6f 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -206,7 +206,7 @@ private:
     void addPrimOp(const string & name,
         unsigned int arity, PrimOpFun primOp);
 
-    inline Value * lookupVar(Env * env, const VarRef & var, bool noEval = false);
+    inline Value * lookupVar(Env * env, const VarRef & var, bool noEval);
     
     friend class ExprVar;
     friend class ExprAttrs;