Changes in src/InitTweak/FixInit.cc [134322e:0661678]

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