Changes in src/Parser/parser.yy [61fc4f6:9a705dc8]

File:

• src/Parser/parser.yy (modified) (11 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 : Sun Apr 29 14:20:17 2018
-// Update Count     : 3206
+// Last Modified On : Tue Apr 17 17:10:30 2018
+// Update Count     : 3144
 //
 
@@ -133 +133 @@
 } // build_postfix_name
 
-bool forall = false, xxx = false;                                               // aggregate have one or more forall qualifiers ?
+bool forall = false;                                                                    // aggregate have one or more forall qualifiers ?
 
 // https://www.gnu.org/software/bison/manual/bison.html#Location-Type
@@ -208 +208 @@
 %token<tok> ATTR_IDENTIFIER             ATTR_TYPEDEFname                ATTR_TYPEGENname
 %token<tok> INTEGERconstant             CHARACTERconstant               STRINGliteral
-%token<tok> DIRECTIVE
 // Floating point constant is broken into three kinds of tokens because of the ambiguity with tuple indexing and
 // overloading constants 0/1, e.g., x.1 is lexed as (x)(.1), where (.1) is a factional constant, but is semantically
@@ -283 +282 @@
 %type<decl> aggregate_type aggregate_type_nobody
 
-%type<decl> assertion assertion_list assertion_list_opt
+%type<decl> assertion assertion_list_opt
 
 %type<en>   bit_subrange_size_opt bit_subrange_size
@@ -876 +875 @@
                 { SemanticError( yylloc, "enable/disable statement is currently unimplemented." ); $$ = nullptr; }
         | asm_statement
-        | DIRECTIVE
-                { $$ = new StatementNode( build_dirstmt( $1 ) ); }
         ;
 
@@ -1869 +1866 @@
                 {
                         typedefTable.makeTypedef( *$3 );
-                        if ( forall ) typedefTable.changeKind( *$3, TypedefTable::TG ); // possibly update
-                        forall = false;                                                         // reset
                         $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );
                 }
@@ -2240 +2235 @@
                 { $$ = DeclarationNode::newTypeParam( $1, $2 )->addTypeInitializer( $4 )->addAssertions( $5 ); }
         | type_specifier identifier_parameter_declarator
-        | assertion_list
-                { $$ = DeclarationNode::newTypeParam( DeclarationNode::Dtype, new string( DeclarationNode::anonymous.newName() ) )->addAssertions( $1 ); }
         ;
 
@@ -2258 +2251 @@
         // empty
                 { $$ = nullptr; }
-        | assertion_list
-        ;
-
-assertion_list:                                                                                 // CFA
-        assertion
-        | assertion_list assertion
+        | assertion_list_opt assertion
                 { $$ = $1 ? $1->appendList( $2 ) : $2; }
         ;
@@ -2390 +2378 @@
 external_definition_list:
         external_definition
-        | external_definition_list { forall = xxx; } push external_definition
-                { $$ = $1 ? $1->appendList( $4 ) : $4; }
+        | external_definition_list push external_definition
+                { $$ = $1 ? $1->appendList( $3 ) : $3; }
         ;
 
@@ -2423 +2411 @@
                         $$ = $2;
                 }
-        | type_qualifier_list
-                {
-                        if ( $1->type->forall ) xxx = forall = true; // remember generic type
-                }
-          push '{' external_definition_list '}'                         // CFA, namespace
-                {
-                        for ( DeclarationNode * iter = $5; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
-                                iter->addQualifiers( $1->clone() );
-                        } // for
-                        xxx = false;
-                        delete $1;
-                        $$ = $5;
-                }
-        | declaration_qualifier_list
-                {
-                        if ( $1->type->forall ) xxx = forall = true; // remember generic type
-                }
-          push '{' external_definition_list '}'                         // CFA, namespace
-                {
-                        for ( DeclarationNode * iter = $5; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
-                                iter->addQualifiers( $1->clone() );
-                        } // for
-                        xxx = false;
-                        delete $1;
-                        $$ = $5;
-                }
-        | declaration_qualifier_list type_qualifier_list
-                {
-                        if ( $1->type->forall ) xxx = forall = true; // remember generic type
-                }
-          push '{' external_definition_list '}'                         // CFA, namespace
-                {
-                        for ( DeclarationNode * iter = $6; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
-                                iter->addQualifiers( $1->clone() );
-                                iter->addQualifiers( $2->clone() );
-                        } // for
-                        xxx = false;
-                        delete $1;
-                        delete $2;
-                        $$ = $6;
-                }
+        | type_qualifier_list '{' external_definition_list '}'                  // CFA, namespace
         ;
 
@@ -2489 +2437 @@
 with_clause_opt:
         // empty
-                { $$ = nullptr; forall = false; }
+                { $$ = nullptr; }
         | WITH '(' tuple_expression_list ')'
-                { $$ = $3; forall = false; }
+                { $$ = $3; }
         ;