Changeset 1eba452 for src/Parser/parser.yy

Timestamp:

Sep 15, 2016, 10:29:43 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

fc4a0fa, fd782b2

Parents:

96a10cd (diff), 50c5cf3 (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:/u/cforall/software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

• src/Parser/parser.yy (modified) (1 diff)

src/Parser/parser.yy

@@ -827 +827 @@
                 { $$ = new StatementNode( build_while( $3, $5 ) ); }
         | DO statement WHILE '(' comma_expression ')' ';'
-                { $$ = new StatementNode( build_while( $5, $2 ) ); }
+                { $$ = new StatementNode( build_while( $5, $2, true ) ); }
         | FOR '(' push for_control_expression ')' statement
                 { $$ = new StatementNode( build_for( $4, $6 ) ); }