Changeset b2da0574

Timestamp:

Apr 18, 2018, 5:15:19 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

2ae16219

Parents:

f74eb47

Message:

Fix missing struct definition for empty struct with chained variable declarations.

• turn off body flag on chained declarations
• check body flag when extracting aggregates
• update Indexer to check body flag on aggregates

Location:

src

Files:

• Parser/DeclarationNode.cc (modified) (1 diff)
• Parser/TypeData.cc (modified) (1 diff)
• SymTab/Indexer.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (3 diffs)

src/Parser/DeclarationNode.cc

@@ -924 +924 @@
                                 delete newType->aggInst.aggregate->enumeration.constants;
                                 newType->aggInst.aggregate->enumeration.constants = nullptr;
+                                newType->aggInst.aggregate->enumeration.body = false;
                         } else {
                                 assert( newType->aggInst.aggregate->kind == TypeData::Aggregate );
                                 delete newType->aggInst.aggregate->aggregate.fields;
                                 newType->aggInst.aggregate->aggregate.fields = nullptr;
+                                newType->aggInst.aggregate->aggregate.body = false;
                         } // if
                         // don't hoist twice

src/Parser/TypeData.cc

@@ -490 +490 @@
         switch ( td->kind ) {
           case TypeData::Aggregate:
-                if ( ! toplevel && td->aggregate.fields ) {
+                if ( ! toplevel && td->aggregate.body ) {
                         ret = td->clone();
                 } // if
                 break;
           case TypeData::Enum:
-                if ( ! toplevel && td->enumeration.constants ) {
+                if ( ! toplevel && td->enumeration.body ) {
                         ret = td->clone();
                 } // if

src/SymTab/Indexer.cc

@@ -501 +501 @@
 
         bool addedDeclConflicts( AggregateDecl *existing, AggregateDecl *added ) {
-                if ( existing->get_members().empty() ) {
+                if ( ! existing->body ) {
                         return false;
-                } else if ( ! added->get_members().empty() ) {
+                } else if ( added->body ) {
                         SemanticError( added, "redeclaration of " );
                 } // if

src/SymTab/Validate.cc

@@ -316 +316 @@
 
         void HoistStruct::previsit( EnumInstType * inst ) {
-                if ( inst->baseEnum ) {
+                if ( inst->baseEnum && inst->baseEnum->body ) {
                         declsToAddBefore.push_front( inst->baseEnum );
                 }
@@ -322 +322 @@
 
         void HoistStruct::previsit( StructInstType * inst ) {
-                if ( inst->baseStruct ) {
+                if ( inst->baseStruct && inst->baseStruct->body ) {
                         declsToAddBefore.push_front( inst->baseStruct );
                 }
@@ -328 +328 @@
 
         void HoistStruct::previsit( UnionInstType * inst ) {
-                if ( inst->baseUnion ) {
+                if ( inst->baseUnion && inst->baseUnion->body ) {
                         declsToAddBefore.push_front( inst->baseUnion );
                 }