Merge VarRef into ExprVar

2013-10-08 14:24:53 +02:00
parent 176c666f36
commit 221a2daf34
4 changed files with 8 additions and 21 deletions
@@ -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);