Changes in src/Parser/parser.yy [d824715:374cb117]

File:

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

src/Parser/parser.yy

@@ -380 +380 @@
 
 %type<decl> enumerator_list enum_type enum_type_nobody
-%type<en> enumerator_value_opt
+%type<in> enumerator_value_opt
 
 %type<decl> external_definition external_definition_list external_definition_list_opt
@@ -2303 +2303 @@
         ;
 
-enum_type:                                                                                              // enum
+enum_type: // static DeclarationNode * newEnum( const std::string * name, DeclarationNode * constants, bool body, bool typed );                                                                                         // enum
         ENUM attribute_list_opt '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( nullptr, $4, true )->addQualifiers( $2 ); }
@@ -2315 +2315 @@
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt '{' enumerator_list comma_opt '}'
                 {
-                        if ( $3->storageClasses.val != 0 || $3->type->qualifiers.val != 0 ) { SemanticError( yylloc, "storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); }
-                        SemanticError( yylloc, "Typed enumeration is currently unimplemented." ); $$ = nullptr;
-                }
-        | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt identifier attribute_list_opt
+                        if ( $3->storageClasses.val != 0 || $3->type->qualifiers.val != 0 ) 
+                        { SemanticError( yylloc, "storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); }
+
+                        $$ = DeclarationNode::newEnum( nullptr, $7, true ) ->addQualifiers( $5 )  -> addEnumBase( $3 );
+                }
+        | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt identifier attribute_list_opt // Question: why attributes/qualifier after identifier
                 {
                         if ( $3->storageClasses.val != 0 || $3->type->qualifiers.val != 0 ) { SemanticError( yylloc, "storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); }
@@ -2325 +2327 @@
           '{' enumerator_list comma_opt '}'
                 {
-                        SemanticError( yylloc, "Typed enumeration is currently unimplemented." ); $$ = nullptr;
+                        $$ = DeclarationNode::newEnum( $6, $10, true ) -> addQualifiers( $5 ) -> addQualifiers( $7 ) -> addEnumBase( $3 );
                 }
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt typedef_name attribute_list_opt '{' enumerator_list comma_opt '}'
@@ -2331 +2333 @@
                         if ( $3->storageClasses.val != 0 || $3->type->qualifiers.val != 0 ) { SemanticError( yylloc, "storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); }
                         typedefTable.makeTypedef( *$6->name );
-                        SemanticError( yylloc, "Typed enumeration is currently unimplemented." ); $$ = nullptr;
+                        $$ = DeclarationNode::newEnum( $6->name, $9, true ) -> addQualifiers( $5 ) -> addQualifiers( $7 ) -> addEnumBase( $3 );
                 }
         | enum_type_nobody
@@ -2345 +2347 @@
 enumerator_list:
         identifier_or_type_name enumerator_value_opt
-                { $$ = DeclarationNode::newEnumConstant( $1, $2 ); }
+                { $$ = DeclarationNode::newEnumValueGeneric( $1, $2 ); }
         | INLINE type_name
-                { $$ = DeclarationNode::newEnumConstant( new string("inline"), nullptr ); }
+                { $$ = DeclarationNode::newEnumValueGeneric( new string("inline"), nullptr ); }
         | enumerator_list ',' identifier_or_type_name enumerator_value_opt
-                { $$ = $1->appendList( DeclarationNode::newEnumConstant( $3, $4 ) ); }
+                { $$ = $1->appendList( DeclarationNode::newEnumValueGeneric( $3, $4 ) ); }
         | enumerator_list ',' INLINE type_name enumerator_value_opt
-                { $$ = $1->appendList( DeclarationNode::newEnumConstant( new string("inline"), nullptr ) ); }
+                { $$ = $1->appendList( DeclarationNode::newEnumValueGeneric( new string("inline"), nullptr ) ); }
         ;
 
@@ -2360 +2362 @@
         //      { $$ = $2; }
         | simple_assignment_operator initializer
-                { $$ = $2->get_expression(); }                                  // FIX ME: enum only deals with constant_expression
+                { $$ = $1 == OperKinds::Assign ? $2 : $2->set_maybeConstructed( false ); }
         ;