Changes in src/ResolvExpr/ConversionCost.cc [e874605:ef1da0e2]

File:

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

src/ResolvExpr/ConversionCost.cc

@@ -340 +340 @@
                 } else if ( const EnumInstType * enumInst = dynamic_cast< const EnumInstType * >( dest ) ) {
                         const EnumDecl * base_enum = enumInst->baseEnum;
-                        if ( const Type * base = base_enum->base ) {
+                        if ( const Type * base = base_enum->base ) { // if the base enum has a base (if it is typed)
                                 if ( const BasicType * enumBaseAstBasic = dynamic_cast< const BasicType *> (base) ) {
                                         conversionCostFromBasicToBasic(basicType, enumBaseAstBasic);
@@ -634 +634 @@
         } else if ( const ast::EnumInstType * enumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
                 const ast::EnumDecl * enumDecl = enumInst->base.get();
-                if ( enumDecl->isTyped && !enumDecl->base.get() ) {
-                        cost = Cost::infinity; 
-                } else if ( const ast::Type * enumType = enumDecl->base.get() ) {
+                if ( const ast::Type * enumType = enumDecl->base.get() ) {
                         if ( const ast::BasicType * enumTypeAsBasic = dynamic_cast<const ast::BasicType *>(enumType) ) {
                                 conversionCostFromBasicToBasic( basicType, enumTypeAsBasic );
@@ -718 +716 @@
         const ast::EnumDecl * baseEnum = enumInstType->base;
         if ( const ast::Type * baseType = baseEnum->base ) {
-                costCalc( baseType, dst, srcIsLvalue, symtab, env );
+                cost = costCalc( baseType, dst, srcIsLvalue, symtab, env );
         } else {
+                (void)enumInstType;
                 static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicType::SignedInt ) };
                 cost = costCalc( integer, dst, srcIsLvalue, symtab, env );