Changeset 7f6a7c9 for src/Parser/DeclarationNode.cc

Timestamp:

Sep 21, 2022, 11:02:15 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95dab9e

Parents:

428adbc (diff), 0bd46fd (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' into pthread-emulation

File:

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

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 14 17:36:57 2021
-// Update Count     : 1154
+// Last Modified On : Mon Aug  8 17:07:00 2022
+// Update Count     : 1185
 //
 
@@ -128 +128 @@
         if ( name ) {
                 os << *name << ": ";
-        } else {
-                os << "unnamed: ";
         } // if
 
@@ -154 +152 @@
                 initializer->printOneLine( os );
                 os << " maybe constructed? " << initializer->get_maybeConstructed();
-
-        } // if
+        } // if
+
+        for ( Attribute * attr: reverseIterate( attributes ) ) {
+                os << string( indent + 2, ' ' ) << "attr " << attr->name.c_str();
+        } // for
 
         os << endl;
@@ -243 +244 @@
         newnode->type = new TypeData( TypeData::Aggregate );
         newnode->type->aggregate.kind = kind;
-        newnode->type->aggregate.name =  name == nullptr ? new string( DeclarationNode::anonymous.newName() ) : name;
+        newnode->type->aggregate.name = name == nullptr ? new string( DeclarationNode::anonymous.newName() ) : name;
         newnode->type->aggregate.actuals = actuals;
         newnode->type->aggregate.fields = fields;
@@ -253 +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 );
@@ -260 +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
+                newnode->type->base = base->type;
+        } // if
+
         return newnode;
 } // DeclarationNode::newEnum
@@ -284 +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;
@@ -293 +294 @@
                 } // if
         } else {
-                return newName( name ); // Not explicitly inited enum value;
+                return newName( name );
         } // if
 } // DeclarationNode::newEnumValueGeneric
@@ -504 +505 @@
                         } // for
                         // src is the new item being added and has a single bit
-                } else if ( ! src->storageClasses.is_threadlocal ) { // conflict ?
+                } else if ( ! src->storageClasses.is_threadlocal_any() ) { // conflict ?
                         appendError( error, string( "conflicting " ) + Type::StorageClassesNames[storageClasses.ffs()] +
                                                  " & " + Type::StorageClassesNames[src->storageClasses.ffs()] );
@@ -518 +519 @@
         storageClasses |= q->storageClasses;
 
-        for ( Attribute *attr: reverseIterate( q->attributes ) ) {
+        for ( Attribute * attr: reverseIterate( q->attributes ) ) {
                 attributes.push_front( attr->clone() );
         } // for
@@ -683 +684 @@
         } // if
         delete o;
+
         return this;
 }