Changes in / [43ee2a8:e869d663]

File:

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

src/ResolvExpr/CastCost.cc

@@ -66 +66 @@
 
         void CastCost::visit( BasicType *basicType ) {
-                PointerType *destAsPointer = dynamic_cast< PointerType* >( dest );
-                if ( destAsPointer && basicType->isInteger() ) {
+                if ( dynamic_cast< PointerType* >( dest ) ) {
                         cost = Cost( 1, 0, 0 );
                 } else {
@@ -78 +77 @@
                         if ( pointerType->get_qualifiers() <= destAsPtr->get_qualifiers() && typesCompatibleIgnoreQualifiers( pointerType->get_base(), destAsPtr->get_base(), indexer, env ) ) {
                                 cost = Cost( 0, 0, 1 );
+                        } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
+                                if ( destAsBasic->isInteger() ) {
+                                        cost = Cost( 1, 0, 0 );
+                                } // if
                         } else {
                                 TypeEnvironment newEnv( env );
@@ -89 +92 @@
                                 } // if
                         } // if
-                } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
-                        if ( destAsBasic->isInteger() ) {
-                                cost = Cost( 1, 0, 0 );
-                        } // if
-                }
+                } // if
         }
 } // namespace ResolvExpr