about summary refs log tree commit diff
path: root/src/libexpr/nixexpr.cc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-08T12·24+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-08T12·24+0200
commit221a2daf34234c426fec8058f24b1093b2a61ba8 (patch)
treed94ec6b74886dc0fe142a04be801f5c1777bcb02 /src/libexpr/nixexpr.cc
parent176c666f36afee12f5cbd1f9615cf21d781fdbde (diff)
Merge VarRef into ExprVar
Diffstat (limited to 'src/libexpr/nixexpr.cc')
-rw-r--r--src/libexpr/nixexpr.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index 2b33f73015f0..c847e3baf832 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -38,7 +38,7 @@ void ExprPath::show(std::ostream & str)
 
 void ExprVar::show(std::ostream & str)
 {
-    str << info.name;
+    str << name;
 }
 
 void ExprSelect::show(std::ostream & str)
@@ -174,7 +174,7 @@ void ExprPath::bindVars(const StaticEnv & env)
 {
 }
 
-void VarRef::bind(const StaticEnv & env)
+void ExprVar::bindVars(const StaticEnv & env)
 {
     /* Check whether the variable appears in the environment.  If so,
        set its level and displacement. */
@@ -204,11 +204,6 @@ void VarRef::bind(const StaticEnv & env)
     this->level = withLevel;
 }
 
-void ExprVar::bindVars(const StaticEnv & env)
-{
-    info.bind(env);
-}
-
 void ExprSelect::bindVars(const StaticEnv & env)
 {
     e->bindVars(env);