Changeset 1ced874 for src/GenPoly/PolyMutator.cc

Timestamp:

Sep 6, 2016, 4:36:29 PM (9 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:

e76acbe

Parents:

0362d42 (diff), f04a8b81 (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 tuples

File:

• src/GenPoly/PolyMutator.cc (modified) (2 diffs)

src/GenPoly/PolyMutator.cc

@@ -30 +30 @@
 
         void PolyMutator::mutateStatementList( std::list< Statement* > &statements ) {
+                SemanticError errors;
+
                 for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
                         if ( ! stmtsToAddAfter.empty() ) {
                                 statements.splice( i, stmtsToAddAfter );
                         } // if
-                        *i = (*i)->acceptMutator( *this );
+                        try {
+                                *i = (*i)->acceptMutator( *this );
+                        } catch ( SemanticError &e ) {
+                                errors.append( e );
+                        } // try
                         if ( ! stmtsToAdd.empty() ) {
                                 statements.splice( i, stmtsToAdd );
@@ -42 +48 @@
                         statements.splice( statements.end(), stmtsToAddAfter );
                 } // if
+                if ( ! errors.isEmpty() ) {
+                        throw errors;
+                }
         }