Changeset 7d01cf44 for src/ResolvExpr/CastCost.cc

Timestamp:

Aug 12, 2019, 1:47:37 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

14388c1, e0bd0f9

Parents:

4f5a8a2

Message:

lvalue is now read through the expression.

File:

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

src/ResolvExpr/CastCost.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 06:57:43 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  2 15:34:36 2016
-// Update Count     : 7
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:12:00 2019
+// Update Count     : 8
 //
 
@@ -37 +37 @@
         struct CastCost_old : public ConversionCost {
           public:
-                CastCost_old( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
+                CastCost_old( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
 
                 using ConversionCost::previsit;
@@ -45 +46 @@
         };
 
-        Cost castCost( const Type * src, const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+        Cost castCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 if ( const TypeInstType * destAsTypeInst = dynamic_cast< const TypeInstType * >( dest ) ) {
                         if ( const EqvClass * eqvClass = env.lookup( destAsTypeInst->name ) ) {
                                 if ( eqvClass->type ) {
-                                        return castCost( src, eqvClass->type, indexer, env );
+                                        return castCost( src, eqvClass->type, srcIsLvalue, indexer, env );
                                 } else {
                                         return Cost::infinity;
@@ -57 +59 @@
                                 const TypeDecl * type = strict_dynamic_cast< const TypeDecl * >( namedType );
                                 if ( type->base ) {
-                                        return castCost( src, type->base, indexer, env ) + Cost::safe;
+                                        return castCost( src, type->base, srcIsLvalue, indexer, env ) + Cost::safe;
                                 } // if
                         } // if
@@ -78 +80 @@
                 } else if ( const ReferenceType * refType = dynamic_cast< const ReferenceType * > ( dest ) ) {
                         PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
-                        return convertToReferenceCost( src, refType, indexer, env, [](const Type * t1, const Type * t2, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
+                        return convertToReferenceCost( src, refType, srcIsLvalue, indexer, env, [](const Type * t1, const Type * t2, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
                                 return ptrsCastable( t1, t2, env, indexer );
                         });
                 } else {
                         PassVisitor<CastCost_old> converter(
-                                dest, indexer, env,
-                                (Cost (*)( const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment & ))
+                                dest, srcIsLvalue, indexer, env,
+                                (Cost (*)( const Type *, const Type *, bool, const SymTab::Indexer &, const TypeEnvironment & ))
                                         castCost );
                         src->accept( converter );
@@ -96 +98 @@
         }
 
-        CastCost_old::CastCost_old( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
-                : ConversionCost( dest, indexer, env, costFunc ) {
+        CastCost_old::CastCost_old( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+                : ConversionCost( dest, srcIsLvalue, indexer, env, costFunc ) {
         }
 
@@ -106 +109 @@
                         cost = Cost::unsafe;
                 } else {
-                        cost = conversionCost( basicType, dest, indexer, env );
+                        cost = conversionCost( basicType, dest, srcIsLvalue, indexer, env );
                 } // if
         }