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

File:

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

src/InitTweak/GenInit.cc

@@ -16 +16 @@
 #include <stack>
 #include <list>
-
+#include "GenInit.h"
 #include "InitTweak.h"
-#include "GenInit.h"
-
-#include "Common/PassVisitor.h"
-
-#include "GenPoly/DeclMutator.h"
-#include "GenPoly/PolyMutator.h"
-#include "GenPoly/ScopedSet.h"
-
-#include "ResolvExpr/typeops.h"
-
 #include "SynTree/Declaration.h"
+#include "SynTree/Type.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/Autogen.h"
 #include "SymTab/Mangler.h"
+#include "GenPoly/PolyMutator.h"
+#include "GenPoly/DeclMutator.h"
+#include "GenPoly/ScopedSet.h"
+#include "ResolvExpr/typeops.h"
 
 namespace InitTweak {
@@ -44 +37 @@
         }
 
-        struct ReturnFixer : public WithStmtsToAdd, public WithGuards {
+        class ReturnFixer final : public GenPoly::PolyMutator {
+          public:
                 /// consistently allocates a temporary variable for the return value
                 /// of a function so that anything which the resolver decides can be constructed
@@ -50 +44 @@
                 static void makeReturnTemp( std::list< Declaration * > &translationUnit );
 
-                void premutate( FunctionDecl *functionDecl );
-                void premutate( ReturnStmt * returnStmt );
+                ReturnFixer();
+
+                typedef GenPoly::PolyMutator Parent;
+                using Parent::mutate;
+                virtual DeclarationWithType * mutate( FunctionDecl *functionDecl ) override;
+                virtual Statement * mutate( ReturnStmt * returnStmt ) override;
 
           protected:
@@ -58 +56 @@
         };
 
-        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 +66 @@
                 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:
@@ -131 +131 @@
 
         void ReturnFixer::makeReturnTemp( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<ReturnFixer> fixer;
+                ReturnFixer fixer;
                 mutateAll( translationUnit, fixer );
         }
 
-        void ReturnFixer::premutate( ReturnStmt *returnStmt ) {
+        ReturnFixer::ReturnFixer() {}
+
+        Statement *ReturnFixer::mutate( ReturnStmt *returnStmt ) {
                 std::list< DeclarationWithType * > & returnVals = ftype->get_returnVals();
                 assert( returnVals.size() == 0 || returnVals.size() == 1 );
@@ -146 +148 @@
                         construct->get_args().push_back( new AddressExpr( new VariableExpr( returnVals.front() ) ) );
                         construct->get_args().push_back( returnStmt->get_expr() );
-                        stmtsToAddBefore.push_back(new ExprStmt(noLabels, construct));
+                        stmtsToAdd.push_back(new ExprStmt(noLabels, construct));
 
                         // return the retVal object
                         returnStmt->set_expr( new VariableExpr( returnVals.front() ) );
                 } // if
-        }
-
-        void ReturnFixer::premutate( FunctionDecl *functionDecl ) {
-                GuardValue( ftype );
-                GuardValue( funcName );
+                return returnStmt;
+        }
+
+        DeclarationWithType* ReturnFixer::mutate( FunctionDecl *functionDecl ) {
+                ValueGuard< FunctionType * > oldFtype( ftype );
+                ValueGuard< std::string > oldFuncName( funcName );
 
                 ftype = functionDecl->get_functionType();
                 funcName = functionDecl->get_name();
+                return Parent::mutate( functionDecl );
         }
 
@@ -208 +212 @@
 
         void CtorDtor::generateCtorDtor( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<CtorDtor> ctordtor;
-                acceptAll( translationUnit, ctordtor );
+                CtorDtor ctordtor;
+                mutateAll( translationUnit, ctordtor );
         }
 
@@ -239 +243 @@
                         std::list< DeclarationWithType * > & params = GenPoly::getFunctionType( dwt->get_type() )->get_parameters();
                         assert( ! params.empty() );
-                        PointerType * type = safe_dynamic_cast< PointerType * >( params.front()->get_type() );
-                        managedTypes.insert( SymTab::Mangler::mangle( type->get_base() ) );
+                        Type * type = InitTweak::getPointerBase( params.front()->get_type() );
+                        assert( type );
+                        managedTypes.insert( SymTab::Mangler::mangle( type ) );
                 }
         }
@@ -286 +291 @@
         }
 
-        void CtorDtor::previsit( ObjectDecl * objDecl ) {
+        DeclarationWithType * CtorDtor::mutate( ObjectDecl * objDecl ) {
                 handleDWT( objDecl );
                 // hands off if @=, extern, builtin, etc.
@@ -298 +303 @@
                         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() ) {
                         for ( DeclarationWithType *& assertion : tyDecl->get_assertions() ) {
-                                handleDWT( assertion );
+                                assertion = assertion->acceptMutator( *this );
                         }
                 }
-
-                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 +338 @@
                         }
                 }
-        }
-
-        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