Changeset 5bf685f for src/Parser/DeclarationNode.cc

Timestamp:

Jan 17, 2024, 3:13:56 PM (6 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

11f65b3

Parents:

e891349

Message:

Replayed maybeClone with maybeCopy, removed unused helppers in utility.h and pushed some includes out of headers.

File:

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

src/Parser/DeclarationNode.cc

@@ -35 +35 @@
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/UniqueName.h"     // for UniqueName
-#include "Common/utility.h"        // for maybeClone
+#include "Common/utility.h"        // for copy, spliceBegin
 #include "Parser/ExpressionNode.h" // for ExpressionNode
 #include "Parser/InitializerNode.h"// for InitializerNode
@@ -41 +41 @@
 #include "TypeData.h"              // for TypeData, TypeData::Aggregate_t
 #include "TypedefTable.h"          // for TypedefTable
-
-class Initializer;
 
 extern TypedefTable typedefTable;
@@ -101 +99 @@
 DeclarationNode * DeclarationNode::clone() const {
         DeclarationNode * newnode = new DeclarationNode;
-        newnode->set_next( maybeClone( get_next() ) );
+        newnode->set_next( maybeCopy( get_next() ) );
         newnode->name = name ? new string( *name ) : nullptr;
 
         newnode->builtin = NoBuiltinType;
-        newnode->type = maybeClone( type );
+        newnode->type = maybeCopy( type );
         newnode->inLine = inLine;
         newnode->storageClasses = storageClasses;
         newnode->funcSpecs = funcSpecs;
-        newnode->bitfieldWidth = maybeClone( bitfieldWidth );
-        newnode->enumeratorValue.reset( maybeClone( enumeratorValue.get() ) );
+        newnode->bitfieldWidth = maybeCopy( bitfieldWidth );
+        newnode->enumeratorValue.reset( maybeCopy( enumeratorValue.get() ) );
         newnode->hasEllipsis = hasEllipsis;
         newnode->linkage = linkage;
         newnode->asmName = maybeCopy( asmName );
         newnode->attributes = attributes;
-        newnode->initializer = maybeClone( initializer );
+        newnode->initializer = maybeCopy( initializer );
         newnode->extension = extension;
-        newnode->asmStmt = maybeClone( asmStmt );
+        newnode->asmStmt = maybeCopy( asmStmt );
         newnode->error = error;
 
 //      newnode->variable.name = variable.name ? new string( *variable.name ) : nullptr;
         newnode->variable.tyClass = variable.tyClass;
-        newnode->variable.assertions = maybeClone( variable.assertions );
-        newnode->variable.initializer = maybeClone( variable.initializer );
-
-        newnode->assert.condition = maybeClone( assert.condition );
+        newnode->variable.assertions = maybeCopy( variable.assertions );
+        newnode->variable.initializer = maybeCopy( variable.initializer );
+
+        newnode->assert.condition = maybeCopy( assert.condition );
         newnode->assert.message = maybeCopy( assert.message );
         return newnode;
@@ -664 +662 @@
                                 dst->base->aggInst.aggregate = src;
                                 if ( src->kind == TypeData::Aggregate ) {
-                                        dst->base->aggInst.params = maybeClone( src->aggregate.actuals );
+                                        dst->base->aggInst.params = maybeCopy( src->aggregate.actuals );
                                 } // if
                                 dst->base->qualifiers |= src->qualifiers;
@@ -694 +692 @@
                                         if ( o->type->kind == TypeData::Aggregate ) {
                                                 type->aggInst.hoistType = o->type->aggregate.body;
-                                                type->aggInst.params = maybeClone( o->type->aggregate.actuals );
+                                                type->aggInst.params = maybeCopy( o->type->aggregate.actuals );
                                         } else {
                                                 type->aggInst.hoistType = o->type->enumeration.body;
@@ -860 +858 @@
                                 p->type->base->aggInst.aggregate = type;
                                 if ( type->kind == TypeData::Aggregate ) {
-                                        p->type->base->aggInst.params = maybeClone( type->aggregate.actuals );
+                                        p->type->base->aggInst.params = maybeCopy( type->aggregate.actuals );
                                 } // if
                                 p->type->base->qualifiers |= type->qualifiers;
@@ -897 +895 @@
                         lastArray->base->aggInst.aggregate = type;
                         if ( type->kind == TypeData::Aggregate ) {
-                                lastArray->base->aggInst.params = maybeClone( type->aggregate.actuals );
+                                lastArray->base->aggInst.params = maybeCopy( type->aggregate.actuals );
                         } // if
                         lastArray->base->qualifiers |= type->qualifiers;
@@ -950 +948 @@
 DeclarationNode * DeclarationNode::cloneType( string * name ) {
         DeclarationNode * newnode = newName( name );
-        newnode->type = maybeClone( type );
+        newnode->type = maybeCopy( type );
         newnode->copySpecifiers( this );
         return newnode;
@@ -984 +982 @@
                 } // if
 
-                newType->forall = maybeClone( type->forall );
+                newType->forall = maybeCopy( type->forall );
                 if ( ! o->type ) {
                         o->type = newType;