Changeset 4b234f0

Timestamp:

Jul 14, 2017, 12:22:30 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

6ea87486, b706db1

Parents:

eb2fe4f (diff), 24fc196 (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:software/cfa/cfa-cc

File:

• src/Parser/parser.yy (modified) (3 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 12 18:23:36 2017
-// Update Count     : 2426
+// Last Modified On : Thu Jul 13 14:38:54 2017
+// Update Count     : 2431
 //
 
@@ -939 +939 @@
 
 with_statement:
-        WITH identifier_list compound_statement
+        WITH '(' tuple_expression_list ')' compound_statement
                 { $$ = (StatementNode *)0; }                                    // FIX ME
         ;
@@ -2222 +2222 @@
         // empty
                 { $$ = (StatementNode *)0; }                                    // FIX ME
-        | WITH identifier_list
+        | WITH '(' tuple_expression_list ')'
                 { $$ = (StatementNode *)0; }                                    // FIX ME
         ;