Changeset 6395817 for src

Timestamp:

Oct 26, 2017, 12:17:52 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

f54a0ab

Parents:

b7170a64 (diff), 15e4e22 (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

Location:

src/Parser

Files:

• lex.ll (modified) (2 diffs)
• parser.yy (modified) (6 diffs)

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sat Sep 23 17:29:28 2017
- * Update Count     : 632
+ * Last Modified On : Wed Oct 25 12:19:27 2017
+ * Update Count     : 633
  */
 
@@ -233 +233 @@
 __extension__   { KEYWORD_RETURN(EXTENSION); }                  // GCC
 extern                  { KEYWORD_RETURN(EXTERN); }
-fallthrough             { KEYWORD_RETURN(FALLTHRU); }                   // CFA
+fallthrough             { KEYWORD_RETURN(FALLTHROUGH); }                // CFA
 fallthru                { KEYWORD_RETURN(FALLTHRU); }                   // CFA
 finally                 { KEYWORD_RETURN(FINALLY); }                    // CFA

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct 16 11:07:29 2017
-// Update Count     : 2892
+// Last Modified On : Wed Oct 25 12:28:54 2017
+// Update Count     : 2893
 //
 
@@ -180 +180 @@
 %token ATTRIBUTE EXTENSION                                                              // GCC
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
-%token CHOOSE DISABLE ENABLE FALLTHRU TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT WITH WHEN WAITFOR // CFA
+%token CHOOSE DISABLE ENABLE FALLTHRU FALLTHROUGH TRY CATCH CATCHRESUME FINALLY 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
@@ -362 +362 @@
 %precedence ELSE        // token precedence for start of else clause in IF/WAITFOR statement
 
-%locations
+%locations                      // support location tracking for error messages
 
 %start translation_unit                                                                 // parse-tree root
@@ -974 +974 @@
         ;
 
+fall_through_name:                                                                              // CFA
+        FALLTHRU
+        | FALLTHROUGH
+        ;
+
 fall_through:                                                                                   // CFA
-        FALLTHRU
+        fall_through_name
                 { $$ = nullptr; }
-        | FALLTHRU ';'
+        | fall_through_name ';'
                 { $$ = nullptr; }
         ;
@@ -2486 +2491 @@
         | TYPEDEFname
         | TYPEGENname
+        | FALLTHROUGH
+                { $$ = Token{ new string( "fallthrough" ), { nullptr, -1 } }; }
         | CONST
                 { $$ = Token{ new string( "__const__" ), { nullptr, -1 } }; }
@@ -2751 +2758 @@
 //
 //              typedef int foo;
-//              forall( otype T ) foo( T );
+//              forall( otype T ) struct foo;
 //              int f( int foo ); // redefine typedef name in new scope
 //