Changes in src/ResolvExpr/ConversionCost.cc [af746cc:748c751]

File:

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

src/ResolvExpr/ConversionCost.cc

@@ -362 +362 @@
 
 void ConversionCost::postvisit( const ast::EnumInstType * inst ) {
-        if ( inst->base && inst->base->base ) {
-                if ( auto dstAsAttr = dynamic_cast<const ast::EnumAttrType *>( dst ) ) {
-                        auto instAsAttr = ast::EnumAttrType( inst, dstAsAttr->attr );
-                        if ( instAsAttr.match(dstAsAttr) ) {
-                                cost.incUnsafe();
-                        }
-
-                } else if ( auto dstAsInst = dynamic_cast<const ast::EnumInstType *>( dst ) ) {
-                        if (inst->base && dstAsInst->base) {
-                                if (inst->base == dstAsInst->base) {
-                                        cost.incUnsafe();
-                                }
-                        }
-                } else {
-                        auto instAsVal = ast::EnumAttrType( inst, ast::EnumAttribute::Value );
-                        cost = costCalc( &instAsVal, dst, srcIsLvalue, symtab, env );
-                        if ( cost < Cost::infinity ) {
-                                cost.incUnsafe();
-                        }
-                }
-                return;
+        if ( auto dstAsInst = dynamic_cast<const ast::EnumInstType *>( dst ) ) {
+                if (inst->base && dstAsInst->base) {
+                        if (inst->base->name == dstAsInst->base->name) {
+                                cost = Cost::zero;
+                                return;
+                        }
+                }
         } 
         static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicType::SignedInt ) };
@@ -393 +379 @@
 void ConversionCost::postvisit( const ast::EnumAttrType * src ) {
     auto dstAsEnumAttrType = dynamic_cast<const ast::EnumAttrType *>(dst);
-    if ( src->attr == ast::EnumAttribute::Label ) {
-        if ( dstAsEnumAttrType && dstAsEnumAttrType->attr == ast::EnumAttribute::Label ) {
-            cost = costCalc( src->instance, dstAsEnumAttrType->instance, srcIsLvalue, symtab, env );
-        } 
-        // Add Conversion To String
-    } else if ( src->attr == ast::EnumAttribute::Value ) {
+        assert( src->attr != ast::EnumAttribute::Label );
+    if ( src->attr == ast::EnumAttribute::Value ) {
         if ( dstAsEnumAttrType && dstAsEnumAttrType->attr == ast::EnumAttribute::Value) {
             cost = costCalc( src->instance, dstAsEnumAttrType->instance, srcIsLvalue, symtab, env );