Changes in src/Parser/DeclarationNode.cc [c0aa336:44a81853]

File:

• src/Parser/DeclarationNode.cc (modified) (13 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 : Mon Feb  6 16:01:29 2017
-// Update Count     : 739
+// Last Modified On : Sat Jan 14 14:36:23 2017
+// Update Count     : 669
 //
 
@@ -83 +83 @@
 DeclarationNode * DeclarationNode::clone() const {
         DeclarationNode * newnode = new DeclarationNode;
-        newnode->set_next( maybeClone( get_next() ) );
+        newnode->type = maybeClone( type );
         newnode->name = name ? new string( *name ) : nullptr;
-
-        newnode->type = maybeClone( type );
         newnode->storageClass = storageClass;
-        newnode->bitfieldWidth = maybeClone( bitfieldWidth );
         newnode->isInline = isInline;
         newnode->isNoreturn = isNoreturn;
-        newnode->enumeratorValue.reset( maybeClone( enumeratorValue.get() ) );
+        newnode->bitfieldWidth = maybeClone( bitfieldWidth );
         newnode->hasEllipsis = hasEllipsis;
+        newnode->initializer = maybeClone( initializer );
+        newnode->set_next( maybeClone( get_next() ) );
         newnode->linkage = linkage;
         newnode->asmName = maybeClone( asmName );
-        cloneAll( attributes, newnode->attributes );
-        newnode->initializer = maybeClone( initializer );
-        newnode->extension = extension;
-        newnode->error = error;
 
 //      newnode->variable.name = variable.name ? new string( *variable.name ) : nullptr;
@@ -164 +159 @@
         newnode->type->function.newStyle = newStyle;
         newnode->type->function.body = body;
-
         // ignore unnamed routine declarations: void p( int (*)(int) );
         if ( newnode->name ) {
@@ -442 +436 @@
         } // if
         appendError( error, q->error );
-} // DeclarationNode::checkStorageClasses
+} // DeclarationNode::copyStorageClasses
 
 DeclarationNode * DeclarationNode::copyStorageClasses( DeclarationNode * q ) {
@@ -452 +446 @@
                 storageClass = q->storageClass;
         } // if
-
-        for ( Attribute *attr: reverseIterate( q->attributes ) ) {
-                attributes.push_front( attr->clone() );
-        } // for
+        attributes.splice( attributes.end(), q->attributes );
         return this;
 } // DeclarationNode::copyStorageClasses
@@ -665 +656 @@
 }
 
-DeclarationNode * DeclarationNode::addAsmName( DeclarationNode * newname ) {
+DeclarationNode * DeclarationNode::addAsmName( ConstantExpr * newname ) {
         assert( ! asmName );
-        asmName = newname ? newname->asmName : nullptr;
-        return this->addQualifiers( newname );
+        asmName = newname;
+        return this;
 }
 
@@ -699 +690 @@
 }
 
-DeclarationNode * DeclarationNode::setBase( TypeData * newType ) {
+static void setBase( TypeData *&type, TypeData * newType ) {
         if ( type ) {
                 TypeData * prevBase = type;
@@ -711 +702 @@
                 type = newType;
         } // if
-        return this;
-}
-
-DeclarationNode * DeclarationNode::copyAttribute( DeclarationNode * a ) {
-        if ( a ) {
-                for ( Attribute *attr: reverseIterate( a->attributes ) ) {
-                        attributes.push_front( attr );
-                } // for
-                a->attributes.clear();
-        } // if
-        return this;
-} // copyAttribute
+}
 
 DeclarationNode * DeclarationNode::addPointer( DeclarationNode * p ) {
         if ( p ) {
                 assert( p->type->kind == TypeData::Pointer );
-                setBase( p->type );
+                setBase( type, p->type );
                 p->type = nullptr;
-                copyAttribute( p );
                 delete p;
         } // if
@@ -738 +717 @@
         if ( a ) {
                 assert( a->type->kind == TypeData::Array );
-                setBase( a->type );
+                setBase( type, a->type );
                 a->type = nullptr;
-                copyAttribute( a );
                 delete a;
         } // if
@@ -812 +790 @@
         TypeData * ftype = new TypeData( TypeData::Function );
         ftype->function.params = params;
-        setBase( ftype );
+        setBase( type, ftype );
         return this;
 }
@@ -858 +836 @@
                 TypeData * srcType = type;
 
-                // search for the base type by scanning off pointers and array designators
                 while ( srcType->base ) {
                         srcType = srcType->base;
@@ -1009 +986 @@
         if ( attr.expr ) {
 //              return new AttrType( buildQualifiers( type ), *attr.name, attr.expr->build() );
-                return new AttrType( buildQualifiers( type ), *name, attr.expr->build(), attributes );
+                return new AttrType( buildQualifiers( type ), *name, attr.expr->build() );
         } else if ( attr.type ) {
 //              return new AttrType( buildQualifiers( type ), *attr.name, attr.type->buildType() );
-                return new AttrType( buildQualifiers( type ), *name, attr.type->buildType(), attributes );
+                return new AttrType( buildQualifiers( type ), *name, attr.type->buildType() );
         } // if
 
         switch ( type->kind ) {
-          case TypeData::Enum: {
-                  EnumDecl * typedecl = buildEnum( type, attributes );
-                  return new EnumInstType( buildQualifiers( type ), typedecl );
-          }
+          case TypeData::Enum:
+                return new EnumInstType( buildQualifiers( type ), *type->enumeration.name );
           case TypeData::Aggregate: {
-                  AggregateDecl * typedecl = buildAggregate( type, attributes );
                   ReferenceToType * ret;
                   switch ( type->aggregate.kind ) {
                         case DeclarationNode::Struct:
-                          ret = new StructInstType( buildQualifiers( type ), (StructDecl *)typedecl );
+                          ret = new StructInstType( buildQualifiers( type ), *type->aggregate.name );
                           break;
                         case DeclarationNode::Union:
-                          ret = new UnionInstType( buildQualifiers( type ), (UnionDecl *)typedecl );
+                          ret = new UnionInstType( buildQualifiers( type ), *type->aggregate.name );
                           break;
                         case DeclarationNode::Trait:
-                          assert( false );
-                          //ret = new TraitInstType( buildQualifiers( type ), (TraitDecl *)typedecl );
+                          ret = new TraitInstType( buildQualifiers( type ), *type->aggregate.name );
                           break;
                         default:
@@ -1041 +1014 @@
           }
           case TypeData::Symbolic: {
-                  TypeInstType * ret = new TypeInstType( buildQualifiers( type ), *type->symbolic.name, false, attributes );
+                  TypeInstType * ret = new TypeInstType( buildQualifiers( type ), *type->symbolic.name, false );
                   buildList( type->symbolic.actuals, ret->get_parameters() );
                   return ret;
           }
           default:
-                Type * simpletypes = typebuild( type );
-                simpletypes->get_attributes() = attributes;             // copy because member is const
-                return simpletypes;
+                return typebuild( type );
         } // switch
 }