Changeset 3f7e12cb for src/Parser/lex.ll

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 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:

954908d

Parents:

78315272 (diff), e35f30a (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) (6 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 : Sun Sep 10 22:29:15 2017
- * Update Count     : 620
+ * Last Modified On : Wed Oct 25 13:53:56 2017
+ * Update Count     : 634
  */
 
@@ -93 +93 @@
                                 // numeric constants, CFA: '_' in constant
 hex_quad {hex}("_"?{hex}){3}
-length ("ll"|"LL"|[lL])|("hh"|"HH"|[hH])
+size_opt (8|16|32|64|128)?
+length ("ll"|"LL"|[lL]{size_opt})|("hh"|"HH"|[hH])
 integer_suffix_opt ("_"?(([uU]({length}?[iI]?)|([iI]{length}))|([iI]({length}?[uU]?)|([uU]{length}))|({length}([iI]?[uU]?)|([uU][iI]))|[zZ]))?{user_suffix_opt}
 
@@ -109 +110 @@
                                 // GCC: D (double) and iI (imaginary) suffixes, and DL (long double)
 exponent "_"?[eE]"_"?[+-]?{decimal_digits}
-floating_suffix ([fFdDlL]?[iI]?)|([iI][lLfFdD])
+floating_size 32|64|80|128
+floating_length ([fFdDlL]|[lL]{floating_size})
+floating_suffix ({floating_length}?[iI]?)|([iI]{floating_length})
 floating_suffix_opt ("_"?({floating_suffix}|"DL"))?{user_suffix_opt}
 decimal_digits ({decimal})|({decimal}({decimal}|"_")*{decimal})
@@ -230 +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); }
-__float128              { KEYWORD_RETURN(FLOAT); }                              // GCC
+__float80               { KEYWORD_RETURN(FLOAT80); }                    // GCC
+float80                 { KEYWORD_RETURN(FLOAT80); }                    // GCC
+__float128              { KEYWORD_RETURN(FLOAT128); }                   // GCC
+float128                { KEYWORD_RETURN(FLOAT128); }                   // GCC
 for                             { KEYWORD_RETURN(FOR); }
 forall                  { KEYWORD_RETURN(FORALL); }                             // CFA
@@ -249 +255 @@
 __inline__              { KEYWORD_RETURN(INLINE); }                             // GCC
 int                             { KEYWORD_RETURN(INT); }
-__int128                { KEYWORD_RETURN(INT); }                                // GCC
-__int128_t              { KEYWORD_RETURN(INT); }                                // GCC
+__int128                { KEYWORD_RETURN(INT128); }                             // GCC
+int128                  { KEYWORD_RETURN(INT128); }                             // GCC
 __label__               { KEYWORD_RETURN(LABEL); }                              // GCC
 long                    { KEYWORD_RETURN(LONG); }
@@ -285 +291 @@
 __typeof                { KEYWORD_RETURN(TYPEOF); }                             // GCC
 __typeof__              { KEYWORD_RETURN(TYPEOF); }                             // GCC
-__uint128_t             { KEYWORD_RETURN(INT); }                                // GCC
 union                   { KEYWORD_RETURN(UNION); }
 unsigned                { KEYWORD_RETURN(UNSIGNED); }