Changeset b3976bf for src/Parser/lex.ll

Timestamp:

Aug 12, 2019, 11:05:36 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

dee1f89

Parents:

cc4218f (diff), 4f5a8a2 (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

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Jul 25 22:08:32 2019
- * Update Count     : 716
+ * Last Modified On : Sun Aug  4 20:53:47 2019
+ * Update Count     : 719
  */
 
@@ -273 +273 @@
 __inline__              { KEYWORD_RETURN(INLINE); }                             // GCC
 int                             { KEYWORD_RETURN(INT); }
+int128                  { KEYWORD_RETURN(INT128); }                             // CFA
 __int128                { KEYWORD_RETURN(INT128); }                             // GCC
-int128                  { KEYWORD_RETURN(INT128); }                             // GCC
+__int128_t              { KEYWORD_RETURN(INT128); }                             // GCC
 __label__               { KEYWORD_RETURN(LABEL); }                              // GCC
 long                    { KEYWORD_RETURN(LONG); }
@@ -313 +314 @@
 __typeof__              { KEYWORD_RETURN(TYPEOF); }                             // GCC
 union                   { KEYWORD_RETURN(UNION); }
+__uint128_t             { KEYWORD_RETURN(UINT128); }                    // GCC
 unsigned                { KEYWORD_RETURN(UNSIGNED); }
 __builtin_va_list { KEYWORD_RETURN(VALIST); }                   // GCC