Changeset f8b69da7 for src/Parser

Timestamp:

Aug 29, 2018, 3:23:55 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

a715b5c

Parents:

a42a654 (diff), 546b51e (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' into cleanup-dtors

File:

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

src/Parser/parser.yy

@@ -1310 +1310 @@
 
 handler_clause:
-        handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+        handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
                 { $$ = new StatementNode( build_catch( $1, $4, $6, $8 ) ); }
-        | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+        | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $5, $7, $9 ) ) ); }
         ;