Changes in src/ResolvExpr/CandidateFinder.cpp [a8404d9:17fa94f]

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (1 diff)

src/ResolvExpr/CandidateFinder.cpp

@@ -2150 +2150 @@
 }
 
-const ast::Expr * CandidateFinder::makeEnumOffsetCast( const ast::EnumInstType * src,
-                const ast::EnumInstType * dst, const ast::Expr * expr, Cost minCost ) {
+const ast::Expr * CandidateFinder::makeEnumOffsetCast( const ast::EnumInstType * src, 
+        const ast::EnumInstType * dst, const ast::Expr * expr, Cost minCost ) {
         auto srcDecl = src->base;
         auto dstDecl = dst->base;
 
-        if ( srcDecl->name == dstDecl->name ) return expr;
-
-        for ( auto& dstChild : dstDecl->inlinedDecl ) {
+        if (srcDecl->name == dstDecl->name) return expr;
+
+        for (auto& dstChild: dstDecl->inlinedDecl) {
                 Cost c = castCost(src, dstChild, false, context.symtab, env);
-                if ( minCost <= c ) continue;
-                unsigned offset = findChildOffset( dstDecl, dstChild.get()->base );
-                if ( offset <= 0 ) return new ast::CastExpr( expr, dst );
-
-                auto untyped = ast::UntypedExpr::createCall(
-                        expr->location,
-                        "?+?",
-                        { new ast::CastExpr( expr->location,
-                                expr,
-                                new ast::BasicType( ast::BasicKind::SignedInt ),
-                                ast::GeneratedFlag::ExplicitCast ),
-                                ast::ConstantExpr::from_int( expr->location, offset ) } );
-                CandidateFinder finder(context, env);
-                finder.find( untyped );
-                CandidateList winners = findMinCost( finder.candidates );
-                CandidateRef & choice = winners.front();
-                choice->expr = new ast::CastExpr( expr->location, choice->expr, dstChild, ast::GeneratedFlag::ExplicitCast );
-                if ( auto destExpr = makeEnumOffsetCast( src, dstChild, choice->expr, minCost ) ) {
-                        return new ast::CastExpr( destExpr, dst );
+                ast::CastExpr * castToDst;
+                if (c<minCost) {
+                        unsigned offset = findChildOffset( dstDecl, dstChild.get()->base );
+                        if (offset > 0) {
+                                auto untyped = ast::UntypedExpr::createCall(
+                                        expr->location,
+                                        "?+?",
+                                        { new ast::CastExpr( expr->location,
+                                                expr,
+                                                new ast::BasicType(ast::BasicKind::SignedInt),
+                                                ast::GeneratedFlag::ExplicitCast ),
+                                                ast::ConstantExpr::from_int(expr->location, offset)} );
+                                CandidateFinder finder(context, env);
+                                finder.find( untyped );
+                                CandidateList winners = findMinCost( finder.candidates );
+                                CandidateRef & choice = winners.front();
+                                choice->expr = new ast::CastExpr(expr->location, choice->expr, dstChild, ast::GeneratedFlag::ExplicitCast);
+                                auto destExpr = makeEnumOffsetCast( src, dstChild, choice->expr, minCost );
+                                if ( !destExpr ) continue;
+                                castToDst = new ast::CastExpr( destExpr, dst );
+                        } else {
+                                castToDst = new ast::CastExpr( expr, dst );
+                        }
+                        return castToDst;
                 }
         }