Changes in src/Parser/DeclarationNode.cc [78e2fca:692c1cc]

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 24 11:10:03 2023
-// Update Count     : 1400
+// Last Modified On : Thu Feb 16 14:12:03 2023
+// Update Count     : 1388
 //
 
@@ -61 +61 @@
         variable.initializer = nullptr;
 
+//      attr.name = nullptr;
+        attr.expr = nullptr;
+        attr.type = nullptr;
+
         assert.condition = nullptr;
         assert.message = nullptr;
@@ -66 +70 @@
 
 DeclarationNode::~DeclarationNode() {
+//      delete attr.name;
+        delete attr.expr;
+        delete attr.type;
+
 //      delete variable.name;
         delete variable.assertions;
@@ -107 +115 @@
         newnode->variable.initializer = maybeClone( variable.initializer );
 
+//      newnode->attr.name = attr.name ? new string( *attr.name ) : nullptr;
+        newnode->attr.expr = maybeClone( attr.expr );
+        newnode->attr.type = maybeClone( attr.type );
+
         newnode->assert.condition = maybeClone( assert.condition );
         newnode->assert.message = maybeClone( assert.message );
@@ -254 +266 @@
         newnode->type->enumeration.typed = typed;
         newnode->type->enumeration.hiding = hiding;
-        if ( base && base->type )  {
+        if ( base && base->type)  {
                 newnode->type->base = base->type;
         } // if
@@ -567 +579 @@
 
         checkQualifiers( type, q->type );
-        if ( (builtin == Zero || builtin == One) && q->type->qualifiers.any() && error.length() == 0 ) {
+        if ( (builtin == Zero || builtin == One) && q->type->qualifiers.val != 0 && error.length() == 0 ) {
                 SemanticWarning( yylloc, Warning::BadQualifiersZeroOne, Type::QualifiersNames[ilog2( q->type->qualifiers.val )], builtinTypeNames[builtin] );
         } // if
@@ -984 +996 @@
 
                         if ( DeclarationNode * extr = cur->extractAggregate() ) {
-                                // Handle the case where a SUE declaration is contained within an object or type declaration.
-
-                                assert( cur->type );
-                                // Replace anonymous SUE name with typedef name to prevent anonymous naming problems across translation units.
-                                if ( cur->type->kind == TypeData::Symbolic && cur->type->symbolic.isTypedef ) {
-                                        assert( extr->type );
-                                        // Handle anonymous aggregates: typedef struct { int i; } foo
-                                        extr->type->qualifiers.reset();         // clear any CVs associated with the aggregate
-                                        if ( extr->type->kind == TypeData::Aggregate && extr->type->aggregate.anon ) {
-                                                delete extr->type->aggregate.name;
-                                                extr->type->aggregate.name = new string( "__anonymous_" + *cur->name );
-                                                extr->type->aggregate.anon = false;
-                                                assert( cur->type->base );
-                                                if ( cur->type->base ) {
-                                                        delete cur->type->base->aggInst.aggregate->aggregate.name;
-                                                        cur->type->base->aggInst.aggregate->aggregate.name = new string( "__anonymous_" + *cur->name );
-                                                        cur->type->base->aggInst.aggregate->aggregate.anon = false;
-                                                        cur->type->base->aggInst.aggregate->qualifiers.reset();
-                                                } // if
-                                        } // if
-                                        // Handle anonymous enumeration: typedef enum { A, B, C } foo
-                                        if ( extr->type->kind == TypeData::Enum && extr->type->enumeration.anon ) {
-                                                delete extr->type->enumeration.name;
-                                                extr->type->enumeration.name = new string( "__anonymous_" + *cur->name );
-                                                extr->type->enumeration.anon = false;
-                                                assert( cur->type->base );
-                                                if ( cur->type->base ) {
-                                                        delete cur->type->base->aggInst.aggregate->enumeration.name;
-                                                        cur->type->base->aggInst.aggregate->enumeration.name = new string( "__anonymous_" + *cur->name );
-                                                        cur->type->base->aggInst.aggregate->enumeration.anon = false;
-                                                } // if
-                                        } // if
-                                } // if
+                                // handle the case where a structure declaration is contained within an object or type declaration
 
                                 Declaration * decl = extr->build();
@@ -1233 +1213 @@
         assert( type );
 
+        if ( attr.expr ) {
+                return new AttrType( buildQualifiers( type ), *name, attr.expr->build(), attributes );
+        } else if ( attr.type ) {
+                return new AttrType( buildQualifiers( type ), *name, attr.type->buildType(), attributes );
+        } // if
+
         switch ( type->kind ) {
           case TypeData::Enum: