Changeset 0a73148 for src/Parser

Timestamp:

Jul 13, 2018, 6:36:34 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:

6da49249

Parents:

6b8b767 (diff), ae144af (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflict

Location:

src/Parser

Files:

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

src/Parser/DeclarationNode.cc

@@ -1003 +1003 @@
                                 // };
                                 if ( ! (extracted && decl->name == "" && ! anon) ) {
+                                        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 ) {
+                                                                        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) {
+                                                                                // 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() );
+                                                                        }
+                                                                }
+                                                        }
+                                                }
+                                        }
                                         decl->location = cur->location;
                                         * out++ = decl;

src/Parser/TypedefTable.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypedefTable.cc -- 
+// TypedefTable.cc --
 //
 // Author           : Peter A. Buhr
 // Created On       : Sat May 16 15:20:13 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 12 16:16:24 2018
-// Update Count     : 256
+// Last Modified On : Fri Jul 13 18:35:54 2018
+// Update Count     : 257
 //
 

src/Parser/parser.yy

@@ -2307 +2307 @@
                 { $$ = new ExpressionNode( new TypeExpr( maybeMoveBuildType( $1 ) ) ); }
         | assignment_expression
+                { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $1->build()) ); $$ = nullptr; }
         | type_list ',' type
                 { $$ = (ExpressionNode *)( $1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) ) ); }
         | type_list ',' assignment_expression
-                { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
+                { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $3->build()) ); $$ = nullptr; }
+                // { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
         ;