Changes in / [79caea8:610194e]

Location:

src

Files:

• Parser/parser.yy (modified) (1 diff)
• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)
• ResolvExpr/CommonType.cc (modified) (2 diffs)
• SymTab/FixFunction.cc (modified) (2 diffs)

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 )); }
         ;
 

src/ResolvExpr/AlternativeFinder.cc

@@ -482 +482 @@
         template< typename ForwardIterator, typename OutputIterator >
         void inferRecursive( ForwardIterator begin, ForwardIterator end, const Alternative &newAlt, OpenVarSet &openVars, const SymTab::Indexer &decls, const AssertionSet &newNeed, int level, const SymTab::Indexer &indexer, OutputIterator out ) {
+                if ( newAlt.cost == Cost::infinity ) return; // don't proceed down this dead end
                 if ( begin == end ) {
                         if ( newNeed.empty() ) {
@@ -1185 +1186 @@
                                 std::cerr << "bindings are:" << std::endl;
                                 withFunc.env.print( std::cerr, 8 );
+                                std::cerr << "cost is: " << withFunc.cost << std::endl;
                                 std::cerr << "cost of conversion is:" << cvtCost << std::endl;
                         )

src/ResolvExpr/CommonType.cc

@@ -267 +267 @@
                                                 result = otherPointer->clone();
                                         } // if
-                                        result->get_qualifiers() = tq1 | tq2;
+                                        strict_dynamic_cast<PointerType*>(result)->base->get_qualifiers() = tq1 | tq2;
                                 } else {
                                         /// std::cerr << "place for ptr-to-type" << std::endl;
@@ -304 +304 @@
                                                 result = otherRef->clone();
                                         } // if
-                                        result->get_qualifiers() = tq1 | tq2;
+                                        strict_dynamic_cast<ReferenceType*>(result)->base->get_qualifiers() = tq1 | tq2;
                                 } else {
                                         /// std::cerr << "place for ptr-to-type" << std::endl;

src/SymTab/FixFunction.cc

@@ -30 +30 @@
                 // can't delete function type because it may contain assertions, so transfer ownership to new object
                 ObjectDecl *pointer = new ObjectDecl( functionDecl->name, functionDecl->get_storageClasses(), functionDecl->linkage, nullptr, new PointerType( Type::Qualifiers(), functionDecl->type ), nullptr, functionDecl->attributes );
+                pointer->location = functionDecl->location;
                 functionDecl->attributes.clear();
                 functionDecl->type = nullptr;
@@ -43 +44 @@
                 // need to recursively mutate the base type in order for multi-dimensional arrays to work.
                 PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->base, arrayType->dimension, arrayType->isVarLen, arrayType->isStatic );
+                pointerType->location = arrayType->location;
                 arrayType->base = nullptr;
                 arrayType->dimension = nullptr;