Changeset b1e63ac5 for src/GenPoly/DeclMutator.cc

Timestamp:

Jul 4, 2017, 9:40:16 AM (8 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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into references

File:

• src/GenPoly/DeclMutator.cc (modified) (15 diffs)

src/GenPoly/DeclMutator.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri Nov 27 14:44:00 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:16:43 2016
-// Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jun 22 13:49:00 2017
+// Update Count     : 4
 //
 
@@ -20 +20 @@
 
 namespace GenPoly {
-        namespace {
-                const std::list<Label> noLabels;
-        }
-
         DeclMutator::DeclMutator() : Mutator(), declsToAdd(1), declsToAddAfter(1) {}
 
         DeclMutator::~DeclMutator() {}
-        
+
         void DeclMutator::mutateDeclarationList( std::list< Declaration* > &decls ) {
                 for ( std::list< Declaration* >::iterator decl = decls.begin(); ; ++decl ) {
@@ -34 +30 @@
 
                         if ( decl == decls.end() ) break;
-                        
+
                         // run mutator on declaration
                         *decl = maybeMutate( *decl, *this );
@@ -55 +51 @@
                 newBack->splice( newBack->end(), *back );
                 declsToAdd.pop_back();
-                
+
                 back = declsToAddAfter.rbegin();
                 newBack = back + 1;
@@ -66 +62 @@
                 CompoundStmt *compoundStmt = dynamic_cast< CompoundStmt* >(stmt);
                 if ( compoundStmt ) return mutate( compoundStmt );
-                
+
                 doBeginScope();
-                
+
                 // run mutator on statement
                 stmt = maybeMutate( stmt, *this );
@@ -102 +98 @@
                 doBeginScope();
 
-                
+
                 for ( std::list< Statement* >::iterator stmt = stmts.begin(); ; ++stmt ) {
                         // add any new declarations after the previous statement
@@ -112 +108 @@
 
                         if ( stmt == stmts.end() ) break;
-                        
+
                         // run mutator on statement
                         *stmt = maybeMutate( *stmt, *this );
@@ -123 +119 @@
                         declsToAdd.back().clear();
                 }
-                
+
                 doEndScope();
         }
@@ -139 +135 @@
                 return compoundStmt;
         }
-        
+
         Statement* DeclMutator::mutate(IfStmt *ifStmt) {
                 ifStmt->set_condition( maybeMutate( ifStmt->get_condition(), *this ) );
@@ -146 +142 @@
                 return ifStmt;
         }
-        
+
         Statement* DeclMutator::mutate(WhileStmt *whileStmt) {
                 whileStmt->set_condition( maybeMutate( whileStmt->get_condition(), *this ) );
@@ -152 +148 @@
                 return whileStmt;
         }
-        
+
         Statement* DeclMutator::mutate(ForStmt *forStmt) {
                 mutateAll( forStmt->get_initialization(), *this );
@@ -160 +156 @@
                 return forStmt;
         }
-        
+
         Statement* DeclMutator::mutate(SwitchStmt *switchStmt) {
                 switchStmt->set_condition( maybeMutate( switchStmt->get_condition(), *this ) );
@@ -166 +162 @@
                 return switchStmt;
         }
-        
+
         Statement* DeclMutator::mutate(CaseStmt *caseStmt) {
                 caseStmt->set_condition( maybeMutate( caseStmt->get_condition(), *this ) );
@@ -172 +168 @@
                 return caseStmt;
         }
-        
+
         Statement* DeclMutator::mutate(TryStmt *tryStmt) {
                 tryStmt->set_block( maybeMutate( tryStmt->get_block(), *this ) );
@@ -179 +175 @@
                 return tryStmt;
         }
-        
+
         Statement* DeclMutator::mutate(CatchStmt *catchStmt) {
                 catchStmt->set_decl( maybeMutate( catchStmt->get_decl(), *this ) );
+                catchStmt->set_cond( maybeMutate( catchStmt->get_cond(), *this ) );
                 catchStmt->set_body( mutateStatement( catchStmt->get_body() ) );
                 return catchStmt;