Changes in src/Parser/TypeData.cc [bd46af4:cbce272]

File:

• src/Parser/TypeData.cc (modified) (8 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 14 10:41:00 2017
-// Update Count     : 568
+// Last Modified On : Wed Aug  9 13:50:00 2017
+// Update Count     : 567
 //
 
@@ -63 +63 @@
                 aggregate.fields = nullptr;
                 aggregate.body = false;
+                aggregate.tagged = false;
+                aggregate.parent = nullptr;
                 break;
           case AggregateInst:
@@ -121 +123 @@
                 delete aggregate.actuals;
                 delete aggregate.fields;
+                delete aggregate.parent;
                 // delete aggregate;
                 break;
@@ -621 +624 @@
         switch ( td->aggregate.kind ) {
           case DeclarationNode::Struct:
+                if ( td->aggregate.tagged ) {
+                        at = new StructDecl( *td->aggregate.name, td->aggregate.parent, attributes, linkage );
+                        buildForall( td->aggregate.params, at->get_parameters() );
+                        break;
+                }
           case DeclarationNode::Coroutine:
           case DeclarationNode::Monitor:
@@ -628 +636 @@
                 break;
           case DeclarationNode::Union:
-                at = new UnionDecl( *td->aggregate.name, attributes, linkage );
+                at = new UnionDecl( *td->aggregate.name, attributes );
                 buildForall( td->aggregate.params, at->get_parameters() );
                 break;
           case DeclarationNode::Trait:
-                at = new TraitDecl( *td->aggregate.name, attributes, linkage );
+                at = new TraitDecl( *td->aggregate.name, attributes );
                 buildList( td->aggregate.params, at->get_parameters() );
                 break;
@@ -649 +657 @@
           case TypeData::Enum: {
                   if ( type->enumeration.body ) {
-                          EnumDecl * typedecl = buildEnum( type, attributes, linkage );
+                          EnumDecl * typedecl = buildEnum( type, attributes );
                           return new EnumInstType( buildQualifiers( type ), typedecl );
                   } else {
@@ -754 +762 @@
 } // buildSymbolic
 
-EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
+EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes ) {
         assert( td->kind == TypeData::Enum );
-        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes, linkage );
+        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes );
         buildList( td->enumeration.constants, ret->get_members() );
         list< Declaration * >::iterator members = ret->get_members().begin();
@@ -807 +815 @@
                 return buildAggregate( td, attributes, linkage );
         } else if ( td->kind == TypeData::Enum ) {
-                return buildEnum( td, attributes, linkage );
+                return buildEnum( td, attributes );
         } else if ( td->kind == TypeData::Symbolic ) {
                 return buildSymbolic( td, name, scs, linkage );