Changeset 99f7f37

Timestamp:

Jul 4, 2024, 1:47:46 AM (3 days ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

8c55d34

Parents:

f8f298c

Message:

Fix the bug that enum {} var syntax cannot be recognized as cfa enum

Location:

src/Parser

Files:

• DeclarationNode.cpp (modified) (2 diffs)
• TypeData.cpp (modified) (3 diffs)
• TypeData.hpp (modified) (1 diff)

src/Parser/DeclarationNode.cpp

@@ -185 +185 @@
 } // DeclarationNode::newAggregate
 
-DeclarationNode * DeclarationNode::newEnum( const string * name, DeclarationNode * constants, bool body, bool typed, DeclarationNode * base, EnumHiding hiding ) {
+DeclarationNode * DeclarationNode::newEnum( const string * name, DeclarationNode * constants, bool body, bool isCfa, DeclarationNode * base, EnumHiding hiding ) {
         DeclarationNode * newnode = newAggregate( ast::AggregateDecl::Enum, name, nullptr, constants, body );
-        newnode->type->aggregate.typed = typed;
+        newnode->type->aggregate.isCfa = isCfa;
         newnode->type->aggregate.hiding = hiding;
         if ( base ) {
-                assert( typed );
+                assert( isCfa );
                 assert( base->type );
                 newnode->type->base = base->type;
@@ -541 +541 @@
         newaggr->aggregate.body = false;
         newaggr->aggregate.anon = oldaggr->aggregate.anon;
-        newaggr->aggregate.typed = oldaggr->aggregate.typed;
+        newaggr->aggregate.isCfa = oldaggr->aggregate.isCfa;
         newaggr->aggregate.hiding = oldaggr->aggregate.hiding;
         swap( newaggr, oldaggr );

src/Parser/TypeData.cpp

@@ -84 +84 @@
                 aggregate.body = false;
                 aggregate.anon = false;
-                aggregate.typed = false;
+                aggregate.isCfa = false;
                 aggregate.hiding = EnumHiding::Visible;
                 break;
@@ -218 +218 @@
                 newtype->aggregate.body = aggregate.body;
                 newtype->aggregate.anon = aggregate.anon;
+                newtype->aggregate.isCfa = aggregate.isCfa;
+                newtype->aggregate.hiding = aggregate.hiding;
                 break;
         case AggregateInst:
@@ -1456 +1458 @@
                 td->location,
                 *td->aggregate.name,
-                td->aggregate.typed,
+                td->aggregate.isCfa,
                 std::move( attributes ),
                 linkage,

src/Parser/TypeData.hpp

@@ -60 +60 @@
                 // Is this type anonymous? (Name can still be set to generated name.)
                 bool anon;
-                // Is this a typed enumeration? Type may be stored in base.
-                bool typed;
+                // Is this a cfa enumeration? Type stored in base.
+                bool isCfa;
                 EnumHiding hiding;
         };