Changes in src/ResolvExpr/CandidateFinder.cpp [90be0cf:16ba4897]

File:

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

src/ResolvExpr/CandidateFinder.cpp

@@ -2136 +2136 @@
 }
 
-/// If the target enum is a child, get the offset from the base to the target.
-static unsigned findChildOffset(
-                const ast::EnumDecl * decl, const ast::EnumDecl * target ) {
-        unsigned offset = 0;
-        for ( auto inlined : decl->inlinedDecl ) {
-                auto childDecl = inlined->base;
-                if ( childDecl == target ) {
-                        return offset;
-                }
-                offset += childDecl->members.size();
-        }
-        SemanticError( decl, "Cannot find the target enum." );
-}
-
 const ast::Expr * CandidateFinder::makeEnumOffsetCast( const ast::EnumInstType * src, 
         const ast::EnumInstType * dst, const ast::Expr * expr, Cost minCost ) {
@@ -2161 +2147 @@
                 ast::CastExpr * castToDst;
                 if (c<minCost) {
-                        unsigned offset = findChildOffset( dstDecl, dstChild.get()->base );
+                        unsigned offset = dstDecl->calChildOffset(dstChild.get());
                         if (offset > 0) {
                                 auto untyped = ast::UntypedExpr::createCall(
-                                        expr->location,
-                                        "?+?",
+                                        expr->location, 
+                                        "?+?", 
                                         { new ast::CastExpr( expr->location,
                                                 expr,