Changes in src/Parser/parser.yy [45161b4d:bd85400]

File:

• src/Parser/parser.yy (modified) (21 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 : Wed Apr 13 16:58:43 2016
-// Update Count     : 1519
+// Last Modified On : Mon Feb  1 18:22:42 2016
+// Update Count     : 1483
 // 
 
@@ -51 +51 @@
 #include <cstdio>
 #include <stack>
+#include "TypedefTable.h"
 #include "lex.h"
-#include "parser.h"
 #include "ParseNode.h"
-#include "TypedefTable.h"
 #include "TypeData.h"
 #include "LinkageSpec.h"
@@ -75 +74 @@
 %token FORALL LVALUE                                                                    // CFA
 %token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED
-%token VALIST                                                                                   // GCC
 %token BOOL COMPLEX IMAGINARY                                                   // C99
 %token TYPEOF LABEL                                                                             // GCC
 %token ENUM STRUCT UNION
-%token OTYPE FTYPE DTYPE TRAIT                                          // CFA
+%token TYPE FTYPE DTYPE CONTEXT                                                 // CFA
 %token SIZEOF OFFSETOF
 %token ATTRIBUTE EXTENSION                                                              // GCC
@@ -173 +171 @@
 %type<decl> basic_declaration_specifier basic_type_name basic_type_specifier direct_type_name indirect_type_name
 
-%type<decl> trait_declaration trait_declaration_list trait_declaring_list trait_specifier
+%type<decl> context_declaration context_declaration_list context_declaring_list context_specifier
 
 %type<decl> declaration declaration_list declaration_list_opt declaration_qualifier_list
@@ -199 +197 @@
 %type<decl> new_array_parameter_1st_dimension
 
-%type<decl> new_trait_declaring_list new_declaration new_field_declaring_list
+%type<decl> new_context_declaring_list new_declaration new_field_declaring_list
 %type<decl> new_function_declaration new_function_return new_function_specifier
 
@@ -372 +370 @@
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::DecrPost ), $1 ); }
         | '(' type_name_no_function ')' '{' initializer_list comma_opt '}' // C99
-                { $$ = new CompoundLiteralNode( $2, new InitializerNode( $5, true ) ); }
+                { $$ = 0; }
         | postfix_expression '{' argument_expression_list '}' // CFA
                 {
@@ -450 +448 @@
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), new TypeValueNode( $3 )); }
         | OFFSETOF '(' type_name_no_function ',' no_attr_identifier ')'
-                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::OffsetOf ), new TypeValueNode( $3 ), new VarRefNode( $5 )); }
+        { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::OffsetOf ), new TypeValueNode( $3 ), new VarRefNode( $5 )); }
         | ATTR_IDENTIFIER
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( $1 )); }
@@ -1022 +1020 @@
         | new_function_declaration pop ';'
         | type_declaring_list pop ';'
-        | trait_specifier pop ';'
+        | context_specifier pop ';'
         ;
 
@@ -1029 +1027 @@
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        $$ = $1->addInitializer( $2 );
+                        $$ = $1;
                 }
         | declaration_qualifier_list new_variable_specifier initializer_opt
@@ -1036 +1034 @@
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        $$ = $2->addQualifiers( $1 )->addInitializer( $3 );;
+                        $$ = $2->addQualifiers( $1 );
                 }
         | new_variable_declaration pop ',' push identifier_or_type_name initializer_opt
                 {
                         typedefTable.addToEnclosingScope( *$5, TypedefTable::ID );
-                        $$ = $1->appendList( $1->cloneType( $5 )->addInitializer( $6 ) );
+                        $$ = $1->appendList( $1->cloneType( $5 ) );
                 }
         ;
@@ -1347 +1345 @@
         | IMAGINARY                                                                                     // C99
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
-        | VALIST                                                                                        // GCC, __builtin_va_list
-                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
         ;
 
@@ -1438 +1434 @@
                 { $$ = DeclarationNode::newAggregate( $1, 0, 0, $3 ); }
         | aggregate_key no_attr_identifier_or_type_name
-                {
-                        typedefTable.makeTypedef( *$2 );
-                        $$ = DeclarationNode::newAggregate( $1, $2, 0, 0 );
-                }
-        | aggregate_key no_attr_identifier_or_type_name
-                { typedefTable.makeTypedef( *$2 ); }
-                '{' field_declaration_list '}'
-                { $$ = DeclarationNode::newAggregate( $1, $2, 0, $5); }
+                { $$ = DeclarationNode::newAggregate( $1, $2, 0, 0 ); }
+        | aggregate_key no_attr_identifier_or_type_name '{' field_declaration_list '}'
+                { $$ = DeclarationNode::newAggregate( $1, $2, 0, $4 ); }
         | aggregate_key '(' type_name_list ')' '{' field_declaration_list '}' // CFA
-                { $$ = DeclarationNode::newAggregate( $1, 0, $3, $6 ); }
+                { $$ = DeclarationNode::newAggregate( $1, 0, $3, $6 ); }
         | aggregate_key typegen_name                                            // CFA, S/R conflict
                 { $$ = $2; }
