Changeset 201aeb9 for src/Parser/parser.yy

Timestamp:

Sep 26, 2017, 11:22:08 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

d67cdb7

Parents:

9bae71f

Message:

first attempt at new basic-type int128, and length suffix with explicit size

File:

• src/Parser/parser.yy (modified) (5 diffs)

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 Sep 14 23:07:12 2017
-// Update Count     : 2815
+// Last Modified On : Sat Sep 23 17:43:15 2017
+// Update Count     : 2829
 //
 
@@ -43 +43 @@
 #define YYDEBUG_LEXER_TEXT (yylval)                                             // lexer loads this up each time
 #define YYDEBUG 1                                                                               // get the pretty debugging code to compile
-#define YYERROR_VERBOSE
+#define YYERROR_VERBOSE                                                                 // more information in syntax errors
 
 #undef __GNUC_MINOR__
@@ -117 +117 @@
 bool forall = false;                                                                    // aggregate have one or more forall qualifiers ?
 
-# define YYLLOC_DEFAULT(Cur, Rhs, N)                            \
-do                                                              \
-        if (N) {                                                      \
-                (Cur).first_line   = YYRHSLOC(Rhs, 1).first_line;           \
-                (Cur).first_column = YYRHSLOC(Rhs, 1).first_column;         \
-                (Cur).last_line    = YYRHSLOC(Rhs, N).last_line;            \
-                (Cur).last_column  = YYRHSLOC(Rhs, N).last_column;          \
-                (Cur).filename     = YYRHSLOC(Rhs, 1).filename;             \
-        } else {                                                      \
-                (Cur).first_line   = (Cur).last_line   =                    \
-                        YYRHSLOC(Rhs, 0).last_line;                               \
-                (Cur).first_column = (Cur).last_column =                    \
-                        YYRHSLOC(Rhs, 0).last_column;                             \
-                (Cur).filename     = YYRHSLOC(Rhs, 0).filename;             \
-        }                                                             \
-while (0)
+// https://www.gnu.org/software/bison/manual/bison.html#Location-Type
+#define YYLLOC_DEFAULT(Cur, Rhs, N)                                                                                             \
+if ( N ) {                                                                                                                                              \
+        (Cur).first_line   = YYRHSLOC( Rhs, 1 ).first_line;                                                     \
+        (Cur).first_column = YYRHSLOC( Rhs, 1 ).first_column;                                           \
+        (Cur).last_line    = YYRHSLOC( Rhs, N ).last_line;                                                      \
+        (Cur).last_column  = YYRHSLOC( Rhs, N ).last_column;                                            \
+        (Cur).filename     = YYRHSLOC( Rhs, 1 ).filename;                                                       \
+} else {                                                                                                                                                \
+        (Cur).first_line   = (Cur).last_line = YYRHSLOC( Rhs, 0 ).last_line;            \
+        (Cur).first_column = (Cur).last_column = YYRHSLOC( Rhs, 0 ).last_column;        \
+        (Cur).filename     = YYRHSLOC( Rhs, 0 ).filename;                                                       \
+}
 %}
 
 %define parse.error verbose
 
-// Types declaration
+// Types declaration for productions
 %union
 {
@@ -173 +170 @@
 %token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED
 %token BOOL COMPLEX IMAGINARY                                                   // C99
+%token INT128 FLOAT80 FLOAT128                                                  // GCC
 %token ZERO_T ONE_T                                                                             // CFA
 %token VALIST                                                                                   // GCC
@@ -1606 +1604 @@
 
 basic_type_name:
-        CHAR
+        VOID
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Void ); }
+        | BOOL                                                                                          // C99
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
+        | CHAR
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Char ); }
+        | INT
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Int ); }
+        | INT128
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Int128 ); }
+        | FLOAT
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Float ); }
+        | FLOAT80
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Float80 ); }
+        | FLOAT128
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Float128 ); }
         | DOUBLE
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Double ); }
-        | FLOAT
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Float ); }
-        | INT
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Int ); }
-        | LONG
-                { $$ = DeclarationNode::newLength( DeclarationNode::Long ); }
-        | SHORT
-                { $$ = DeclarationNode::newLength( DeclarationNode::Short ); }
+        | COMPLEX                                                                                       // C99
+                { $$ = DeclarationNode::newComplexType( DeclarationNode::Complex ); }
+        | IMAGINARY                                                                                     // C99
+                { $$ = DeclarationNode::newComplexType( DeclarationNode::Imaginary ); }
         | SIGNED
                 { $$ = DeclarationNode::newSignedNess( DeclarationNode::Signed ); }
         | UNSIGNED
                 { $$ = DeclarationNode::newSignedNess( DeclarationNode::Unsigned ); }
-        | VOID
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Void ); }
-        | BOOL                                                                                          // C99
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
-        | COMPLEX                                                                                       // C99
-                { $$ = DeclarationNode::newComplexType( DeclarationNode::Complex ); }
-        | IMAGINARY                                                                                     // C99
-                { $$ = DeclarationNode::newComplexType( DeclarationNode::Imaginary ); }
+        | SHORT
+                { $$ = DeclarationNode::newLength( DeclarationNode::Short ); }
+        | LONG
+                { $$ = DeclarationNode::newLength( DeclarationNode::Long ); }
         | ZERO_T
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }