Changeset 679a260 for src/Parser

Timestamp:

Jul 19, 2018, 11:34:25 AM (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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

e07caa2

Parents:

679e644

Message:

Add inline to correct node

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (1 diff)
• parser.yy (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -1009 +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) {
                                                                         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

src/Parser/parser.yy

@@ -1962 +1962 @@
         | INLINE type_specifier field_abstract_list ';'         // CFA
                 {
-                        $2->inLine = true;
+                        $3->inLine = true;
                         $$ = distAttr( $2, $3 );                                        // mark all fields in list
                 }