@@ -1525 +1516 @@
         enum_key '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( 0, $3 ); }
+        | enum_key no_attr_identifier_or_type_name '{' enumerator_list comma_opt '}'
+                { $$ = DeclarationNode::newEnum( $2, $4 ); }
         | enum_key no_attr_identifier_or_type_name
-                {
-                        typedefTable.makeTypedef( *$2 );
-                        $$ = DeclarationNode::newEnum( $2, 0 );
-                }
-        | enum_key no_attr_identifier_or_type_name
-                { typedefTable.makeTypedef( *$2 ); }
-                '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( $2, $5 ); }
+                { $$ = DeclarationNode::newEnum( $2, 0 ); }
         ;
 
@@ -1817 +1803 @@
 
 type_class:                                                                                             // CFA
-        OTYPE
+        TYPE
                 { $$ = DeclarationNode::Type; }
         | DTYPE
@@ -1835 +1821 @@
         '|' no_attr_identifier_or_type_name '(' type_name_list ')'
                 {
-                        typedefTable.openTrait( *$2 );
-                        $$ = DeclarationNode::newTraitUse( $2, $4 );
-                }
-        | '|' '{' push trait_declaration_list '}'
+                        typedefTable.openContext( *$2 );
+                        $$ = DeclarationNode::newContextUse( $2, $4 );
+                }
+        | '|' '{' push context_declaration_list '}'
                 { $$ = $4; }
-        | '|' '(' push type_parameter_list pop ')' '{' push trait_declaration_list '}' '(' type_name_list ')'
+        | '|' '(' push type_parameter_list pop ')' '{' push context_declaration_list '}' '(' type_name_list ')'
                 { $$ = 0; }
         ;
@@ -1855 +1841 @@
 
 type_declaring_list:                                                                    // CFA
-        OTYPE type_declarator
-                { $$ = $2; }
-        | storage_class_list OTYPE type_declarator
+        TYPE type_declarator
+                { $$ = $2; }
+        | storage_class_list TYPE type_declarator
                 { $$ = $3->addQualifiers( $1 ); }
         | type_declaring_list ',' type_declarator
@@ -1883 +1869 @@
         ;
 
-trait_specifier:                                                                                // CFA
-        TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' '}'
+context_specifier:                                                                              // CFA
+        CONTEXT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' '}'
                 {
                         typedefTable.addToEnclosingScope( *$2, TypedefTable::ID );
-                        $$ = DeclarationNode::newTrait( $2, $5, 0 );
-                }
-        | TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{'
-                {
-                        typedefTable.enterTrait( *$2 );
+                        $$ = DeclarationNode::newContext( $2, $5, 0 );
+                }
+        | CONTEXT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{'
+                {
+                        typedefTable.enterContext( *$2 );
                         typedefTable.enterScope();
                 }
-          trait_declaration_list '}'
-                {
-                        typedefTable.leaveTrait();
+          context_declaration_list '}'
+                {
+                        typedefTable.leaveContext();
                         typedefTable.addToEnclosingScope( *$2, TypedefTable::ID );
-                        $$ = DeclarationNode::newTrait( $2, $5, $10 );
-                }
-        ;
-
-trait_declaration_list:                                                         // CFA
-        trait_declaration
-        | trait_declaration_list push trait_declaration
+                        $$ = DeclarationNode::newContext( $2, $5, $10 );
+                }
+        ;
+
+context_declaration_list:                                                               // CFA
+        context_declaration
+        | context_declaration_list push context_declaration
                 { $$ = $1->appendList( $3 ); }
         ;
 
-trait_declaration:                                                                      // CFA
-        new_trait_declaring_list pop ';'
-        | trait_declaring_list pop ';'
-        ;
-
-new_trait_declaring_list:                                                               // CFA
+context_declaration:                                                                    // CFA
+        new_context_declaring_list pop ';'
+        | context_declaring_list pop ';'
+        ;
+
+new_context_declaring_list:                                                             // CFA
         new_variable_specifier
                 {
@@ -1924 +1910 @@
                         $$ = $1;
                 }
-        | new_trait_declaring_list pop ',' push identifier_or_type_name
+        | new_context_declaring_list pop ',' push identifier_or_type_name
                 {
                         typedefTable.addToEnclosingScope2( *$5, TypedefTable::ID );
@@ -1931 +1917 @@
         ;
 
-trait_declaring_list:                                                                   // CFA
+context_declaring_list:                                                                 // CFA
         type_specifier declarator
                 {
@@ -1937 +1923 @@
                         $$ = $2->addType( $1 );
                 }
-        | trait_declaring_list pop ',' push declarator
+        | context_declaring_list pop ',' push declarator
                 {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -2823 +2809 @@
         std::cout << "Error ";
         if ( yyfilename ) {
-                std::cout << "in file " << yyfilename << " ";
+            std::cout << "in file " << yyfilename << " ";
         } // if
         std::cout << "at line " << yylineno << " reading token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << std::endl;