Changes in src/InitTweak/FixInit.cc [b3fc977:6dfa2e1]

File:

• src/InitTweak/FixInit.cc (modified) (11 diffs)

src/InitTweak/FixInit.cc

@@ -197 +197 @@
                 };
 
-                struct GenStructMemberCalls final : public WithGuards, public WithShortCircuiting, public WithIndexer, public WithVisitorRef<GenStructMemberCalls> {
+                struct GenStructMemberCalls final : public WithGuards, public WithShortCircuiting, public WithIndexer {
                         /// generate default/copy ctor and dtor calls for user-defined struct ctor/dtors
                         /// for any member that is missing a corresponding ctor/dtor call.
@@ -203 +203 @@
                         static void generate( std::list< Declaration * > & translationUnit );
 
-                        void premutate( FunctionDecl * funcDecl );
-                        DeclarationWithType * postmutate( FunctionDecl * funcDecl );
-
-                        void premutate( MemberExpr * memberExpr );
-                        void premutate( ApplicationExpr * appExpr );
-
-                        /// Note: this post mutate used to be in a separate visitor. If this pass breaks, one place to examine is whether it is
-                        /// okay for this part of the recursion to occur alongside the rest.
-                        Expression * postmutate( UntypedExpr * expr );
+                        void previsit( FunctionDecl * funcDecl );
+                        void postvisit( FunctionDecl * funcDecl );
+
+                        void previsit( MemberExpr * memberExpr );
+                        void previsit( ApplicationExpr * appExpr );
 
                         SemanticError errors;
@@ -224 +220 @@
                         bool isCtor = false; // true if current function is a constructor
                         StructDecl * structDecl = nullptr;
+                };
+
+                // very simple resolver-like mutator class - used to
+                // resolve UntypedExprs that are found within newly
+                // generated constructor/destructor calls
+                class MutatingResolver final : public Mutator {
+                  public:
+                        MutatingResolver( SymTab::Indexer & indexer ) : indexer( indexer ) {}
+
+                        using Mutator::mutate;
+                        virtual DeclarationWithType* mutate( ObjectDecl *objectDecl ) override;
+                        virtual Expression* mutate( UntypedExpr *untypedExpr ) override;
+
+                  private:
+                        SymTab::Indexer & indexer;
                 };
 
@@ -304 +315 @@
                 void GenStructMemberCalls::generate( std::list< Declaration * > & translationUnit ) {
                         PassVisitor<GenStructMemberCalls> warner;
-                        mutateAll( translationUnit, warner );
+                        acceptAll( translationUnit, warner );
                 }
 
@@ -939 +950 @@
                 }
 
-                void GenStructMemberCalls::premutate( FunctionDecl * funcDecl ) {
+                void GenStructMemberCalls::previsit( FunctionDecl * funcDecl ) {
                         GuardValue( function );
                         GuardValue( unhandled );
@@ -973 +984 @@
                 }
 
-                DeclarationWithType * GenStructMemberCalls::postmutate( FunctionDecl * funcDecl ) {
+                void GenStructMemberCalls::postvisit( FunctionDecl * funcDecl ) {
                         // remove the unhandled objects from usedUninit, because a call is inserted
                         // to handle them - only objects that are later constructed are used uninitialized.
@@ -1027 +1038 @@
                                                 Statement * callStmt = stmt.front();
 
+                                                MutatingResolver resolver( indexer );
                                                 try {
-                                                        callStmt->acceptMutator( *visitor );
+                                                        callStmt->acceptMutator( resolver );
                                                         if ( isCtor ) {
                                                                 function->get_statements()->push_front( callStmt );
@@ -1044 +1056 @@
                                 throw errors;
                         }
-                        return funcDecl;
                 }
 
@@ -1070 +1081 @@
                 }
 
-                void GenStructMemberCalls::premutate( ApplicationExpr * appExpr ) {
+                void GenStructMemberCalls::previsit( ApplicationExpr * appExpr ) {
                         if ( ! checkWarnings( function ) ) {
                                 visit_children = false;
@@ -1095 +1106 @@
                 }
 
-                void GenStructMemberCalls::premutate( MemberExpr * memberExpr ) {
+                void GenStructMemberCalls::previsit( MemberExpr * memberExpr ) {
                         if ( ! checkWarnings( function ) || ! isCtor ) {
                                 visit_children = false;
@@ -1123 +1134 @@
                 }
 
-                Expression * GenStructMemberCalls::postmutate( UntypedExpr * untypedExpr ) {
+                DeclarationWithType * MutatingResolver::mutate( ObjectDecl * objectDecl ) {
+                        // add object to the indexer assumes that there will be no name collisions
+                        // in generated code. If this changes, add mutate methods for entities with
+                        // scope and call {enter,leave}Scope explicitly.
+                        indexer.addId( objectDecl );
+                        return objectDecl;
+                }
+
+                Expression * MutatingResolver::mutate( UntypedExpr * untypedExpr ) {
                         Expression * newExpr = untypedExpr;
                         ResolvExpr::findVoidExpression( newExpr, indexer );