Changeset 67467a3 for src/Parser/parser.yy

Timestamp:

Mar 26, 2024, 3:17:51 PM (3 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

544b799

Parents:

84886499

Message:

Fused TypeData::Enum and TypeData::Aggregate, an enumeration is a kind of aggregate after all. There will always be some unused fields in Aggregate_t (but less in TypeData? overall) but the code is almost always simpler.

File:

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

src/Parser/parser.yy

@@ -202 +202 @@
 
 DeclarationNode * fieldDecl( DeclarationNode * typeSpec, DeclarationNode * fieldList ) {
-        if ( ! fieldList ) {                                                            // field declarator ?
-                if ( ! ( typeSpec->type && (typeSpec->type->kind == TypeData::Aggregate || typeSpec->type->kind == TypeData::Enum) ) ) {
+        if ( nullptr == fieldList ) {
+                if ( !( typeSpec->type && typeSpec->type->kind == TypeData::Aggregate ) ) {
                         stringstream ss;
                         // printf( "fieldDecl1 typeSpec %p\n", typeSpec ); typeSpec->type->print( std::cout );
@@ -2173 +2173 @@
                 {
                         SemanticError( yylloc, "syntax error, expecting ';' at end of \"%s\" declaration.",
-                                                   $1->type->enumeration.name ? "enum" : ast::AggregateDecl::aggrString( $1->type->aggregate.kind ) );
+                                                   ast::AggregateDecl::aggrString( $1->type->aggregate.kind ) );
                         $$ = nullptr;
                 }
@@ -3245 +3245 @@
                         if ( $1->linkage == ast::Linkage::Cforall && ! $1->storageClasses.is_static &&
                                  $1->type && $1->type->kind == TypeData::AggregateInst ) {
-                                if ( $1->type->aggInst.aggregate->kind == TypeData::Enum && $1->type->aggInst.aggregate->enumeration.anon ) {
-                                        SemanticError( yylloc, "extern anonymous enumeration is currently unimplemented." ); $$ = nullptr;
-                                } else if ( $1->type->aggInst.aggregate->aggregate.anon ) { // handles struct or union
-                                        SemanticError( yylloc, "extern anonymous struct/union is currently unimplemented." ); $$ = nullptr;
+                                if ( $1->type->aggInst.aggregate->aggregate.anon ) {
+                                        SemanticError( yylloc, "extern anonymous aggregate is currently unimplemented." ); $$ = nullptr;
                                 }
                         }