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

File:

• src/InitTweak/FixInit.cc (modified) (10 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
                 };
 
@@ -192 +190 @@
                 };
 
-                class FixInit {
+                class FixInit final : public GenPoly::PolyMutator {
                   public:
                         /// expand each object declaration to use its constructor after it is declared.
                         static void fixInitializers( std::list< Declaration * > &translationUnit );
 
-                        DeclarationWithType * postmutate( ObjectDecl *objDecl );
+                        typedef GenPoly::PolyMutator Parent;
+                        using Parent::mutate;
+                        virtual DeclarationWithType * mutate( ObjectDecl *objDecl ) override;
 
                         std::list< Declaration * > staticDtorDecls;
-                        std::list< Statement * > stmtsToAddAfter; // found by PassVisitor
                 };
 
@@ -301 +300 @@
         namespace {
                 void InsertImplicitCalls::insert( std::list< Declaration * > & translationUnit, EnvMap & envMap ) {
-                        PassVisitor<InsertImplicitCalls> inserter( envMap );
+                        InsertImplicitCalls inserter( envMap );
                         mutateAll( translationUnit, inserter );
                 }
@@ -311 +310 @@
 
                 void FixInit::fixInitializers( std::list< Declaration * > & translationUnit ) {
-                        PassVisitor<FixInit> fixer;
+                        FixInit fixer;
 
                         // can't use mutateAll, because need to insert declarations at top-level
@@ -319 +318 @@
                                 try {
                                         *i = maybeMutate( *i, fixer );
-                                        translationUnit.splice( i, fixer.pass.staticDtorDecls );
+                                        translationUnit.splice( i, fixer.staticDtorDecls );
                                 } catch( SemanticError &e ) {
                                         e.set_location( (*i)->location );
@@ -351 +350 @@
                 }
 
-                Expression * InsertImplicitCalls::postmutate( ApplicationExpr * appExpr ) {
+                Expression * InsertImplicitCalls::mutate( ApplicationExpr * appExpr ) {
+                        appExpr = dynamic_cast< ApplicationExpr * >( Parent::mutate( appExpr ) );
                         assert( appExpr );
 
@@ -393 +393 @@
                 }
 
-                void InsertImplicitCalls::premutate( StmtExpr * stmtExpr ) {
+                Expression * InsertImplicitCalls::mutate( StmtExpr * stmtExpr ) {
                         assert( env );
                         envMap[stmtExpr] = env;
+                        return Parent::mutate( stmtExpr );
                 }
 
@@ -695 +696 @@
                 }
 
-                DeclarationWithType *FixInit::postmutate( ObjectDecl *objDecl ) {
-                        // since this removes the init field from objDecl, it must occur after children are mutated (i.e. postmutate)
+                DeclarationWithType *FixInit::mutate( ObjectDecl *objDecl ) {
+                        // first recursively handle pieces of ObjectDecl so that they aren't missed by other visitors when the init
+                        // is removed from the ObjectDecl
+                        objDecl = dynamic_cast< ObjectDecl * >( Parent::mutate( objDecl ) );
                         if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
                                 // a decision should have been made by the resolver, so ctor and init are not both non-NULL