Changes in src/ResolvExpr/ConversionCost.h [e6b42e7:7d01cf44]

File:

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

src/ResolvExpr/ConversionCost.h

@@ -10 +10 @@
 // Created On       : Sun May 17 09:37:28 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 29 16:12:00 2020
-// Update Count     : 7
+// Last Modified On : Thu Aug  8 16:13:00 2019
+// Update Count     : 6
 //
 
@@ -51 +51 @@
                 void postvisit( const ReferenceType * refType );
                 void postvisit( const FunctionType * functionType );
+                void postvisit( const StructInstType * aggregateUseType );
+                void postvisit( const UnionInstType * aggregateUseType );
                 void postvisit( const EnumInstType * aggregateUseType );
                 void postvisit( const TraitInstType * aggregateUseType );
@@ -72 +74 @@
 
 // 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 +83 @@
 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 )
         {}
 
@@ -104 +102 @@
         void postvisit( const ast::ReferenceType * refType );
         void postvisit( const ast::FunctionType * functionType );
+        void postvisit( const ast::StructInstType * structInstType );
+        void postvisit( const ast::UnionInstType * unionInstType );
         void postvisit( const ast::EnumInstType * enumInstType );
         void postvisit( const ast::TraitInstType * traitInstType );
@@ -114 +114 @@
 
 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