Changes in src/ResolvExpr/ConversionCost.cc [89e6ffc:4ab9536]

File:

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

src/ResolvExpr/ConversionCost.cc

@@ -160 +160 @@
                         // xxx - not positive this is correct, but appears to allow casting int => enum
                         cost = Cost( 1, 0, 0 );
-                } else if ( dynamic_cast< ZeroType* >( dest ) != nullptr || dynamic_cast< OneType* >( dest ) != nullptr ) {
-                        cost = Cost( 1, 0, 0 );
-                } // if
+    } // if
         }
 
@@ -177 +175 @@
                                 } // if
                         } // if
-                } else if ( dynamic_cast< ZeroType* >( dest ) != nullptr || dynamic_cast< OneType* >( dest ) != nullptr ) {
-                        cost = Cost( 1, 0, 0 );
                 } // if
         }
@@ -240 +236 @@
                         std::list< Type* >::const_iterator srcIt = tupleType->get_types().begin();
                         std::list< Type* >::const_iterator destIt = destAsTuple->get_types().begin();
-                        while ( srcIt != tupleType->get_types().end() ) {
+                        while ( srcIt != tupleType->get_types().end() && destIt != destAsTuple->get_types().end() ) {
                                 Cost newCost = conversionCost( *srcIt++, *destIt++, indexer, env );
                                 if ( newCost == Cost::infinity ) {
@@ -260 +256 @@
                 }
         }
-
-        void ConversionCost::visit(ZeroType *zeroType) {
-                if ( dynamic_cast< ZeroType* >( dest ) ) {
-                        cost = Cost::zero;
-                } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
-                        // copied from visit(BasicType*) for signed int, but +1 for safe conversions
-                        int tableResult = costMatrix[ BasicType::SignedInt ][ destAsBasic->get_kind() ];
-                        if ( tableResult == -1 ) {
-                                cost = Cost( 1, 0, 0 );
-                        } else {
-                                cost = Cost( 0, 0, tableResult + 1 );
-                        }
-                } else if ( dynamic_cast< PointerType* >( dest ) ) {
-                        cost = Cost( 0, 0, 1 );
-                }
-        }
-
-        void ConversionCost::visit(OneType *oneType) {
-                if ( dynamic_cast< OneType* >( dest ) ) {
-                        cost = Cost::zero;
-                } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
-                        // copied from visit(BasicType*) for signed int, but +1 for safe conversions
-                        int tableResult = costMatrix[ BasicType::SignedInt ][ destAsBasic->get_kind() ];
-                        if ( tableResult == -1 ) {
-                                cost = Cost( 1, 0, 0 );
-                        } else {
-                                cost = Cost( 0, 0, tableResult + 1 );
-                        }
-                }
-        }
 } // namespace ResolvExpr