Changes in / [2de175ce:c84dd61]

Location:

src

Files:

• Parser/parser.yy (modified) (4 diffs)
• Validate/GenericParameter.cpp (modified) (1 diff)

src/Parser/parser.yy

@@ -2694 +2694 @@
                         $$ = DeclarationNode::newEnum( nullptr, $7, true, true, $3 )->addQualifiers( $5 );
                 }
-        | ENUM '(' ')' attribute_list_opt '{' enumerator_list comma_opt '}'
-                {
-                        $$ = DeclarationNode::newEnum( nullptr, $6, true, true )->addQualifiers( $4 );
-                }
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt identifier attribute_list_opt
                 {
@@ -2709 +2705 @@
                         $$ = DeclarationNode::newEnum( $6, $11, true, true, $3, $9 )->addQualifiers( $5 )->addQualifiers( $7 );
                 }
-        | ENUM '(' ')' attribute_list_opt identifier attribute_list_opt
-          hide_opt '{' enumerator_list comma_opt '}'
-                {
-                        $$ = DeclarationNode::newEnum( $5, $9, true, true, nullptr, $7 )->addQualifiers( $4 )->addQualifiers( $6 );
-                }
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt typedef_name attribute_list_opt
           hide_opt '{' enumerator_list comma_opt '}'
                 {
                         $$ = DeclarationNode::newEnum( $6->name, $10, true, true, $3, $8 )->addQualifiers( $5 )->addQualifiers( $7 );
-                }
-        | ENUM '(' ')' attribute_list_opt typedef_name attribute_list_opt
-          hide_opt '{' enumerator_list comma_opt '}'
-                {
-                        $$ = DeclarationNode::newEnum( $5->name, $9, true, true, nullptr, $7 )->addQualifiers( $4 )->addQualifiers( $6 );
                 }
         | enum_type_nobody
@@ -2835 +2821 @@
 
 cfa_abstract_parameter_declaration:                                             // CFA, new & old style parameter declaration
-        abstract_parameter_declaration
+        // empty
+                { $$ = nullptr; }
+        | abstract_parameter_declaration
         | cfa_identifier_parameter_declarator_no_tuple
         | cfa_abstract_tuple
@@ -3860 +3848 @@
                 // { SemanticError( yylloc, "New array dimension is currently unimplemented." ); $$ = nullptr; }
         | '[' push array_type_list pop ']'                                      // CFA
-                { SemanticError( yylloc, "Type array dimension is currently unimplemented." ); $$ = nullptr; }
+                { $$ = DeclarationNode::newArray( $3, nullptr, false ); }
         | multi_array_dimension
         ;

src/Validate/GenericParameter.cpp

@@ -277 +277 @@
 const ast::Expr * TranslateDimensionCore::postvisit(
                 const ast::TypeExpr * expr ) {
-        // Does nothing, except prevents matching ast::Expr (above).
+        if ( auto instType = dynamic_cast<const ast::EnumInstType *>( expr->type.get() ) ) {
+                const ast::EnumDecl * baseEnum = instType->base.get();
+                return ast::ConstantExpr::from_int( expr->location, baseEnum->members.size() );
+        }
         return expr;
 }