Changes in src/Parser/DeclarationNode.cc [4eb3a7c5:5bf685f]

File:

• src/Parser/DeclarationNode.cc (modified) (8 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 : Fri Feb 23 18:25:57 2024
-// Update Count     : 1533
+// Last Modified On : Thu Dec 14 19:05:17 2023
+// Update Count     : 1407
 //
 
@@ -159 +159 @@
 
         if ( ! attributes.empty() ) {
-                os << string( indent + 2, ' ' ) << "with attributes" << endl;
+                os << string( indent + 2, ' ' ) << "with attributes " << endl;
                 for ( ast::ptr<ast::Attribute> const & attr : reverseIterate( attributes ) ) {
-                        os << string( indent + 4, ' ' );
-                        ast::print( os, attr, indent + 2 );
+                        os << string( indent + 4, ' ' ) << attr->name.c_str() << endl;
                 } // for
         } // if
@@ -538 +537 @@
 } // DeclarationNode::checkSpecifiers
 
-DeclarationNode * DeclarationNode::copySpecifiers( DeclarationNode * q, bool copyattr ) {
+DeclarationNode * DeclarationNode::copySpecifiers( DeclarationNode * q ) {
         funcSpecs |= q->funcSpecs;
         storageClasses |= q->storageClasses;
 
-        if ( copyattr ) {
-                std::vector<ast::ptr<ast::Attribute>> tmp;
-                tmp.reserve( q->attributes.size() );
-                for ( auto const & attr : q->attributes ) {
-                        tmp.emplace_back( ast::shallowCopy( attr.get() ) );
-                } // for
-                spliceBegin( attributes, tmp );
-        } // if
+        std::vector<ast::ptr<ast::Attribute>> tmp;
+        tmp.reserve( q->attributes.size() );
+        for ( auto const & attr : q->attributes ) {
+                tmp.emplace_back( ast::shallowCopy( attr.get() ) );
+        }
+        spliceBegin( attributes, tmp );
 
         return this;
@@ -684 +681 @@
 }
 
-DeclarationNode * DeclarationNode::addType( DeclarationNode * o, bool copyattr ) {
+DeclarationNode * DeclarationNode::addType( DeclarationNode * o ) {
         if ( o ) {
                 checkSpecifiers( o );
-                copySpecifiers( o, copyattr );
+                copySpecifiers( o );
                 if ( o->type ) {
                         if ( ! type ) {
                                 if ( o->type->kind == TypeData::Aggregate || o->type->kind == TypeData::Enum ) {
-                                        // Hide type information aggregate instances.
                                         type = new TypeData( TypeData::AggregateInst );
-                                        type->aggInst.aggregate = o->type;      // change ownership
-                                        type->aggInst.aggregate->aggregate.attributes.swap( o->attributes ); // change ownership                                        
+                                        type->aggInst.aggregate = o->type;
                                         if ( o->type->kind == TypeData::Aggregate ) {
                                                 type->aggInst.hoistType = o->type->aggregate.body;
@@ -705 +700 @@
                                         type = o->type;
                                 } // if
-                                o->type = nullptr;                                              // change ownership
+                                o->type = nullptr;
                         } else {
                                 addTypeToType( o->type, type );
@@ -958 +953 @@
 }
 
-DeclarationNode * DeclarationNode::cloneBaseType( DeclarationNode * o, bool copyattr ) {
+DeclarationNode * DeclarationNode::cloneBaseType( DeclarationNode * o ) {
         if ( ! o ) return nullptr;
 
-        o->copySpecifiers( this, copyattr );
+        o->copySpecifiers( this );
         if ( type ) {
                 TypeData * srcType = type;
@@ -1004 +999 @@
                         DeclarationNode * newnode = new DeclarationNode;
                         newnode->type = ret;
-                        if ( ret->kind == TypeData::Aggregate ) {
-                                newnode->attributes.swap( ret->aggregate.attributes );
-                        } // if 
                         return newnode;
                 } // if
@@ -1118 +1110 @@
                                         if ( extr->type->kind == TypeData::Aggregate ) {
                                                 // typedef struct { int A } B is the only case?
-                                                extracted_named = ! extr->type->aggregate.anon;
+                                                extracted_named = !extr->type->aggregate.anon;
                                         } else if ( extr->type->kind == TypeData::Enum ) {
                                                 // typedef enum { A } B is the only case?
-                                                extracted_named = ! extr->type->enumeration.anon;
+                                                extracted_named = !extr->type->enumeration.anon;
                                         } else {
                                                 extracted_named = true;