Index: src/Parser/parser.yy
===================================================================
--- src/Parser/parser.yy	(revision daf1af80c44ed2335beaaef08ee5072ea619ef52)
+++ src/Parser/parser.yy	(revision cfaabe2c14415175ec7c513717b8c8d4211ed05c)
@@ -9,7 +9,7 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
-// Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun 25 16:58:00 2017
-// Update Count     : 2399
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jun 10 07:58:44 2017
+// Update Count     : 2401
 //
 
@@ -193,5 +193,5 @@
 %type<sn> case_value_list				case_label					case_label_list
 %type<sn> switch_clause_list_opt		switch_clause_list			choose_clause_list_opt		choose_clause_list
-%type<sn> handler_list					handler_clause				finally_clause
+%type<sn> /* handler_list */			handler_clause				finally_clause
 
 // declarations
@@ -937,24 +937,24 @@
 
 exception_statement:
-	TRY compound_statement handler_list
+	TRY compound_statement handler_clause
 		{ $$ = new StatementNode( build_try( $2, $3, 0 ) ); }
 	| TRY compound_statement finally_clause
 		{ $$ = new StatementNode( build_try( $2, 0, $3 ) ); }
-	| TRY compound_statement handler_list finally_clause
+	| TRY compound_statement handler_clause finally_clause
 		{ $$ = new StatementNode( build_try( $2, $3, $4 ) ); }
 	;
 
-handler_list:
-	handler_clause
-		// ISO/IEC 9899:1999 Section 15.3(6 ) If present, a "..." handler shall be the last handler for its try block.
-	| CATCH '(' ELLIPSIS ')' compound_statement
-		{ $$ = new StatementNode( build_catch( 0, $5, true ) ); }
-	| handler_clause CATCH '(' ELLIPSIS ')' compound_statement
-		{ $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
-	| CATCHRESUME '(' ELLIPSIS ')' compound_statement
-		{ $$ = new StatementNode( build_catch( 0, $5, true ) ); }
-	| handler_clause CATCHRESUME '(' ELLIPSIS ')' compound_statement
-		{ $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
-	;
+//handler_list:
+//	handler_clause
+//		// ISO/IEC 9899:1999 Section 15.3(6 ) If present, a "..." handler shall be the last handler for its try block.
+//	| CATCH '(' ELLIPSIS ')' compound_statement
+//		{ $$ = new StatementNode( build_catch( 0, $5, true ) ); }
+//	| handler_clause CATCH '(' ELLIPSIS ')' compound_statement
+//		{ $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
+//	| CATCHRESUME '(' ELLIPSIS ')' compound_statement
+//		{ $$ = new StatementNode( build_catch( 0, $5, true ) ); }
+//	| handler_clause CATCHRESUME '(' ELLIPSIS ')' compound_statement
+//		{ $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
+//	;
 
 handler_clause: