Changeset 3f27b9a for src

Timestamp:

Aug 15, 2017, 3:03:34 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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:

fcc88a4

Parents:

c6c6f2ae

Message:

Fix scoping issues for CatchStmt?

Location:

src

Files:

• ResolvExpr/Resolver.cc (modified) (2 diffs)
• SymTab/Indexer.cc (modified) (2 diffs)
• SymTab/Indexer.h (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -394 +394 @@
 
         void Resolver::visit( CatchStmt *catchStmt ) {
-                Parent::visit( catchStmt );
+                // inline Indexer::visit so that the exception variable is still in-scope for
+                // findSingleExpression() below
+                Parent::enterScope();
+                Visitor::visit( catchStmt );
                 
                 if ( catchStmt->get_cond() ) {
@@ -403 +406 @@
                         catchStmt->set_cond( findSingleExpression( wrapped, *this ) );
                 }
+
+                Parent::leaveScope();
         }
 

src/SymTab/Indexer.cc

@@ -353 +353 @@
         }
 
+        void Indexer::visit( ForStmt *forStmt ) {
+            // for statements introduce a level of scope
+            enterScope();
+            Visitor::visit( forStmt );
+            leaveScope();
+        }
+
+        void Indexer::visit( CatchStmt *catchStmt ) {
+                // catch statements introduce a level of scope (for the caught exception)
+                enterScope();
+                Visitor::visit( catchStmt );
+                leaveScope();
+        }
 
         void Indexer::visit( ApplicationExpr *applicationExpr ) {
@@ -556 +569 @@
                 leaveScope();
         }
-
-        void Indexer::visit( ForStmt *forStmt ) {
-            // for statements introduce a level of scope
-            enterScope();
-            Visitor::visit( forStmt );
-            leaveScope();
-        }
-
-
 
         void Indexer::lookupId( const std::string &id, std::list< DeclarationWithType* > &out ) const {

src/SymTab/Indexer.h

@@ -45 +45 @@
 
                 virtual void visit( CompoundStmt *compoundStmt );
+                virtual void visit( ForStmt *forStmt );
+                virtual void visit( CatchStmt *catchStmt );
 
                 virtual void visit( ApplicationExpr *applicationExpr );
@@ -81 +83 @@
                 virtual void visit( StructInstType *contextInst );
                 virtual void visit( UnionInstType *contextInst );
-
-                virtual void visit( ForStmt *forStmt );
 
                 // when using an indexer manually (e.g., within a mutator traversal), it is necessary to tell the indexer