Changes in src/ResolvExpr/ConversionCost.cc [0522ebe:bbf2cb1]

File:

• src/ResolvExpr/ConversionCost.cc (modified) (3 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -288 +288 @@
             cost = Cost::unsafe;
                 }
+        } else if ( dynamic_cast< const ast::EnumPosType *>(dst) ) {
+                static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicType::SignedInt ) };
+                cost = costCalc( basicType, integer, srcIsLvalue, symtab, env );
         }
 }
@@ -363 +366 @@
 }
 
-void ConversionCost::postvisit( const ast::EnumInstType * ) {
-        static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicType::SignedInt ) };
-        cost = costCalc( integer, dst, srcIsLvalue, symtab, env );
-        // }
-        if ( cost < Cost::unsafe ) {
-                cost.incSafe();
-        }
-}
-
-void ConversionCost::postvisit( const ast::EnumPosType * ) {
+void ConversionCost::postvisit( const ast::EnumInstType * inst ) {
         static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicType::SignedInt ) };
         cost = costCalc( integer, dst, srcIsLvalue, symtab, env );
@@ -378 +372 @@
                 cost.incSafe();
         }
+}
+
+void ConversionCost::postvisit( const ast::EnumPosType * src ) {
+        if ( auto dstBase = dynamic_cast<const ast::EnumPosType *>( dst ) ) {
+                // cost = costCalc( src->instance, dstBase->instance, srcIsLvalue, symtab, env );
+                // if ( cost < Cost::unsafe ) cost.incSafe();
+                cost = Cost::zero;
+        } 
+        // if ( auto dstBase = dynamic_cast<const ast::EnumInstType *>( dst ) ) {
+        //      cost = costCalc( src->instance, dstBase, srcIsLvalue, symtab, env );
+        //      if ( cost < Cost::unsafe ) cost.incSafe();
+        // } 
+        else {
+                static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicType::SignedInt ) };
+                cost = costCalc( integer, dst, srcIsLvalue, symtab, env );
+                if ( cost < Cost::unsafe ) {
+                        cost.incSafe();
+                }
+        }
+
 }