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

File:

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

src/SynTree/VarExprReplacer.cc

@@ -16 +16 @@
 #include <iostream>       // for operator<<, basic_ostream, ostream, basic_o...
 
-#include "Common/PassVisitor.h"
 #include "Declaration.h"  // for operator<<, DeclarationWithType
 #include "Expression.h"   // for VariableExpr
 #include "VarExprReplacer.h"
 
-namespace VarExprReplacer {
-        namespace {
-                /// Visitor that replaces the declarations that VariableExprs refer to, according to the supplied mapping
-                struct VarExprReplacer {
-                private:
-                        const DeclMap & declMap;
-                        bool debug;
-                public:
-                        VarExprReplacer( const DeclMap & declMap, bool debug = false );
+VarExprReplacer::VarExprReplacer( const DeclMap & declMap, bool debug ) : declMap( declMap ), debug( debug ) {}
 
-                        // replace variable with new node from decl map
-                        void previsit( VariableExpr * varExpr );
-                };
+// 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() ) );
         }
-
-        void replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug ) {
-                PassVisitor<VarExprReplacer> replacer( declMap, debug );
-                maybeAccept( node, replacer );
-        }
-
-        namespace {
-                VarExprReplacer::VarExprReplacer( const DeclMap & declMap, bool debug ) : declMap( declMap ), debug( debug ) {}
-
-                // replace variable with new node from decl map
-                void VarExprReplacer::previsit( 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 ) ) {
-                                if ( debug ) {
-                                        std::cerr << "replacing variable reference: " << (void*)varExpr->var << " " << varExpr->var << " with " << (void*)declMap.at( varExpr->var ) << " " << declMap.at( varExpr->var ) << std::endl;
-                                }
-                                varExpr->var = declMap.at( varExpr->var );
-                        }
-                }
-        }
-} // namespace VarExprReplacer
-
-
-
-
-
-
-
+}