Changeset d2ded3e7 for src/Parser/lex.ll

Timestamp:

Oct 28, 2015, 3:47:29 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

37a3b8f9, 4673385, e56cfdb0

Parents:

698664b3 (diff), 097e2b0 (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 changes into current branch

File:

• src/Parser/lex.ll (modified) (7 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 : Fri Jun 19 11:10:14 2015
- * Update Count     : 392
+ * Last Modified On : Thu Oct  8 16:13:07 2015
+ * Update Count     : 404
  */
 
@@ -182 +182 @@
 __asm                   { KEYWORD_RETURN(ASM); }                                // GCC
 __asm__                 { KEYWORD_RETURN(ASM); }                                // GCC
+_At                             { KEYWORD_RETURN(AT); }                                 // CFA
 _Atomic                 { KEYWORD_RETURN(ATOMIC); }                             // C11
 __attribute             { KEYWORD_RETURN(ATTRIBUTE); }                  // GCC
@@ -190 +191 @@
 case                    { KEYWORD_RETURN(CASE); }
 catch                   { KEYWORD_RETURN(CATCH); }                              // CFA
+catchResume             { KEYWORD_RETURN(CATCHRESUME); }                // CFA
 char                    { KEYWORD_RETURN(CHAR); }
 choose                  { KEYWORD_RETURN(CHOOSE); }                             // CFA
@@ -201 +203 @@
 continue                { KEYWORD_RETURN(CONTINUE); }
 default                 { KEYWORD_RETURN(DEFAULT); }
+disable                 { KEYWORD_RETURN(DISABLE); }                    // CFA
 do                              { KEYWORD_RETURN(DO); }
 double                  { KEYWORD_RETURN(DOUBLE); }
 dtype                   { KEYWORD_RETURN(DTYPE); }                              // CFA
 else                    { KEYWORD_RETURN(ELSE); }
+enable                  { KEYWORD_RETURN(ENABLE); }                             // CFA
 enum                    { KEYWORD_RETURN(ENUM); }
 __extension__   { KEYWORD_RETURN(EXTENSION); }                  // GCC
@@ -247 +251 @@
 _Thread_local   { KEYWORD_RETURN(THREADLOCAL); }                // C11
 throw                   { KEYWORD_RETURN(THROW); }                              // CFA
+throwResume             { KEYWORD_RETURN(THROWRESUME); }                // CFA
 try                             { KEYWORD_RETURN(TRY); }                                // CFA
 type                    { KEYWORD_RETURN(TYPE); }                               // CFA
@@ -351 +356 @@
 ">>="                   { NAMEDOP_RETURN(RSassign); }
 
+"@="                    { NAMEDOP_RETURN(ATassign); }
+
                                 /* CFA, operator identifier */
 {op_unary}"?"   { IDENTIFIER_RETURN(); }                                // unary
 "?"({op_unary_pre_post}|"()"|"[?]"|"{}") { IDENTIFIER_RETURN(); }
+"^?{}" { IDENTIFIER_RETURN(); }
 "?"{op_binary_over}"?"  { IDENTIFIER_RETURN(); }                // binary
         /*
@@ -381 +389 @@
           an argument list.
         */
-{op_unary}"?"(({op_unary_pre_post}|"[?]")|({op_binary_over}"?")) {
+{op_unary}"?"({op_unary_pre_post}|"[?]"|{op_binary_over}"?") {
         // 1 or 2 character unary operator ?
         int i = yytext[1] == '?' ? 1 : 2;