Changeset b826e6b for src/Parser/lex.ll

Timestamp:

Jul 19, 2017, 11:49:33 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

9cc0472

Parents:

fea3faa (diff), a57cb58 (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) (10 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 : Tue May 30 22:00:48 2017
- * Update Count     : 527
+ * Last Modified On : Tue Jul 18 07:11:48 2017
+ * Update Count     : 544
  */
 
@@ -27 +27 @@
 #include <cstdio>                                                                               // FILENAME_MAX
 
-#include "lex.h"
-#include "parser.h"                                                                             // YACC generated definitions based on C++ grammar
 #include "ParseNode.h"
 #include "TypedefTable.h"
@@ -61 +59 @@
 }
 
+// Stop warning due to incorrectly generated flex code.
+#pragma GCC diagnostic ignored "-Wsign-compare"
 %}
 
@@ -125 +125 @@
 op_unary {op_unary_only}|{op_unary_binary}|{op_unary_pre_post}
 
-op_binary_only "/"|"%"|"^"|"&"|"|"|"<"|">"|"="|"=="|"!="|"<<"|">>"|"<="|">="|"+="|"-="|"*="|"/="|"%="|"&="|"|="|"^="|"<<="|">>="
+op_binary_only "/"|"%"|"\\"|"^"|"&"|"|"|"<"|">"|"="|"=="|"!="|"<<"|">>"|"<="|">="|"+="|"-="|"*="|"/="|"%="|"\\="|"&="|"|="|"^="|"<<="|">>="
 op_binary_over {op_unary_binary}|{op_binary_only}
                                 // op_binary_not_over "?"|"->"|"."|"&&"|"||"|"@="
@@ -136 +136 @@
 
 %%
-                                   /* line directives */
+                                /* line directives */
 ^{h_white}*"#"{h_white}*[0-9]+{h_white}*["][^"\n]+["].*"\n" {
         /* " stop highlighting */
@@ -232 +232 @@
 int                             { KEYWORD_RETURN(INT); }
 __int128                { KEYWORD_RETURN(INT); }                                // GCC
+__int128_t              { KEYWORD_RETURN(INT); }                                // GCC
 __label__               { KEYWORD_RETURN(LABEL); }                              // GCC
 long                    { KEYWORD_RETURN(LONG); }
@@ -266 +267 @@
 __typeof                { KEYWORD_RETURN(TYPEOF); }                             // GCC
 __typeof__              { KEYWORD_RETURN(TYPEOF); }                             // GCC
+__uint128_t             { KEYWORD_RETURN(INT); }                                // GCC
 union                   { KEYWORD_RETURN(UNION); }
 unsigned                { KEYWORD_RETURN(UNSIGNED); }
@@ -274 +276 @@
 __volatile__    { KEYWORD_RETURN(VOLATILE); }                   // GCC
 while                   { KEYWORD_RETURN(WHILE); }
+with                    { KEYWORD_RETURN(WITH); }                               // CFA
 zero_t                  { NUMERIC_RETURN(ZERO_T); }                             // CFA
 
@@ -336 +339 @@
 "-"                             { ASCIIOP_RETURN(); }
 "*"                             { ASCIIOP_RETURN(); }
+"\\"                    { ASCIIOP_RETURN(); }                                   // CFA, exponentiation
 "/"                             { ASCIIOP_RETURN(); }
 "%"                             { ASCIIOP_RETURN(); }
@@ -360 +364 @@
 "+="                    { NAMEDOP_RETURN(PLUSassign); }
 "-="                    { NAMEDOP_RETURN(MINUSassign); }
+"\\="                   { NAMEDOP_RETURN(EXPassign); }                  // CFA, exponentiation
 "*="                    { NAMEDOP_RETURN(MULTassign); }
 "/="                    { NAMEDOP_RETURN(DIVassign); }