Changeset 724c2b6 for src/SymTab

Timestamp:

Jul 15, 2015, 4:47:48 PM (10 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'

Location:

src/SymTab

Files:

• AddVisit.h (modified) (2 diffs)
• Validate.cc (modified) (3 diffs)

src/SymTab/AddVisit.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 16:14:32 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 16:16:38 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:26:17 2015
+// Update Count     : 4
 //
 
@@ -57 +57 @@
         inline void addVisit(ForStmt *forStmt, Visitor &visitor) {
                 addVisitStatement( forStmt->get_body(), visitor );
-                maybeAccept( forStmt->get_initialization(), visitor );
+                acceptAll( forStmt->get_initialization(), visitor );
                 maybeAccept( forStmt->get_condition(), visitor );
                 maybeAccept( forStmt->get_increment(), visitor );

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Jul 13 14:38:19 2015
-// Update Count     : 184
+// Last Modified On : Tue Jul 14 12:27:54 2015
+// Update Count     : 186
 //
 
@@ -535 +535 @@
                 init->get_args().push_back( new NameExpr( "0" ) );
                 Statement *initStmt = new ExprStmt( noLabels, init );
-  
+                std::list<Statement *> initList;
+                initList.push_back( initStmt );
+
                 UntypedExpr *cond = new UntypedExpr( new NameExpr( "?<?" ) );
                 cond->get_args().push_back( new VariableExpr( index ) );
@@ -560 +562 @@
                 assignExpr->get_args().push_back( srcIndex );
   
-                *out++ = new ForStmt( noLabels, initStmt, cond, inc, new ExprStmt( noLabels, assignExpr ) );
+                *out++ = new ForStmt( noLabels, initList, cond, inc, new ExprStmt( noLabels, assignExpr ) );
         }