Changeset 6ac5223 for src/SymTab/Indexer.cc

Timestamp:

Aug 17, 2017, 3:42:21 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

e50e9ff

Parents:

97e3296 (diff), 21f0aa8 (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/SymTab/Indexer.cc (modified) (2 diffs)

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 {