Changeset 0508ab3

Timestamp:

Jun 20, 2017, 2:02:46 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

4551a6e

Parents:

5e298d7

Message:

fix passes using PassVisitor? to use inheritance rather than explicit members

Location:

src

Files:

• InitTweak/FixInit.cc (modified) (4 diffs)
• SymTab/Validate.cc (modified) (3 diffs)

src/InitTweak/FixInit.cc

@@ -56 +56 @@
                 typedef std::unordered_map< int, int > UnqCount;
 
-                class InsertImplicitCalls {
+                class InsertImplicitCalls : public WithTypeSubstitution {
                 public:
                         /// wrap function application expressions as ImplicitCopyCtorExpr nodes so that it is easy to identify which
@@ -69 +69 @@
                         // collects environments for relevant nodes
                         EnvMap & envMap;
-                        TypeSubstitution * env; //Magically populated by the PassVisitor
                 };
 
@@ -192 +191 @@
                 };
 
-                class FixInit {
+                class FixInit : public WithStmtsToAdd {
                   public:
                         /// expand each object declaration to use its constructor after it is declared.
@@ -200 +199 @@
 
                         std::list< Declaration * > staticDtorDecls;
-                        std::list< Statement * > stmtsToAddAfter; // found by PassVisitor
                 };
 

src/SymTab/Validate.cc

@@ -160 +160 @@
         };
 
-        class ReturnChecker {
+        class ReturnChecker : public WithScopes {
           public:
                 /// Checks that return statements return nothing if their return type is void
@@ -167 +167 @@
           private:
                 void previsit( FunctionDecl * functionDecl );
-                void postvisit( FunctionDecl * functionDecl );
                 void previsit( ReturnStmt * returnStmt );
 
                 typedef std::list< DeclarationWithType * > ReturnVals;
                 ReturnVals returnVals;
-                std::stack< ReturnVals > returnValsStack;
         };
 
@@ -608 +606 @@
 
         void ReturnChecker::previsit( FunctionDecl * functionDecl ) {
-                returnValsStack.push( returnVals );
+                GuardValue( returnVals );
                 returnVals = functionDecl->get_functionType()->get_returnVals();
-        }
-        void ReturnChecker::postvisit( __attribute__((unused)) FunctionDecl * functionDecl ) {
-                returnVals = returnValsStack.top();
-                returnValsStack.pop();
         }