Changeset 4520b77e for src/Parser/DeclarationNode.cc

Timestamp:

Sep 20, 2022, 8:37:05 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

a065f1f

Parents:

d489da8 (diff), 12df6fe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge to Master Sept 19

File:

• src/Parser/DeclarationNode.cc (modified) (4 diffs)

src/Parser/DeclarationNode.cc

@@ -254 +254 @@
 } // DeclarationNode::newAggregate
 
-DeclarationNode * DeclarationNode::newEnum( const string * name, DeclarationNode * constants, bool body, DeclarationNode * base) {
+DeclarationNode * DeclarationNode::newEnum( const string * name, DeclarationNode * constants, bool body, bool typed, DeclarationNode * base) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Enum );
@@ -261 +261 @@
         newnode->type->enumeration.body = body;
         newnode->type->enumeration.anon = name == nullptr;
+        newnode->type->enumeration.typed = typed;
         if ( base && base->type)  {
                 newnode->type->base = base->type;
         } // if
 
-        // Check: if base has TypeData
         return newnode;
 } // DeclarationNode::newEnum
@@ -285 +285 @@
 
 DeclarationNode * DeclarationNode::newEnumValueGeneric( const string * name, InitializerNode * init ) {
-        if ( init ) { // list init {} or a singleInit
-                if ( init->get_expression() ) { // singleInit
+        if ( init ) {
+                if ( init->get_expression() ) {
                         return newEnumConstant( name, init->get_expression() );
-                } else { // TODO: listInit
+                } else {
                         DeclarationNode * newnode = newName( name );
                         newnode->initializer = init;
@@ -294 +294 @@
                 } // if
         } else {
-                return newName( name ); // Not explicitly inited enum value;
+                return newName( name );
         } // if
 } // DeclarationNode::newEnumValueGeneric