Changeset 679e644 for src/Parser/DeclarationNode.cc

Timestamp:

Jul 19, 2018, 10:30:56 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

679a260

Parents:

2f84692

Message:

extend plan 9, anonymous declarations, change token for default argument

File:

• src/Parser/DeclarationNode.cc (modified) (4 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 : Fri Jul  6 06:56:08 2018
-// Update Count     : 1088
+// Last Modified On : Wed Jul 18 22:50:27 2018
+// Update Count     : 1096
 //
 
@@ -56 +56 @@
                 builtin( NoBuiltinType ),
                 type( nullptr ),
+                inLine( false ),
                 bitfieldWidth( nullptr ),
                 hasEllipsis( false ),
@@ -104 +105 @@
         newnode->builtin = NoBuiltinType;
         newnode->type = maybeClone( type );
+        newnode->inLine = inLine;
         newnode->storageClasses = storageClasses;
         newnode->funcSpecs = funcSpecs;
@@ -1007 +1009 @@
                                                         if ( ReferenceToType * aggr = dynamic_cast<ReferenceToType *>( dwt->get_type() ) ) {
                                                                 if ( aggr->name.find("anonymous") == std::string::npos ) {
-                                                                        bool isInline = false;
-                                                                        if (cur->type->kind == TypeData::Aggregate || cur->type->kind == TypeData::AggregateInst) {
-                                                                                if (cur->type->kind == TypeData::Aggregate) {
-                                                                                        isInline = cur->type->aggregate.inLine;
-                                                                                } else {
-                                                                                        isInline = cur->type->aggInst.inLine;
-                                                                                        if ( TypeData * aggr = cur->type->aggInst.aggregate ) {
-                                                                                                if ( aggr->kind == TypeData::Aggregate ) {
-                                                                                                        isInline = isInline || aggr->aggregate.inLine;
-                                                                                                }
-                                                                                        }
-                                                                                }
-                                                                        }
-                                                                        if (! isInline) {
+                                                                        // bool isInline = false;
+                                                                        // if (cur->type->kind == TypeData::Aggregate || cur->type->kind == TypeData::AggregateInst) {
+                                                                        //      if (cur->type->kind == TypeData::Aggregate) {
+                                                                        //              isInline = cur->type->aggregate.inLine;
+                                                                        //      } else {
+                                                                        //              isInline = cur->type->aggInst.inLine;
+                                                                        //              if ( TypeData * aggr = cur->type->aggInst.aggregate ) {
+                                                                        //                      if ( aggr->kind == TypeData::Aggregate ) {
+                                                                        //                              isInline = isInline || aggr->aggregate.inLine;
+                                                                        //                      }
+                                                                        //              }
+                                                                        //      }
+                                                                        // }
+                                                                        // if (! isInline) {
+                                                                        if ( ! cur->inLine ) {
                                                                                 // temporary: warn about anonymous member declarations of named types, since this conflicts with the syntax for the forward declaration of an anonymous type
                                                                                 SemanticWarning( cur->location, Warning::AggrForwardDecl, aggr->name.c_str() );