Changeset cb98d9d for src/Parser/DeclarationNode.cc

Timestamp:

Apr 8, 2024, 11:57:37 AM (21 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

485cf59, dd37afa

Parents:

d3a49864 (diff), d9bad51 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/Parser/DeclarationNode.cc

@@ -53 +53 @@
         linkage( ::linkage ) {
 
-//      variable.name = nullptr;
         variable.tyClass = ast::TypeDecl::NUMBER_OF_KINDS;
         variable.assertions = nullptr;
@@ -65 +64 @@
         delete name;
 
-//      delete variable.name;
         delete variable.assertions;
         delete variable.initializer;
 
-//      delete type;
+        delete type;
         delete bitfieldWidth;
 
@@ -100 +98 @@
         newnode->error = error;
 
-//      newnode->variable.name = variable.name ? new string( *variable.name ) : nullptr;
         newnode->variable.tyClass = variable.tyClass;
         newnode->variable.assertions = maybeCopy( variable.assertions );
@@ -228 +225 @@
 } // DeclarationNode::newEnumValueGeneric
 
-DeclarationNode * DeclarationNode::newEnumInLine( const string name ) {
-        DeclarationNode * newnode = newName( new std::string(name) );
+DeclarationNode * DeclarationNode::newEnumInLine( const std::string * name ) {
+        DeclarationNode * newnode = newName( name );
         newnode->enumInLine = true;
         return newnode;
@@ -460 +457 @@
                 SemanticWarning( yylloc, Warning::BadQualifiersZeroOne, TypeData::builtinTypeNames[builtin] );
         } // if
-        type = ::addQualifiers( q->type, type );
+        type = ::addQualifiers( type, q->type );
         q->type = nullptr;
 
@@ -473 +470 @@
         copySpecifiers( o, copyattr );
         if ( o->type ) {
-                type = ::addType( o->type, type, o->attributes );
+                type = ::addType( type, o->type, o->attributes );
                 o->type = nullptr;
         } // if
@@ -584 +581 @@
 DeclarationNode * DeclarationNode::addAssertions( DeclarationNode * assertions ) {
         if ( variable.tyClass != ast::TypeDecl::NUMBER_OF_KINDS ) {
-                if ( variable.assertions ) {
-                        variable.assertions->set_last( assertions );
-                } else {
-                        variable.assertions = assertions;
-                } // if
+                extend( variable.assertions, assertions );
                 return this;
         } // if
 
         assert( type );
-        switch ( type->kind ) {
-        case TypeData::Symbolic:
-                if ( type->symbolic.assertions ) {
-                        type->symbolic.assertions->set_last( assertions );
-                } else {
-                        type->symbolic.assertions = assertions;
-                } // if
-                break;
-        default:
-                assert( false );
-        } // switch
+        assert( TypeData::Symbolic == type->kind );
+        extend( type->symbolic.assertions, assertions );
 
         return this;
@@ -688 +672 @@
 
 DeclarationNode * DeclarationNode::addNewPointer( DeclarationNode * p ) {
-        if ( p ) {
-                assert( p->type->kind == TypeData::Pointer || p->type->kind == TypeData::Reference );
-                if ( type ) {
-                        p->type->base = makeNewBase( type );
-                        type = nullptr;
-                } // if
-                delete this;
-                return p;
-        } else {
-                return this;
-        } // if
+        if ( !p ) return this;
+        assert( p->type->kind == TypeData::Pointer || p->type->kind == TypeData::Reference );
+        if ( type ) {
+                p->type->base = makeNewBase( type );
+                type = nullptr;
+        } // if
+        delete this;
+        return p;
 }
 
 DeclarationNode * DeclarationNode::addNewArray( DeclarationNode * a ) {
-        if ( ! a ) return this;
+        if ( !a ) return this;
         assert( a->type->kind == TypeData::Array );
         if ( type ) {
@@ -774 +755 @@
                         if ( ret->kind == TypeData::Aggregate ) {
                                 newnode->attributes.swap( ret->aggregate.attributes );
-                        } // if 
+                        } // if
                         return newnode;
                 } // if