Changes in src/InitTweak/GenInit.cc [d24d4e1:4eb31f2b]

File:

• src/InitTweak/GenInit.cc (modified) (10 diffs)

src/InitTweak/GenInit.cc

@@ -21 +21 @@
 
 #include "Common/PassVisitor.h"
-
-#include "GenPoly/DeclMutator.h"
-#include "GenPoly/PolyMutator.h"
-#include "GenPoly/ScopedSet.h"
-
-#include "ResolvExpr/typeops.h"
 
 #include "SynTree/Declaration.h"
@@ -38 +32 @@
 #include "SymTab/Mangler.h"
 
+#include "GenPoly/DeclMutator.h"
+#include "GenPoly/PolyMutator.h"
+#include "GenPoly/ScopedSet.h"
+
+#include "ResolvExpr/typeops.h"
+
 namespace InitTweak {
         namespace {
@@ -44 +44 @@
         }
 
-        struct ReturnFixer : public WithStmtsToAdd, public WithGuards {
+        class ReturnFixer : public WithStmtsToAdd, public WithScopes {
+          public:
                 /// consistently allocates a temporary variable for the return value
                 /// of a function so that anything which the resolver decides can be constructed
@@ -58 +59 @@
         };
 
-        struct CtorDtor : public WithGuards, public WithShortCircuiting  {
+        class CtorDtor final : public GenPoly::PolyMutator {
+          public:
+                typedef GenPoly::PolyMutator Parent;
+                using Parent::mutate;
                 /// create constructor and destructor statements for object declarations.
                 /// the actual call statements will be added in after the resolver has run
@@ -65 +69 @@
                 static void generateCtorDtor( std::list< Declaration * > &translationUnit );
 
-                void previsit( ObjectDecl * );
-                void previsit( FunctionDecl *functionDecl );
-
+                virtual DeclarationWithType * mutate( ObjectDecl * ) override;
+                virtual DeclarationWithType * mutate( FunctionDecl *functionDecl ) override;
                 // should not traverse into any of these declarations to find objects
                 // that need to be constructed or destructed
-                void previsit( StructDecl *aggregateDecl );
-                void previsit( UnionDecl *aggregateDecl ) { visit_children = false; }
-                void previsit( EnumDecl *aggregateDecl ) { visit_children = false; }
-                void previsit( TraitDecl *aggregateDecl ) { visit_children = false; }
-                void previsit( TypeDecl *typeDecl ) { visit_children = false; }
-                void previsit( TypedefDecl *typeDecl ) { visit_children = false; }
-
-                void previsit( FunctionType *funcType ) { visit_children = false; }
-
-                void previsit( CompoundStmt * compoundStmt );
+                virtual Declaration* mutate( StructDecl *aggregateDecl ) override;
+                virtual Declaration* mutate( UnionDecl *aggregateDecl ) override { return aggregateDecl; }
+                virtual Declaration* mutate( EnumDecl *aggregateDecl ) override { return aggregateDecl; }
+                virtual Declaration* mutate( TraitDecl *aggregateDecl ) override { return aggregateDecl; }
+                virtual TypeDecl* mutate( TypeDecl *typeDecl ) override { return typeDecl; }
+                virtual Declaration* mutate( TypedefDecl *typeDecl ) override { return typeDecl; }
+
+                virtual Type * mutate( FunctionType *funcType ) override { return funcType; }
+
+                virtual CompoundStmt * mutate( CompoundStmt * compoundStmt ) override;
 
           private:
@@ -208 +211 @@
 
         void CtorDtor::generateCtorDtor( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<CtorDtor> ctordtor;
-                acceptAll( translationUnit, ctordtor );
+                CtorDtor ctordtor;
+                mutateAll( translationUnit, ctordtor );
         }
 
@@ -286 +289 @@
         }
 
-        void CtorDtor::previsit( ObjectDecl * objDecl ) {
+        DeclarationWithType * CtorDtor::mutate( ObjectDecl * objDecl ) {
                 handleDWT( objDecl );
                 // hands off if @=, extern, builtin, etc.
@@ -298 +301 @@
                         objDecl->set_init( genCtorInit( objDecl ) );
                 }
-        }
-
-        void CtorDtor::previsit( FunctionDecl *functionDecl ) {
-                GuardValue( inFunction );
+                return Parent::mutate( objDecl );
+        }
+
+        DeclarationWithType * CtorDtor::mutate( FunctionDecl *functionDecl ) {
+                ValueGuard< bool > oldInFunc = inFunction;
                 inFunction = true;
 
                 handleDWT( functionDecl );
 
-                GuardScope( managedTypes );
+                managedTypes.beginScope();
                 // go through assertions and recursively add seen ctor/dtors
                 for ( auto & tyDecl : functionDecl->get_functionType()->get_forall() ) {
@@ -313 +317 @@
                         }
                 }
-
-                PassVisitor<CtorDtor> newCtorDtor;
-                newCtorDtor.pass = *this;
-                maybeAccept( functionDecl->get_statements(), newCtorDtor );
-                visit_children = false;  // do not try and construct parameters or forall parameters - must happen after maybeAccept
-        }
-
-        void CtorDtor::previsit( StructDecl *aggregateDecl ) {
-                visit_children = false; // do not try to construct and destruct aggregate members
-
+                // parameters should not be constructed and destructed, so don't mutate FunctionType
+                functionDecl->set_statements( maybeMutate( functionDecl->get_statements(), *this ) );
+
+                managedTypes.endScope();
+                return functionDecl;
+        }
+
+        Declaration* CtorDtor::mutate( StructDecl *aggregateDecl ) {
                 // don't construct members, but need to take note if there is a managed member,
                 // because that means that this type is also managed
@@ -334 +336 @@
                         }
                 }
-        }
-
-        void CtorDtor::previsit( CompoundStmt * compoundStmt ) {
-                GuardScope( managedTypes );
-        }
+                return aggregateDecl;
+        }
+
+        CompoundStmt * CtorDtor::mutate( CompoundStmt * compoundStmt ) {
+                managedTypes.beginScope();
+                CompoundStmt * stmt = Parent::mutate( compoundStmt );
+                managedTypes.endScope();
+                return stmt;
+        }
+
 } // namespace InitTweak