Changes in src/Parser/DeclarationNode.cc [de62360d:2871210]

File:

• src/Parser/DeclarationNode.cc (modified) (10 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 : Wed Jun 24 15:29:19 2015
-// Update Count     : 86
+// Last Modified On : Fri Jul  3 12:35:02 2015
+// Update Count     : 108
 //
 
@@ -173 +173 @@
 }
 
-DeclarationNode *DeclarationNode::newAggregate( Aggregate kind, std::string *name, DeclarationNode *formals, ExpressionNode *actuals, DeclarationNode *fields ) {
+DeclarationNode *DeclarationNode::newAggregate( Aggregate kind, const std::string *name, ExpressionNode *actuals, DeclarationNode *fields ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Aggregate );
         newnode->type->aggregate->kind = kind;
         newnode->type->aggregate->name = assign_strptr( name );
-        if ( newnode->type->aggregate->name == "" ) {
+        if ( newnode->type->aggregate->name == "" ) {           // anonymous aggregate ?
                 newnode->type->aggregate->name = DeclarationNode::anonymous.newName();
-        } // if
-
-        // SKULLDUGGERY: generate a typedef for the aggregate name so that the aggregate does not have to be qualified by
-        // "struct"
-        typedefTable.addToEnclosingScope( newnode->type->aggregate->name, TypedefTable::TD );
-        DeclarationNode *typedf = new DeclarationNode;
-        typedf->name = newnode->type->aggregate->name;
-        newnode->appendList( typedf->addType( newnode->clone() )->addTypedef() );
-
-        newnode->type->aggregate->params = formals;
+        } else {
+                // SKULLDUGGERY: generate a typedef for the aggregate name so that the aggregate does not have to be qualified
+                // by "struct"
+                typedefTable.addToEnclosingScope( newnode->type->aggregate->name, TypedefTable::TD );
+                DeclarationNode *typedf = new DeclarationNode;
+                typedf->name = newnode->type->aggregate->name;
+                newnode->appendList( typedf->addType( newnode->clone() )->addTypedef() );
+        } // if
         newnode->type->aggregate->actuals = actuals;
-        newnode->type->aggregate->members = fields;
+        newnode->type->aggregate->fields = fields;
         return newnode;
 }
@@ -200 +198 @@
         newnode->type = new TypeData( TypeData::Enum );
         newnode->type->enumeration->name = newnode->name;
-        if ( newnode->type->enumeration->name == "" ) {
+        if ( newnode->type->enumeration->name == "" ) {         // anonymous enumeration ?
                 newnode->type->enumeration->name = DeclarationNode::anonymous.newName();
-        } // if
-
-        // SKULLDUGGERY: generate a typedef for the enumeration name so that the enumeration does not have to be qualified
-        // by "enum"
-        typedefTable.addToEnclosingScope( newnode->type->enumeration->name, TypedefTable::TD );
-        DeclarationNode *typedf = new DeclarationNode;
-        typedf->name = newnode->type->enumeration->name;
-        newnode->appendList( typedf->addType( newnode->clone() )->addTypedef() );
-
+        } else {
+                // SKULLDUGGERY: generate a typedef for the enumeration name so that the enumeration does not have to be
+                // qualified by "enum"
+                typedefTable.addToEnclosingScope( newnode->type->enumeration->name, TypedefTable::TD );
+                DeclarationNode *typedf = new DeclarationNode;
+                typedf->name = newnode->type->enumeration->name;
+                newnode->appendList( typedf->addType( newnode->clone() )->addTypedef() );
+        } // if
         newnode->type->enumeration->constants = constants;
         return newnode;
@@ -251 +248 @@
         newnode->type->aggregate->kind = Context;
         newnode->type->aggregate->params = params;
-        newnode->type->aggregate->members = asserts;
+        newnode->type->aggregate->fields = asserts;
         newnode->type->aggregate->name = assign_strptr( name );
         return newnode;
@@ -371 +368 @@
                                         if ( type->kind == TypeData::Aggregate ) {
                                                 type->aggregate->params = q->type->forall;
+                                                // change implicit typedef from TYPEDEFname to TYPEGENname
+                                                typedefTable.changeKind( type->aggregate->name, TypedefTable::TG );
                                         } else {
                                                 type->forall = q->type->forall;
@@ -407 +406 @@
                                 src = 0;
                                 break;
-
                           case TypeData::Basic:
                                 dst->qualifiers.splice( dst->qualifiers.end(), src->qualifiers );
@@ -416 +414 @@
                                 } // if
                                 break;
-
                           default:
                                 switch ( src->kind ) {
@@ -429 +426 @@
                                         src = 0;
                                         break;
-
                                   default:
                                         if ( dst->forall ) {
@@ -684 +680 @@
                 } else {
                         assert( newnode->type->aggInst->aggregate->kind == TypeData::Aggregate );
-                        delete newnode->type->aggInst->aggregate->aggregate->members;
-                        newnode->type->aggInst->aggregate->aggregate->members = 0;
+                        delete newnode->type->aggInst->aggregate->aggregate->fields;
+                        newnode->type->aggInst->aggregate->aggregate->fields = 0;
                 } // if
         } // if
@@ -710 +706 @@
                                 } else {
                                         assert( newType->aggInst->aggregate->kind == TypeData::Aggregate );
-                                        delete newType->aggInst->aggregate->aggregate->members;
-                                        newType->aggInst->aggregate->aggregate->members = 0;
+                                        delete newType->aggInst->aggregate->aggregate->fields;
+                                        newType->aggInst->aggregate->aggregate->fields = 0;
                                 } // if
                         } // if