Changeset 724c2b6 for src/ResolvExpr/Resolver.cc

Timestamp:

Jul 15, 2015, 4:47:48 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

1db21619

Parents:

9163b9c (diff), 1ab4ce2 (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 'resolver'

File:

• src/ResolvExpr/Resolver.cc (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul  3 16:18:20 2015
-// Update Count     : 159
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 15 14:54:04 2015
+// Update Count     : 167
 //
 
@@ -226 +226 @@
 
         void Resolver::visit( ForStmt *forStmt ) {
-            // SymTab::Indexer::visit( forStmt );
-                Expression *newExpr;
-            // for statements introduce a level of scope
-            enterScope();
-            maybeAccept( forStmt->get_initialization(), *this );
+                SymTab::Indexer::visit( forStmt );
+
                 if ( forStmt->get_condition() ) {
-                        newExpr = findSingleExpression( forStmt->get_condition(), *this );
+                        Expression * newExpr = findSingleExpression( forStmt->get_condition(), *this );
                         delete forStmt->get_condition();
                         forStmt->set_condition( newExpr );
                 } // if
-  
+                
                 if ( forStmt->get_increment() ) {
-                        newExpr = findVoidExpression( forStmt->get_increment(), *this );
+                        Expression * newExpr = findVoidExpression( forStmt->get_increment(), *this );
                         delete forStmt->get_increment();
                         forStmt->set_increment( newExpr );
                 } // if
-
-            maybeAccept( forStmt->get_condition(), *this );
-            maybeAccept( forStmt->get_increment(), *this );
-            maybeAccept( forStmt->get_body(), *this );
-            leaveScope();
         }