Changes in src/SynTree/VarExprReplacer.cc [ea6332d:7543dec]

File:

• src/SynTree/VarExprReplacer.cc (modified) (1 diff)

src/SynTree/VarExprReplacer.cc

@@ -22 +22 @@
 VarExprReplacer::VarExprReplacer( const DeclMap & declMap, bool debug ) : declMap( declMap ), debug( debug ) {}
 
-// replace variable with new node from decl map
-void VarExprReplacer::visit( VariableExpr * varExpr ) {
-        // xxx - assertions and parameters aren't accounted for in this... (i.e. they aren't inserted into the map when it's made, only DeclStmts are)
-        if ( declMap.count( varExpr->get_var() ) ) {
-                if ( debug ) {
-                        std::cerr << "replacing variable reference: " << (void*)varExpr->get_var() << " " << varExpr->get_var() << " with " << (void*)declMap.at( varExpr->get_var() ) << " " << declMap.at( varExpr->get_var() ) << std::endl;
-                }
-                varExpr->set_var( declMap.at( varExpr->get_var() ) );
+VarExprReplacer::~VarExprReplacer() {
+        for ( auto p : declMap ) {
+                delete p.second;
         }
 }
+
+// replace variable with new node from decl map
+Expression * VarExprReplacer::mutate( VariableExpr * varExpr ) {
+        // xxx - assertions and parameters aren't accounted for in this... (i.e. they aren't inserted into the map when it's made, only DeclStmts are)
+        if ( declMap.count( varExpr->var ) ) {
+                Expression * expr = declMap.at( varExpr->var );
+                if ( debug ) {
+                        std::cerr << "replacing variable reference: " << (void*)varExpr->var << " " << varExpr->var << " with " << (void*)expr << " " << expr << std::endl;
+                }
+                delete varExpr;
+                return expr->clone();
+        }
+        return varExpr;
+}