Changeset 522363e for src/Common/PassVisitor.impl.h

Timestamp:

Sep 14, 2017, 1:46:06 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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:

3e3d923, bff09c8, f92c696

Parents:

c57ded70

Message:

Fix PassVisitor? Indexer calls, aggregate top-level errors in PassVisitor?, convert ForallPointerDecay? and LinkReferenceToTypes? to PassVisitor?

File:

• src/Common/PassVisitor.impl.h (modified) (5 diffs)

src/Common/PassVisitor.impl.h

@@ -66 +66 @@
         DeclList_t* beforeDecls = visitor.get_beforeDecls();
         DeclList_t* afterDecls  = visitor.get_afterDecls();
+        SemanticError errors;
 
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
@@ -73 +74 @@
                 if ( i == decls.end() ) break;
 
-                // run mutator on declaration
-                maybeAccept( *i, visitor );
+                try {
+                        // run visitor on declaration
+                        maybeAccept( *i, visitor );
+                } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
+                        errors.append( e );
+                }
 
                 // splice in new declarations before current decl
                 if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
         }
+        if ( ! errors.isEmpty() ) {
+                throw errors;
+        }
 }
 
@@ -86 +95 @@
         DeclList_t* beforeDecls = mutator.get_beforeDecls();
         DeclList_t* afterDecls  = mutator.get_afterDecls();
+        SemanticError errors;
 
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
@@ -92 +102 @@
 
                 if ( i == decls.end() ) break;
-
-                // run mutator on declaration
-                *i = maybeMutate( *i, mutator );
+                try {
+                        // run mutator on declaration
+                        *i = maybeMutate( *i, mutator );
+                } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
+                        errors.append( e );
+                }
 
                 // splice in new declarations before current decl
                 if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
+        }
+        if ( ! errors.isEmpty() ) {
+                throw errors;
         }
 }
@@ -445 +462 @@
         indexerAddEnum( node );
 
-        // unlike structs, contexts, and unions, enums inject their members into the global scope
+        // unlike structs, traits, and unions, enums inject their members into the global scope
         maybeMutateRef( node->parameters, *this );
         maybeMutateRef( node->members   , *this );