Changes in src/ResolvExpr/ConversionCost.cc [89e6ffc:7e003011]

File:

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

src/ResolvExpr/ConversionCost.cc

@@ -30 +30 @@
 ///     std::cout << "type inst " << destAsTypeInst->get_name();
                         if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
-                                return conversionCost( src, eqvClass.type, indexer, env );
+                                if ( eqvClass.type ) {
+                                        return conversionCost( src, eqvClass.type, indexer, env );
+                                } else {
+                                        return Cost::infinity;
+                                }
                         } else if ( ( namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) ) {
 ///       std::cout << " found" << std::endl;
@@ -145 +149 @@
         };
 
-        void ConversionCost::visit(VoidType *voidType) {
+        void ConversionCost::visit( __attribute((unused)) VoidType *voidType ) {
                 cost = Cost::infinity;
         }
@@ -182 +186 @@
         }
 
-        void ConversionCost::visit(ArrayType *arrayType) {
-        }
-
-        void ConversionCost::visit(FunctionType *functionType) {
-        }
+        void ConversionCost::visit(__attribute((unused)) ArrayType *arrayType) {}
+        void ConversionCost::visit(__attribute((unused)) FunctionType *functionType) {}
 
         void ConversionCost::visit(StructInstType *inst) {
@@ -204 +205 @@
         }
 
-        void ConversionCost::visit(EnumInstType *inst) {
+        void ConversionCost::visit( __attribute((unused)) EnumInstType *inst ) {
                 static Type::Qualifiers q;
                 static BasicType integer( q, BasicType::SignedInt );
@@ -213 +214 @@
         }
 
-        void ConversionCost::visit(TraitInstType *inst) {
+        void ConversionCost::visit( __attribute((unused)) TraitInstType *inst) {
         }
 
@@ -235 +236 @@
         }
 
-        void ConversionCost::visit(TupleType *tupleType) {
+        void ConversionCost::visit( __attribute((unused)) TupleType *tupleType) {
                 Cost c;
                 if ( TupleType *destAsTuple = dynamic_cast< TupleType* >( dest ) ) {
                         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 ) {
@@ -255 +256 @@
         }
 
-        void ConversionCost::visit(VarArgsType *varArgsType) {
+        void ConversionCost::visit( __attribute((unused)) VarArgsType *varArgsType) {
                 if ( dynamic_cast< VarArgsType* >( dest ) ) {
                         cost = Cost::zero;
@@ -261 +262 @@
         }
 
-        void ConversionCost::visit(ZeroType *zeroType) {
+        void ConversionCost::visit( __attribute((unused)) ZeroType *zeroType) {
                 if ( dynamic_cast< ZeroType* >( dest ) ) {
                         cost = Cost::zero;
@@ -277 +278 @@
         }
 
-        void ConversionCost::visit(OneType *oneType) {
+        void ConversionCost::visit( __attribute((unused)) OneType *oneType) {
                 if ( dynamic_cast< OneType* >( dest ) ) {
                         cost = Cost::zero;