Changes in src/ResolvExpr/CastCost.cc [cf32116:7d01cf44]

File:

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

src/ResolvExpr/CastCost.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 06:57:43 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Oct  4 15:00:00 2019
-// Update Count     : 9
+// Last Modified On : Thu Aug  8 16:12:00 2019
+// Update Count     : 8
 //
 
@@ -142 +142 @@
 
                 CastCost_new(
-                        const ast::Type * dst, bool srcIsLvalue, const ast::SymbolTable & symtab,
+                        const ast::Type * dst, const ast::SymbolTable & symtab,
                         const ast::TypeEnvironment & env, CostCalculation costFunc )
-                : ConversionCost_new( dst, srcIsLvalue, symtab, env, costFunc ) {}
+                : ConversionCost_new( dst, symtab, env, costFunc ) {}
 
                 void postvisit( const ast::BasicType * basicType ) {
@@ -152 +152 @@
                                 cost = Cost::unsafe;
                         } else {
-                                cost = conversionCost( basicType, dst, srcIsLvalue, symtab, env );
+                                cost = conversionCost( basicType, dst, symtab, env );
                         }
                 }
@@ -183 +183 @@
                 }
         };
-
-        #warning For overload resolution between the two versions.
-        int localPtrsCastable(const ast::Type * t1, const ast::Type * t2,
-                        const ast::SymbolTable & symtab, const ast::TypeEnvironment & env ) {
-                return ptrsCastable( t1, t2, symtab, env );
-        }
-        Cost localCastCost(
-                const ast::Type * src, const ast::Type * dst, bool srcIsLvalue,
-                const ast::SymbolTable & symtab, const ast::TypeEnvironment & env
-        ) { return castCost( src, dst, srcIsLvalue, symtab, env ); }
 } // anonymous namespace
 
-
-
 Cost castCost(
-        const ast::Type * src, const ast::Type * dst, bool srcIsLvalue,
-        const ast::SymbolTable & symtab, const ast::TypeEnvironment & env
+        const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
+        const ast::TypeEnvironment & env
 ) {
         if ( auto typeInst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
@@ -205 +193 @@
                         // check cast cost against bound type, if present
                         if ( eqvClass->bound ) {
-                                return castCost( src, eqvClass->bound, srcIsLvalue, symtab, env );
+                                return castCost( src, eqvClass->bound, symtab, env );
                         } else {
                                 return Cost::infinity;
@@ -213 +201 @@
                         auto type = strict_dynamic_cast< const ast::TypeDecl * >( named );
                         if ( type->base ) {
-                                return castCost( src, type->base, srcIsLvalue, symtab, env ) + Cost::safe;
+                                return castCost( src, type->base, symtab, env ) + Cost::safe;
                         }
                 }
@@ -236 +224 @@
                 #warning cast on ptrsCastable artifact of having two functions, remove when port done
                 return convertToReferenceCost(
-                        src, refType, srcIsLvalue, symtab, env, localPtrsCastable );
+                        src, refType, symtab, env,
+                        ( int (*)(
+                                const ast::Type *, const ast::Type *, const ast::SymbolTable &,
+                                const ast::TypeEnvironment & )
+                        ) ptrsCastable );
         } else {
                 #warning cast on castCost artifact of having two functions, remove when port done
-                ast::Pass< CastCost_new > converter(
-                        dst, srcIsLvalue, symtab, env, localCastCost );
+                ast::Pass< CastCost_new > converter{
+                        dst, symtab, env,
+                        ( Cost (*)(
+                                const ast::Type *, const ast::Type *, const ast::SymbolTable &,
+                                const ast::TypeEnvironment & )
+                        ) castCost };
                 src->accept( converter );
                 return converter.pass.cost;