Changeset c0b9f5d

Timestamp:

Jan 15, 2018, 2:38:39 PM (5 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

12145b9

Parents:

7dc0246d

Message:

Convert VarExprReplacer? to PassVisitor?

Location:

src

Files:

• ControlStruct/ExceptTranslate.cc (modified) (1 diff)
• SynTree/CompoundStmt.cc (modified) (1 diff)
• SynTree/FunctionDecl.cc (modified) (1 diff)
• SynTree/VarExprReplacer.cc (modified) (1 diff)
• SynTree/VarExprReplacer.h (modified) (1 diff)

src/ControlStruct/ExceptTranslate.cc

@@ -316 +316 @@
                                 VarExprReplacer::DeclMap mapping;
                                 mapping[ handler_decl ] = local_except;
-                                VarExprReplacer mapper( mapping );
-                                handler->get_body()->accept( mapper );
+                                VarExprReplacer::replace( handler->body, mapping );
                         }
 

src/SynTree/CompoundStmt.cc

@@ -64 +64 @@
         }
         if ( ! declMap.empty() ) {
-                VarExprReplacer replacer( declMap );
-                accept( replacer );
+                VarExprReplacer::replace( this, declMap );
         }
 }

src/SynTree/FunctionDecl.cc

@@ -49 +49 @@
         }
         if ( ! declMap.empty() ) {
-                VarExprReplacer replacer( declMap );
-                accept( replacer );
+                VarExprReplacer::replace( this, declMap );
         }
 }

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"
 
-VarExprReplacer::VarExprReplacer( const DeclMap & declMap, bool debug ) : declMap( declMap ), debug( debug ) {}
+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 );
 
-// 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;
+                        // replace variable with new node from decl map
+                        void previsit( VariableExpr * varExpr );
+                };
+        }
+
+        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 );
+                        }
                 }
-                varExpr->set_var( declMap.at( varExpr->get_var() ) );
         }
-}
+} // namespace VarExprReplacer
+
+
+
+
+
+
+

src/SynTree/VarExprReplacer.h

@@ -23 +23 @@
 class VariableExpr;
 
-/// Visitor that replaces the declarations that VariableExprs refer to, according to the supplied mapping
-class VarExprReplacer : public Visitor {
-public:
+namespace VarExprReplacer {
         typedef std::map< DeclarationWithType *, DeclarationWithType * > DeclMap;
-private:
-        const DeclMap & declMap;
-        bool debug;
-public:
-        VarExprReplacer( const DeclMap & declMap, bool debug = false );
 
-        // replace variable with new node from decl map
-        virtual void visit( VariableExpr * varExpr );
-
-        static void replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug = false ) {
-                VarExprReplacer replacer( declMap, debug );
-                maybeAccept( node, replacer );
-        }
-};
+        void replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug = false );
+}
 
 // Local Variables: //