Changeset eb24cec0 for src/Parser/parser.yy

Timestamp:

Feb 17, 2021, 12:46:31 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

830299f, e7c077a

Parents:

565acf59 (diff), 9fb1367 (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) (6 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  3 18:30:12 2021
-// Update Count     : 4700
+// Last Modified On : Wed Feb 17 09:03:07 2021
+// Update Count     : 4722
 //
 
@@ -282 +282 @@
 %token ATTRIBUTE EXTENSION                                                              // GCC
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
-%token CHOOSE DISABLE ENABLE FALLTHRU FALLTHROUGH TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT WITH WHEN WAITFOR // CFA
+%token CHOOSE DISABLE ENABLE FALLTHRU FALLTHROUGH TRY THROW THROWRESUME AT WITH WHEN WAITFOR // CFA
 %token ASM                                                                                              // C99, extension ISO/IEC 9899:1999 Section J.5.10(1)
 %token ALIGNAS ALIGNOF GENERIC STATICASSERT                             // C11
 
 // names and constants: lexer differentiates between identifier and typedef names
-%token<tok> IDENTIFIER                  QUOTED_IDENTIFIER               TYPEDEFname                             TYPEGENname
-%token<tok> TIMEOUT                             WOR
-%token<tok> INTEGERconstant             CHARACTERconstant               STRINGliteral
+%token<tok> IDENTIFIER          QUOTED_IDENTIFIER       TYPEDEFname             TYPEGENname
+%token<tok> TIMEOUT                     WOR                                     CATCH                   RECOVER                 CATCHRESUME             FIXUP           FINALLY         // CFA
+%token<tok> INTEGERconstant     CHARACTERconstant       STRINGliteral
 %token<tok> DIRECTIVE
 // Floating point constant is broken into three kinds of tokens because of the ambiguity with tuple indexing and
@@ -462 +462 @@
 // Order of these lines matters (low-to-high precedence). THEN is left associative over WOR/TIMEOUT/ELSE, WOR is left
 // associative over TIMEOUT/ELSE, and TIMEOUT is left associative over ELSE.
-%precedence THEN        // rule precedence for IF/WAITFOR statement
-%precedence WOR         // token precedence for start of WOR in WAITFOR statement
-%precedence TIMEOUT     // token precedence for start of TIMEOUT in WAITFOR statement
-%precedence ELSE        // token precedence for start of else clause in IF/WAITFOR statement
+%precedence THEN                // rule precedence for IF/WAITFOR statement
+%precedence WOR                 // token precedence for start of WOR in WAITFOR statement
+%precedence TIMEOUT             // token precedence for start of TIMEOUT in WAITFOR statement
+%precedence CATCH               // token precedence for start of TIMEOUT in WAITFOR statement
+%precedence RECOVER             // token precedence for start of TIMEOUT in WAITFOR statement
+%precedence CATCHRESUME // token precedence for start of TIMEOUT in WAITFOR statement
+%precedence FIXUP               // token precedence for start of TIMEOUT in WAITFOR statement
+%precedence FINALLY             // token precedence for start of TIMEOUT in WAITFOR statement
+%precedence ELSE                // token precedence for start of else clause in IF/WAITFOR statement
+
 
 // Handle shift/reduce conflict for generic type by shifting the '(' token. For example, this string is ambiguous:
@@ -544 +550 @@
         TIMEOUT
         | WOR
+        | CATCH
+        | RECOVER
+        | CATCHRESUME
+        | FIXUP
+        | FINALLY
         ;
 
@@ -1366 +1377 @@
 
 exception_statement:
-        TRY compound_statement handler_clause
+        TRY compound_statement handler_clause                                   %prec THEN
                 { $$ = new StatementNode( build_try( $2, $3, 0 ) ); }
         | TRY compound_statement finally_clause
@@ -1389 +1400 @@
 handler_key:
         CATCH                                                                           { $$ = CatchStmt::Terminate; }
+        | RECOVER                                                                       { $$ = CatchStmt::Terminate; }
         | CATCHRESUME                                                           { $$ = CatchStmt::Resume; }
+        | FIXUP                                                                         { $$ = CatchStmt::Resume; }
         ;