Changeset b1e68d03 for src/Parser/lex.ll

Timestamp:

Nov 2, 2017, 11:45:03 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

4f748c5

Parents:

85d340d (diff), 0dc954b (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:/u/cforall/software/cfa/cfa-cc

File:

• src/Parser/lex.ll (modified) (2 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 13:53:56 2017
+ * Update Count     : 634
  */
 
@@ -233 +233 @@
 __extension__   { KEYWORD_RETURN(EXTENSION); }                  // GCC
 extern                  { KEYWORD_RETURN(EXTERN); }
-fallthrough             { KEYWORD_RETURN(FALLTHRU); }                   // CFA
 fallthru                { KEYWORD_RETURN(FALLTHRU); }                   // CFA
+fallthrough             { KEYWORD_RETURN(FALLTHROUGH); }                // CFA
 finally                 { KEYWORD_RETURN(FINALLY); }                    // CFA
 float                   { KEYWORD_RETURN(FLOAT); }