Changeset 4bf5298 for translator/ResolvExpr

Timestamp:

May 14, 2015, 1:54:02 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

5c7fb6c

Parents:

c11e31c (diff), b1a6d6b (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:

update merged files from master

File:

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

translator/ResolvExpr/Resolver.cc

@@ -192 +192 @@
 
     void Resolver::visit( ForStmt *forStmt ) {
+        // SymTab::Indexer::visit( forStmt );
         Expression *newExpr;
+        // for statements introduce a level of scope
+        enterScope();
+        maybeAccept( forStmt->get_initialization(), *this );
         if ( forStmt->get_condition() ) {
             newExpr = findSingleExpression( forStmt->get_condition(), *this );
@@ -204 +208 @@
             forStmt->set_increment( newExpr );
         } // if
-  
-        Visitor::visit( forStmt );
+
+        maybeAccept( forStmt->get_condition(), *this );
+        maybeAccept( forStmt->get_increment(), *this );
+        maybeAccept( forStmt->get_body(), *this );
+        leaveScope();
     }