From 221a2daf34234c426fec8058f24b1093b2a61ba8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Oct 2013 14:24:53 +0200
Subject: Merge VarRef into ExprVar

---
 src/libexpr/nixexpr.hh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/libexpr/nixexpr.hh')

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);
 };
-- 
cgit 1.4.1