Changeset e07caa2 for src/Parser/DeclarationNode.cc

Timestamp:

Jul 19, 2018, 6:16:41 PM (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:

68bceeb

Parents:

679a260

Message:

fix extend plan 9, anonymous declarations

File:

• src/Parser/DeclarationNode.cc (modified) (3 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 Jul 18 22:50:27 2018
-// Update Count     : 1096
+// Last Modified On : Thu Jul 19 17:40:03 2018
+// Update Count     : 1106
 //
 
@@ -54 +54 @@
 
 DeclarationNode::DeclarationNode() :
-                builtin( NoBuiltinType ),
-                type( nullptr ),
-                inLine( false ),
-                bitfieldWidth( nullptr ),
-                hasEllipsis( false ),
-                linkage( ::linkage ),
-                asmName( nullptr ),
-                initializer( nullptr ),
-                extension( false ),
-                asmStmt( nullptr ) {
+        linkage( ::linkage ) {
 
 //      variable.name = nullptr;
@@ -1004 +995 @@
                                 //   struct T;            // anonymous member
                                 // };
-                                if ( ! (extracted && decl->name == "" && ! anon) ) {
-                                        if (decl->name == "") {
+                                if ( ! (extracted && decl->name == "" && ! anon && ! cur->get_inLine()) ) {
+                                        if ( decl->name == "" ) {
                                                 if ( DeclarationWithType * dwt = dynamic_cast<DeclarationWithType *>( decl ) ) {
                                                         if ( ReferenceToType * aggr = dynamic_cast<ReferenceToType *>( dwt->get_type() ) ) {
                                                                 if ( aggr->name.find("anonymous") == std::string::npos ) {
-                                                                        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
+                                                                        if ( ! cur->get_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() );
-                                                                        }
-                                                                }
-                                                        }
-                                                }
-                                        }
+                                                                        } // if
+                                                                } // if
+                                                        } // if
+                                                } // if
+                                        } // if
                                         decl->location = cur->location;
-                                        * out++ = decl;
-                                }
+                                        *out++ = decl;
+                                } // if
                         } // if
                 } catch( SemanticErrorException &e ) {
                         errors.append( e );
                 } // try
-        } // while
+        } // for
 
         if ( ! errors.isEmpty() ) {