Ignore:
Timestamp:
Aug 29, 2018, 3:23:55 PM (3 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/parser.yy

    ra42a654 rf8b69da7  
    13101310
    13111311handler_clause:
    1312         handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
     1312        handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
    13131313                { $$ = new StatementNode( build_catch( $1, $4, $6, $8 ) ); }
    1314         | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
     1314        | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
    13151315                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $5, $7, $9 ) ) ); }
    13161316        ;
Note: See TracChangeset for help on using the changeset viewer.