Changeset ef46abb for src/Parser

Timestamp:

Aug 12, 2019, 12:34:27 PM (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:

1ee048fd

Parents:

14347ac (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' into distcc

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (2 diffs)
• lex.ll (modified) (3 diffs)
• parser.yy (modified) (3 diffs)

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Mar 10 16:10:32 2019
-// Update Count     : 976
+// Last Modified On : Sun Aug  4 20:57:55 2019
+// Update Count     : 978
 //
 
@@ -109 +109 @@
 
 Expression * build_constantInteger( string & str ) {
-        static const BasicType::Kind kind[2][7] = {
+        static const BasicType::Kind kind[2][6] = {
                 // short (h) must be before char (hh) because shorter type has the longer suffix
                 { BasicType::ShortSignedInt, BasicType::SignedChar, BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt, BasicType::SignedInt128, },

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

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 25 22:31:38 2019
-// Update Count     : 4359
+// Last Modified On : Sun Aug  4 21:48:23 2019
+// Update Count     : 4364
 //
 
@@ -268 +268 @@
 %token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED
 %token BOOL COMPLEX IMAGINARY                                                   // C99
-%token INT128 uuFLOAT80 uuFLOAT128                                              // GCC
+%token INT128 UINT128 uuFLOAT80 uuFLOAT128                              // GCC
 %token uFLOAT16 uFLOAT32 uFLOAT32X uFLOAT64 uFLOAT64X uFLOAT128 // GCC
 %token ZERO_T ONE_T                                                                             // CFA
@@ -1826 +1826 @@
         | INT128
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Int128 ); }
+        | UINT128
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Int128 )->addType( DeclarationNode::newSignedNess( DeclarationNode::Unsigned ) ); }
         | FLOAT
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Float ); }