Changes in src/ResolvExpr/CandidateFinder.cpp [bfa7bf0:d68a3f7]

File:

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

src/ResolvExpr/CandidateFinder.cpp

@@ -522 +522 @@
                                                                 CandidateFinder subFinder( context, env );
                                                                 expr = subFinder.makeEnumOffsetCast(argAsEnum, paramAsEnum, expr, c);
-                                                                results.emplace_back(
-                                                                        i, expr, std::move( env ), std::move( need ), std::move( have ), std::move( open ),
-                                                                        nextArg + 1, nTuples, expl.cost + c, expl.exprs.size() == 1 ? 0 : 1, j );
+                                                                if ( expr )
+                                                                        results.emplace_back(
+                                                                                i, expr, std::move( env ), std::move( need ), std::move( have ), std::move( open ),
+                                                                                nextArg + 1, nTuples, expl.cost + c, expl.exprs.size() == 1 ? 0 : 1, j );
                                                                 continue;
                                                         } else {
@@ -1265 +1266 @@
                                 CandidateFinder subFinder(context, tenv);
                                 ast::ptr<ast::Expr> offsetExpr = subFinder.makeEnumOffsetCast(argAsEnum, toAsEnum, cand->expr, thisCost);
-                                cand->expr = offsetExpr;
+                                if ( offsetExpr )
+                                        cand->expr = offsetExpr;
                         }
 
@@ -2151 +2153 @@
 
 const ast::Expr * CandidateFinder::makeEnumOffsetCast( const ast::EnumInstType * src, 
-        const ast::EnumInstType * dst,
-        const ast::Expr * expr,
-        Cost minCost ) {
-        
+        const ast::EnumInstType * dst, const ast::Expr * expr, Cost minCost ) {
         auto srcDecl = src->base;
         auto dstDecl = dst->base;
@@ -2179 +2178 @@
                                 CandidateRef & choice = winners.front();
                                 choice->expr = new ast::CastExpr(expr->location, choice->expr, dstChild, ast::GeneratedFlag::ExplicitCast);
-                                castToDst = new ast::CastExpr( 
-                                        makeEnumOffsetCast( src, dstChild, choice->expr, minCost ),
-                                        dst);
+                                auto destExpr = makeEnumOffsetCast( src, dstChild, choice->expr, minCost );
+                                if ( !destExpr ) continue;
+                                castToDst = new ast::CastExpr( destExpr, dst );
                         } else {
                                 castToDst = new ast::CastExpr( expr, dst );
@@ -2188 +2187 @@
                 }
         }
-        SemanticError(expr, src->base->name + " is not a subtype of " + dst->base->name);
         return nullptr;
 }