Changes in src/ResolvExpr/ConversionCost.cpp [d3aa55e9:85855b0]

File:

• src/ResolvExpr/ConversionCost.cpp (modified) (4 diffs)

src/ResolvExpr/ConversionCost.cpp

@@ -162 +162 @@
 Cost conversionCost(
         const ast::Type * src, const ast::Type * dst, bool srcIsLvalue,
-const ast::SymbolTable & symtab, const ast::TypeEnvironment & env
+        const ast::SymbolTable & symtab, const ast::TypeEnvironment & env
 ) {
         if ( const ast::TypeInstType * inst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
@@ -284 +284 @@
         if ( const ast::BasicType * dstAsBasic = dynamic_cast< const ast::BasicType * >( dst ) ) {
                 conversionCostFromBasicToBasic( basicType, dstAsBasic );
-        } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
+        }       else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
                 if ( dstAsEnumInst->base && !dstAsEnumInst->base->isTyped ) {
                         cost = Cost::unsafe;
@@ -368 +368 @@
                 return;
         }
-
+        static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicKind::SignedInt ) };
+        cost = costCalc( integer, dst, srcIsLvalue, symtab, env );
         if ( !inst->base->isTyped ) {
-                static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicKind::SignedInt ) };
-                cost = costCalc( integer, dst, srcIsLvalue, symtab, env );
                 if ( cost < Cost::unsafe ) {
                         cost.incSafe();
@@ -377 +376 @@
                 return;
         }
-        // cost.incUnsafe();
+        cost.incUnsafe();
 }