Changeset 4c530a5 for src/Parser/DeclarationNode.cc

Timestamp:

Apr 21, 2022, 9:03:39 AM (2 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

94d91e17

Parents:

3c79ea9 (diff), f6e6a55 (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/Parser/DeclarationNode.cc

@@ -253 +253 @@
 } // DeclarationNode::newAggregate
 
-DeclarationNode * DeclarationNode::newEnum( const string * name, DeclarationNode * constants, bool body, bool typed) {
+DeclarationNode * DeclarationNode::newEnum( const string * name, DeclarationNode * constants, bool body) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Enum );
@@ -272 +272 @@
 } // DeclarationNode::newName
 
-DeclarationNode * DeclarationNode::newEnumConstant( const string * name, ExpressionNode * constant ) { // Marker
+DeclarationNode * DeclarationNode::newEnumConstant( const string * name, ExpressionNode * constant ) {
         DeclarationNode * newnode = newName( name );
         newnode->enumeratorValue.reset( constant );
         return newnode;
 } // DeclarationNode::newEnumConstant
+
+DeclarationNode * DeclarationNode::newEnumValueGeneric( const string * name, InitializerNode * init ) {
+        if ( init ) { // list init {} or a singleInit
+                if ( init->get_expression() ) { // singleInit
+                        return newEnumConstant( name, init->get_expression() );
+                } else { // TODO: listInit
+                        DeclarationNode * newnode = newName( name );
+                        newnode->initializer = init;
+                        return newnode;
+                } // if
+        } else {
+                return newName( name ); // Not explicitly inited enum value;
+        } // if
+} // DeclarationNode::newEnumGeneric
 
 DeclarationNode * DeclarationNode::newFromTypedef( const string * name ) {