Changeset cde3891 for src/Parser/lex.ll

Timestamp:

Jan 23, 2019, 4:52:16 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a200795

Parents:

9b086ca (diff), 1d832f4 (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' into cleanup-dtors

File:

• src/Parser/lex.ll (modified) (3 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 : Wed Aug  8 17:23:17 2018
- * Update Count     : 685
+ * Last Modified On : Thu Nov  1 20:57:35 2018
+ * Update Count     : 687
  */
 
@@ -209 +209 @@
 __attribute__   { KEYWORD_RETURN(ATTRIBUTE); }                  // GCC
 auto                    { KEYWORD_RETURN(AUTO); }
+basetypeof              { KEYWORD_RETURN(BASETYPEOF); }                 // CFA
 _Bool                   { KEYWORD_RETURN(BOOL); }                               // C99
 break                   { KEYWORD_RETURN(BREAK); }
@@ -410 +411 @@
 ">>="                   { NAMEDOP_RETURN(RSassign); }
 
-"~="                    { NAMEDOP_RETURN(Erange); }                             // CFA
 "@="                    { NAMEDOP_RETURN(ATassign); }                   // CFA
+"~="                    { NAMEDOP_RETURN(ErangeUpEq); }                 // CFA
+"-~"                    { NAMEDOP_RETURN(ErangeDown); }                 // CFA
+"-~="                   { NAMEDOP_RETURN(ErangeDownEq); }               // CFA
 
                                 /* CFA, operator identifier */