Changes in src/ResolvExpr/CandidateFinder.cpp [0536c03:361bf01]

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (7 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -212 +212 @@
                 // mark type variable and specialization cost of forall clause
                 convCost.incVar( function->forall.size() );
-                convCost.decSpec( function->assertions.size() );
+                for ( const ast::TypeDecl * td : function->forall ) {
+                        convCost.decSpec( td->assertions.size() );
+                }
 
                 return convCost;
@@ -221 +223 @@
                 ast::AssertionSet & need
         ) {
-                for ( auto & tyvar : type->forall ) {
-                        unifiableVars[ *tyvar ] = ast::TypeDecl::Data{ tyvar->base };
-                }
-                for ( auto & assn : type->assertions ) {
-                        need[ assn ].isUsed = true;
+                for ( const ast::TypeDecl * tyvar : type->forall ) {
+                        unifiableVars[ tyvar->name ] = ast::TypeDecl::Data{ tyvar };
+                        for ( const ast::DeclWithType * assn : tyvar->assertions ) {
+                                need[ assn ].isUsed = true;
+                        }
                 }
         }
@@ -905 +907 @@
                         // xxx - is it possible that handleTupleAssignment and main finder both produce candidates?
                         // this means there exists ctor/assign functions with a tuple as first parameter.
-                        ResolvMode mode = {
-                                true, // adjust
-                                !untypedExpr->func.as<ast::NameExpr>(), // prune if not calling by name
-                                selfFinder.candidates.empty() // failfast if other options are not found
-                        };
-                        funcFinder.find( untypedExpr->func, mode );
+                        funcFinder.find( untypedExpr->func, selfFinder.candidates.empty() ? ResolvMode::withAdjustment() : ResolvMode::withoutFailFast() );
                         // short-circuit if no candidates
                         // if ( funcFinder.candidates.empty() ) return;
@@ -956 +953 @@
                                                 auto inst = dynamic_cast< const ast::TypeInstType * >( funcResult )
                                         ) {
-                                                if ( const ast::EqvClass * clz = func->env.lookup( *inst ) ) {
+                                                if ( const ast::EqvClass * clz = func->env.lookup( inst->name ) ) {
                                                         if ( auto function = clz->bound.as< ast::FunctionType >() ) {
                                                                 CandidateRef newFunc{ new Candidate{ *func } };
@@ -1080 +1077 @@
                         assert( toType );
                         toType = resolveTypeof( toType, symtab );
-                        // toType = SymTab::validateType( castExpr->location, toType, symtab );
+                        toType = SymTab::validateType( castExpr->location, toType, symtab );
                         toType = adjustExprType( toType, tenv, symtab );
 
@@ -1165 +1162 @@
 
                                         if(auto insttype = dynamic_cast<const ast::TypeInstType*>(expr)) {
-                                                auto td = cand->env.lookup(*insttype);
+                                                auto td = cand->env.lookup(insttype->name);
                                                 if(!td) { continue; }
                                                 expr = td->bound.get();
@@ -1571 +1568 @@
                                 // calculate target type
                                 const ast::Type * toType = resolveTypeof( initAlt.type, symtab );
-                                // toType = SymTab::validateType( initExpr->location, toType, symtab );
+                                toType = SymTab::validateType( initExpr->location, toType, symtab );
                                 toType = adjustExprType( toType, tenv, symtab );
                                 // The call to find must occur inside this loop, otherwise polymorphic return