Changeset dc2b4d6

Timestamp:

Jul 17, 2017, 12:18:36 PM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

17954f0e

Parents:

e5f2a67

Message:

Discused updates to handler predicate parsing.

File:

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

src/Parser/parser.yy

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 15 15:59:50 2017
-// Update Count     : 2454
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jul 17 12:17:00 2017
+// Update Count     : 2455
 //
 
@@ -980 +980 @@
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, nullptr, new ExpressionNode( build_constantInteger( *$6 ) ), $9 ) ) ); }
 
-        | handler_key '(' push push exception_declaration handler_predicate_opt pop ')' compound_statement pop
+        | handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
                 { $$ = new StatementNode( build_catch( $1, $5, nullptr, $9 ) ); }
-        | handler_clause handler_key '(' push push exception_declaration handler_predicate_opt pop ')' compound_statement pop
+        | handler_clause handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $6, nullptr, $10 ) ) ); }
         ;
@@ -988 +988 @@
 handler_predicate_opt:
         //empty
-        | ':' conditional_expression
+        | ';' conditional_expression
         ;