Changeset 724c2b6 for src/Parser

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'

File:

• src/Parser/StatementNode.cc (modified) (3 diffs)

src/Parser/StatementNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 14:59:41 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  6 23:25:41 2015
-// Update Count     : 19
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:20:44 2015
+// Update Count     : 21
 //
 
@@ -271 +271 @@
                         assert( ctl != 0 );
 
-                        Statement *stmt = 0;
-                        if ( ctl->get_init() != 0 )
-                                stmt = ctl->get_init()->build();
+                        std::list<Statement *> init;
+                        if ( ctl->get_init() != 0 ) {
+                                buildList( ctl->get_init(), init );
+                        }
 
                         Expression *cond = 0;
@@ -283 +284 @@
                                 incr = ctl->get_change()->build();
 
-                        return new ForStmt( labs, stmt, cond, incr, branches.front() );
+                        return new ForStmt( labs, init, cond, incr, branches.front() );
                 }
           case Switch: