Changes in src/Parser/parser.yy [67cf18c:84d58c5]

File:

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

src/Parser/parser.yy

@@ -1606 +1606 @@
 
 typegen_name:                                                                                   // CFA
-        TYPEGENname '(' ')'
-                { $$ = DeclarationNode::newFromTypeGen( $1, nullptr ); }
-        | TYPEGENname '(' type_list ')'
+        TYPEGENname '(' type_list ')'
                 { $$ = DeclarationNode::newFromTypeGen( $1, $3 ); }
         ;
@@ -1985 +1983 @@
 
 type_parameter_list:                                                                    // CFA
-        type_parameter
-                { $$ = $1; }
-        | type_parameter_list ',' type_parameter
+        type_parameter type_initializer_opt
+        | type_parameter_list ',' type_parameter type_initializer_opt
                 { $$ = $1->appendList( $3 ); }
         ;
@@ -2001 +1998 @@
         type_class no_attr_identifier_or_type_name
                 { typedefTable.addToEnclosingScope( *$2, TypedefTable::TD ); }
-          type_initializer_opt assertion_list_opt
-                { $$ = DeclarationNode::newTypeParam( $1, $2 )->addTypeInitializer( $4 )->addAssertions( $5 ); }
+          assertion_list_opt
+                { $$ = DeclarationNode::newTypeParam( $1, $2 )->addAssertions( $4 ); }
         | type_specifier identifier_parameter_declarator
         ;