Changes in src/ResolvExpr/ConversionCost.h [e6b42e7:1d17939]

File:

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

src/ResolvExpr/ConversionCost.h

@@ -72 +72 @@
 
 // Some function pointer types, differ in return type.
-using CostCalculation = std::function<Cost(const ast::Type *, const ast::Type *, bool,
+using CostCalculation = std::function<Cost(const ast::Type *, const ast::Type *,
         const ast::SymbolTable &, const ast::TypeEnvironment &)>;
-using PtrsCalculation = std::function<int(const ast::Type *, const ast::Type *,
+using NumCostCalculation = std::function<int(const ast::Type *, const ast::Type *,
         const ast::SymbolTable &, const ast::TypeEnvironment &)>;
 
@@ -81 +81 @@
 protected:
         const ast::Type * dst;
-        bool srcIsLvalue;
         const ast::SymbolTable & symtab;
         const ast::TypeEnvironment & env;
         CostCalculation costCalc;
 public:
-        static size_t traceId;
         Cost cost;
-        Cost result() { return cost; }
 
-        ConversionCost_new( const ast::Type * dst, bool srcIsLvalue, const ast::SymbolTable & symtab,
+        ConversionCost_new( const ast::Type * dst, const ast::SymbolTable & symtab,
                         const ast::TypeEnvironment & env, CostCalculation costCalc ) :
-                dst( dst ), srcIsLvalue( srcIsLvalue ), symtab( symtab ), env( env ),
-                costCalc( costCalc ), cost( Cost::infinity )
+                dst( dst ), symtab( symtab ), env( env ), costCalc( costCalc ), cost( Cost::infinity )
         {}
 
@@ -114 +110 @@
 
 Cost convertToReferenceCost( const ast::Type * src, const ast::ReferenceType * dest,
-        bool srcIsLvalue, const ast::SymbolTable & indexer, const ast::TypeEnvironment & env,
-        PtrsCalculation func );
+        const ast::SymbolTable & indexer, const ast::TypeEnvironment & env, NumCostCalculation func );
 
 } // namespace ResolvExpr