Changeset 7527e63 for src/Parser/lex.ll

Timestamp:

Aug 16, 2016, 3:20:06 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

1f6d4624

Parents:

950f7a7 (diff), 7880579 (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/lex.ll (modified) (3 diffs)

src/Parser/lex.ll

@@ -9 +9 @@
  * Author           : Peter A. Buhr
  * Created On       : Sat Sep 22 08:58:10 2001
- * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Jun 23 07:29:30 2016
- * Update Count     : 457
+ * Last Modified By : 
+ * Last Modified On : Sun Jul 31 07:19:36 2016
+ * Update Count     : 459
  */
 
@@ -213 +213 @@
 __extension__   { KEYWORD_RETURN(EXTENSION); }                  // GCC
 extern                  { KEYWORD_RETURN(EXTERN); }
+fallthrough             { KEYWORD_RETURN(FALLTHRU); }                   // CFA
 fallthru                { KEYWORD_RETURN(FALLTHRU); }                   // CFA
 finally                 { KEYWORD_RETURN(FINALLY); }                    // CFA
@@ -360 +361 @@
 ">>="                   { NAMEDOP_RETURN(RSassign); }
 
-"@="                    { NAMEDOP_RETURN(ATassign); }
+"@="                    { NAMEDOP_RETURN(ATassign); }                   // CFA
 
                                 /* CFA, operator identifier */