Changeset 21255675 for src/AST/Pass.impl.hpp

Timestamp:

Nov 11, 2020, 2:41:34 PM (3 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

23954b6

Parents:

6a8882c (diff), 4a36b344 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/AST/Pass.impl.hpp (modified) (2 diffs)

src/AST/Pass.impl.hpp

@@ -423 +423 @@
                 }
                 catch( SemanticErrorException &e ) {
-                        errors.append( e );
+                        if (__pass::on_error (visitor.core, *i, 0))
+                                errors.append( e );
                 }
 
@@ -683 +684 @@
                 // Do not enter (or leave) a new scope if atFunctionTop. Remember to save the result.
                 auto guard1 = makeFuncGuard( [this, enterScope = !this->atFunctionTop]() {
-                        if ( enterScope ) __pass::symtab::enter(core, 0);
+                        if ( enterScope ) {
+                                __pass::symtab::enter(core, 0);
+                                __pass::scope::enter(core, 0);
+                        }
                 }, [this, leaveScope = !this->atFunctionTop]() {
-                        if ( leaveScope ) __pass::symtab::leave(core, 0);
+                        if ( leaveScope ) {
+                                __pass::symtab::leave(core, 0);
+                                __pass::scope::leave(core, 0);
+                        }
                 });
                 ValueGuard< bool > guard2( atFunctionTop );