Changeset 4c925cd for src/ResolvExpr/ConversionCost.h

Timestamp:

Aug 14, 2020, 11:40:04 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5715d43, fa5e0112

Parents:

309d814 (diff), badd22f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

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 *,
+using CostCalculation = std::function<Cost(const ast::Type *, const ast::Type *, bool,
         const ast::SymbolTable &, const ast::TypeEnvironment &)>;
-using NumCostCalculation = std::function<int(const ast::Type *, const ast::Type *,
+using PtrsCalculation = 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;
 
-        ConversionCost_new( const ast::Type * dst, const ast::SymbolTable & symtab,
+        ConversionCost_new( const ast::Type * dst, bool srcIsLvalue, const ast::SymbolTable & symtab,
                         const ast::TypeEnvironment & env, CostCalculation costCalc ) :
-                dst( dst ), symtab( symtab ), env( env ), costCalc( costCalc ), cost( Cost::infinity )
+                dst( dst ), srcIsLvalue( srcIsLvalue ), symtab( symtab ), env( env ),
+                costCalc( costCalc ), cost( Cost::infinity )
         {}
 
@@ -110 +113 @@
 
 Cost convertToReferenceCost( const ast::Type * src, const ast::ReferenceType * dest,
-        const ast::SymbolTable & indexer, const ast::TypeEnvironment & env, NumCostCalculation func );
+        bool srcIsLvalue, const ast::SymbolTable & indexer, const ast::TypeEnvironment & env,
+        PtrsCalculation func );
 
 } // namespace ResolvExpr