Changes in / [b1d4d60:28c9ff3]

Location:

src

Files:

• Common/PassVisitor.h (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (4 diffs)

src/Common/PassVisitor.h

@@ -26 +26 @@
 
         template< typename... Args >
-        PassVisitor(Args &&... args)
+        PassVisitor(Args &&... args) 
                 : pass( std::forward<Args>( args )... )
         {}
 
         virtual ~PassVisitor() = default;
-
+private:
         pass_type pass;
+
+public:
 
         virtual void visit( ObjectDecl *objectDecl ) override final;

src/InitTweak/FixInit.cc

@@ -192 +192 @@
                 };
 
-                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
                 };
 
@@ -311 +312 @@
 
                 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 +320 @@
                                 try {
                                         *i = maybeMutate( *i, fixer );
-                                        translationUnit.splice( i, fixer.pass.staticDtorDecls );
+                                        translationUnit.splice( i, fixer.staticDtorDecls );
                                 } catch( SemanticError &e ) {
                                         e.set_location( (*i)->location );
@@ -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