Changeset 85521c7 for src/Parser/parser.yy

Timestamp:

Feb 1, 2018, 5:40:01 PM (8 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:

0188a0bc

Parents:

d0a045c7 (diff), 33c0ce8 (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) (2 diffs)

src/Parser/parser.yy

@@ -259 +259 @@
 %type<sn> iteration_statement                   jump_statement
 %type<sn> expression_statement                  asm_statement
-%type<sn> with_statement                                with_clause_opt
+%type<sn> with_statement
+%type<en> with_clause_opt
 %type<sn> exception_statement                   handler_clause                          finally_clause
 %type<catch_kind> handler_key
@@ -2417 +2418 @@
                 { $$ = nullptr; }
         | WITH '(' tuple_expression_list ')'
-                { $$ = new StatementNode( build_with( $3, nullptr ) ); }
+                { $$ = $3; }
         ;