Changes in src/Parser/DeclarationNode.cc [3a5131ed:ca1a547]

File:

• src/Parser/DeclarationNode.cc (modified) (6 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 : Thu Feb 16 13:06:50 2017
-// Update Count     : 753
+// Last Modified On : Thu Feb 23 15:45:02 2017
+// Update Count     : 759
 //
 
@@ -174 +174 @@
         } // if
 
-        if ( body ) {
-                newnode->type->function.hasBody = true;
-        } // if
-
         if ( ret ) {
                 newnode->type->base = ret->type;
@@ -259 +255 @@
 } // DeclarationNode::newAggregate
 
-DeclarationNode * DeclarationNode::newEnum( string * name, DeclarationNode * constants ) {
+DeclarationNode * DeclarationNode::newEnum( string * name, DeclarationNode * constants, bool body ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Enum );
@@ -268 +264 @@
         } // if
         newnode->type->enumeration.constants = constants;
+        newnode->type->enumeration.body = body;
         return newnode;
 } // DeclarationNode::newEnum
@@ -698 +695 @@
         assert( ! type->function.body );
         type->function.body = body;
-        type->function.hasBody = true;
         return this;
 }
@@ -1040 +1036 @@
         switch ( type->kind ) {
           case TypeData::Enum: {
-                  EnumDecl * typedecl = buildEnum( type, attributes );
-                  return new EnumInstType( buildQualifiers( type ), typedecl );
+                  if ( type->enumeration.body ) {
+                          EnumDecl * typedecl = buildEnum( type, attributes );
+                          return new EnumInstType( buildQualifiers( type ), typedecl );
+                  } else {
+                          return new EnumInstType( buildQualifiers( type ), *type->enumeration.name );
+                  }
           }
           case TypeData::Aggregate: {
-                  AggregateDecl * typedecl = buildAggregate( type, attributes );
                   ReferenceToType * ret;
-                  switch ( type->aggregate.kind ) {
-                        case DeclarationNode::Struct:
-                          ret = new StructInstType( buildQualifiers( type ), (StructDecl *)typedecl );
-                          break;
-                        case DeclarationNode::Union:
-                          ret = new UnionInstType( buildQualifiers( type ), (UnionDecl *)typedecl );
-                          break;
-                        case DeclarationNode::Trait:
-                          assert( false );
-                          //ret = new TraitInstType( buildQualifiers( type ), (TraitDecl *)typedecl );
-                          break;
-                        default:
-                          assert( false );
-                  } // switch
+                  if ( type->aggregate.body ) {
+                          AggregateDecl * typedecl = buildAggregate( type, attributes );
+                          switch ( type->aggregate.kind ) {
+                                case DeclarationNode::Struct:
+                                  ret = new StructInstType( buildQualifiers( type ), (StructDecl *)typedecl );
+                                  break;
+                                case DeclarationNode::Union:
+                                  ret = new UnionInstType( buildQualifiers( type ), (UnionDecl *)typedecl );
+                                  break;
+                                case DeclarationNode::Trait:
+                                  assert( false );
+                                  //ret = new TraitInstType( buildQualifiers( type ), (TraitDecl *)typedecl );
+                                  break;
+                                default:
+                                  assert( false );
+                          } // switch
+                  } else {
+                          switch ( type->aggregate.kind ) {
+                                case DeclarationNode::Struct:
+                                  ret = new StructInstType( buildQualifiers( type ), *type->aggregate.name );
+                                  break;
+                                case DeclarationNode::Union:
+                                  ret = new UnionInstType( buildQualifiers( type ), *type->aggregate.name );
+                                  break;
+                                case DeclarationNode::Trait:
+                                  assert( false );
+                                  //ret = new TraitInstType( buildQualifiers( type ), (TraitDecl *)typedecl );
+                                  break;
+                                default:
+                                  assert( false );
+                          } // switch
+                  } // if
                   buildList( type->aggregate.actuals, ret->get_parameters() );
                   return ret;