Changeset 4a60488 for src/ResolvExpr/ConversionCost.h

Timestamp:

Sep 27, 2019, 3:35:46 PM (6 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

90ce35aa

Parents:

8e1467d (diff), 849720f (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:

Merged from master taking the lvalue changes to expression and everything before that.

File:

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

src/ResolvExpr/ConversionCost.h

@@ -10 +10 @@
 // Created On       : Sun May 17 09:37:28 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 24 10:00:00 2019
-// Update Count     : 5
+// Last Modified On : Thu Aug  8 16:13:00 2019
+// Update Count     : 6
 //
 
@@ -33 +33 @@
         class TypeEnvironment;
 
-        typedef std::function<Cost(const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
+        typedef std::function<Cost(const Type *, const Type *, bool,
+                const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
+
         struct ConversionCost : public WithShortCircuiting {
           public:
-                ConversionCost( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
+                ConversionCost( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
 
                 Cost get_cost() const { return cost; }
@@ -59 +62 @@
           protected:
                 const Type * dest;
+                bool srcIsLvalue;
                 const SymTab::Indexer &indexer;
                 Cost cost;
@@ -66 +70 @@
 
         typedef std::function<int(const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment &)> PtrsFunction;
-        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
+        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, bool srcIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
 
 // Some function pointer types, differ in return type.