diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-08T12·24+0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-08T12·24+0200 |
commit | 221a2daf34234c426fec8058f24b1093b2a61ba8 (patch) | |
tree | d94ec6b74886dc0fe142a04be801f5c1777bcb02 /src/libexpr/nixexpr.hh | |
parent | 176c666f36afee12f5cbd1f9615cf21d781fdbde (diff) |
Merge VarRef into ExprVar
Diffstat (limited to 'src/libexpr/nixexpr.hh')
-rw-r--r-- | src/libexpr/nixexpr.hh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh index 8733b9c7877c..7db0a15fa30f 100644 --- a/src/libexpr/nixexpr.hh +++ b/src/libexpr/nixexpr.hh @@ -107,7 +107,7 @@ struct ExprPath : Expr Value * maybeThunk(EvalState & state, Env & env); }; -struct VarRef +struct ExprVar : Expr { Symbol name; @@ -124,15 +124,7 @@ struct VarRef unsigned int level; unsigned int displ; - VarRef() { }; - VarRef(const Symbol & name) : name(name) { }; - void bind(const StaticEnv & env); -}; - -struct ExprVar : Expr -{ - VarRef info; - ExprVar(const Symbol & name) : info(name) { }; + ExprVar(const Symbol & name) : name(name) { }; COMMON_METHODS Value * maybeThunk(EvalState & state, Env & env); }; |