Changeset 134322e for src/InitTweak/FixInit.cc

Timestamp:

Jun 1, 2017, 4:26:50 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, 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:

676cc8c

Parents:

3fb9a83

Message:

Refactored PassVisitor? to properly support env and statements to add

File:

• src/InitTweak/FixInit.cc (modified) (6 diffs)

src/InitTweak/FixInit.cc

@@ -20 +20 @@
 #include <unordered_map>
 #include <unordered_set>
+
 #include "InitTweak.h"
 #include "GenInit.h"
 #include "FixInit.h"
 #include "FixGlobalInit.h"
+#include "CodeGen/GenType.h"  // for warning/error messages
+#include "Common/PassVisitor.h"
+#include "GenPoly/DeclMutator.h"
+#include "GenPoly/PolyMutator.h"
 #include "ResolvExpr/Resolver.h"
 #include "ResolvExpr/typeops.h"
+#include "SymTab/Autogen.h"
+#include "SymTab/Indexer.h"
+#include "SynTree/AddStmtVisitor.h"
+#include "SynTree/Attribute.h"
 #include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
 #include "SynTree/Expression.h"
-#include "SynTree/Attribute.h"
-#include "SynTree/Statement.h"
 #include "SynTree/Initializer.h"
 #include "SynTree/Mutator.h"
-#include "SymTab/Indexer.h"
-#include "SymTab/Autogen.h"
-#include "GenPoly/PolyMutator.h"
-#include "GenPoly/DeclMutator.h"
-#include "SynTree/AddStmtVisitor.h"
-#include "CodeGen/GenType.h"  // for warning/error messages
+#include "SynTree/Statement.h"
+#include "SynTree/Type.h"
 #include "Tuples/Tuples.h"
 
@@ -54 +56 @@
                 typedef std::unordered_map< int, int > UnqCount;
 
-                class InsertImplicitCalls final : public GenPoly::PolyMutator {
+                class InsertImplicitCalls {
                 public:
                         /// wrap function application expressions as ImplicitCopyCtorExpr nodes so that it is easy to identify which
@@ -61 +63 @@
 
                         InsertImplicitCalls( EnvMap & envMap ) : envMap( envMap ) {}
-                        typedef GenPoly::PolyMutator Parent;
-                        using Parent::mutate;
-                        virtual Expression * mutate( ApplicationExpr * appExpr ) override;
-                        virtual Expression * mutate( StmtExpr * stmtExpr ) override;
+
+                        Expression * postmutate( ApplicationExpr * appExpr );
+                        void premutate( StmtExpr * stmtExpr );
 
                         // collects environments for relevant nodes
                         EnvMap & envMap;
+                        TypeSubstitution * env; //Magically populated by the PassVisitor
                 };
 
@@ -300 +302 @@
         namespace {
                 void InsertImplicitCalls::insert( std::list< Declaration * > & translationUnit, EnvMap & envMap ) {
-                        InsertImplicitCalls inserter( envMap );
+                        PassVisitor<InsertImplicitCalls> inserter( envMap );
                         mutateAll( translationUnit, inserter );
                 }
@@ -350 +352 @@
                 }
 
-                Expression * InsertImplicitCalls::mutate( ApplicationExpr * appExpr ) {
-                        appExpr = dynamic_cast< ApplicationExpr * >( Parent::mutate( appExpr ) );
+                Expression * InsertImplicitCalls::postmutate( ApplicationExpr * appExpr ) {
                         assert( appExpr );
 
@@ -393 +394 @@
                 }
 
-                Expression * InsertImplicitCalls::mutate( StmtExpr * stmtExpr ) {
+                void InsertImplicitCalls::premutate( StmtExpr * stmtExpr ) {
                         assert( env );
                         envMap[stmtExpr] = env;
-                        return Parent::mutate( stmtExpr );
                 }