Changeset 057608a

Timestamp:

Mar 18, 2024, 5:44:22 PM (8 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

5b25c49

Parents:

8f650f0

Message:

Parser clean-up: Removed an unused field, added a comment, fixed a memory leak and reformated a function.

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (5 diffs)
• TypeData.cc (modified) (2 diffs)
• TypeData.h (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -185 +185 @@
         newnode->type->aggregate.fields = fields;
         newnode->type->aggregate.body = body;
-        newnode->type->aggregate.tagged = false;
         newnode->type->aggregate.parent = nullptr;
         return newnode;
@@ -199 +198 @@
         newnode->type->enumeration.typed = typed;
         newnode->type->enumeration.hiding = hiding;
-        if ( base && base->type )  {
+        if ( base ) {
+                assert( typed );
+                assert( base->type );
                 newnode->type->base = base->type;
+                base->type = nullptr;
+                delete base;
         } // if
 
@@ -220 +223 @@
 
 DeclarationNode * DeclarationNode::newEnumValueGeneric( const string * name, InitializerNode * init ) {
-        if ( init ) {
-                if ( init->get_expression() ) {
-                        return newEnumConstant( name, init->get_expression() );
-                } else {
-                        DeclarationNode * newnode = newName( name );
-                        newnode->initializer = init;
-                        return newnode;
-                } // if
+        if ( nullptr == init ) {
+                return newName( name );
+        } else if ( init->get_expression() ) {
+                return newEnumConstant( name, init->get_expression() );
         } else {
-                return newName( name );
+                DeclarationNode * newnode = newName( name );
+                newnode->initializer = init;
+                return newnode;
         } // if
 } // DeclarationNode::newEnumValueGeneric
@@ -549 +550 @@
         newaggr->aggregate.body = false;
         newaggr->aggregate.anon = oldaggr->aggregate.anon;
-        newaggr->aggregate.tagged = oldaggr->aggregate.tagged;
         swap( newaggr, oldaggr );
 
@@ -596 +596 @@
 }
 
+// Wrap the declaration in a typedef. It actually does that by modifying the
+// existing declaration, and may split it into two declarations.
+// This only happens if the wrapped type is actually a declaration of a SUE
+// type. If it does, the DeclarationNode for the SUE declaration is the node
+// returned, make sure later transformations are applied to the right node.
 DeclarationNode * DeclarationNode::addTypedef() {
         TypeData * newtype = new TypeData( TypeData::Symbolic );

src/Parser/TypeData.cc

@@ -88 +88 @@
                 aggregate.fields = nullptr;
                 aggregate.body = false;
-                aggregate.tagged = false;
                 aggregate.parent = nullptr;
                 aggregate.anon = false;
@@ -228 +227 @@
                 newtype->aggregate.body = aggregate.body;
                 newtype->aggregate.anon = aggregate.anon;
-                newtype->aggregate.tagged = aggregate.tagged;
                 break;
         case AggregateInst:

src/Parser/TypeData.h

@@ -55 +55 @@
                 bool body;
                 bool anon;
-                bool tagged;
         };