Changeset 0c6596f

Timestamp:

Aug 27, 2017, 11:25:00 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

1cb758f2

Parents:

2ae171d8

git-author:

Rob Schluntz <rschlunt@…> (08/27/17 11:24:53)

git-committer:

Rob Schluntz <rschlunt@…> (08/27/17 11:25:00)

Message:

Handle difference between reference casting and implicit conversion costs [fixes #39]

Location:

src/ResolvExpr

Files:

• CastCost.cc (modified) (1 diff)
• ConversionCost.cc (modified) (5 diffs)
• ConversionCost.h (modified) (3 diffs)

src/ResolvExpr/CastCost.cc

@@ -58 +58 @@
                         return Cost::safe;
                 } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * > ( dest ) ) {
-                        return convertToReferenceCost( src, refType, indexer, env );
+                        return convertToReferenceCost( src, refType, indexer, env, [](Type * t1, Type * t2, const TypeEnvironment & env, const SymTab::Indexer & indexer) {
+                                return ptrsCastable( t1, t2, env, indexer );
+                        });
                 } else {
                         CastCost converter( dest, indexer, env );

src/ResolvExpr/ConversionCost.cc

@@ -40 +40 @@
 #define PRINT(x)
 #endif
-
         Cost conversionCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
@@ -78 +77 @@
                 } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * > ( dest ) ) {
                         PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
-                        return convertToReferenceCost( src, refType, indexer, env );
+                        return convertToReferenceCost( src, refType, indexer, env, [](Type * t1, Type * t2, const TypeEnvironment & env, const SymTab::Indexer &){
+                                return ptrsAssignable( t1, t2, env );
+                        });
                 } else {
                         ConversionCost converter( dest, indexer, env );
@@ -90 +91 @@
         }
 
-        Cost convertToReferenceCost( Type * src, Type * dest, int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
+        Cost convertToReferenceCost( Type * src, Type * dest, int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
                 PRINT( std::cerr << "convert to reference cost..." << std::endl; )
                 if ( diff > 0 ) {
                         // TODO: document this
-                        Cost cost = convertToReferenceCost( safe_dynamic_cast< ReferenceType * >( src )->get_base(), dest, diff-1, indexer, env );
+                        Cost cost = convertToReferenceCost( safe_dynamic_cast< ReferenceType * >( src )->get_base(), dest, diff-1, indexer, env, func );
                         cost.incReference();
                         return cost;
                 } else if ( diff < -1 ) {
                         // TODO: document this
-                        Cost cost = convertToReferenceCost( src, safe_dynamic_cast< ReferenceType * >( dest )->get_base(), diff+1, indexer, env );
+                        Cost cost = convertToReferenceCost( src, safe_dynamic_cast< ReferenceType * >( dest )->get_base(), diff+1, indexer, env, func );
                         cost.incReference();
                         return cost;
@@ -110 +111 @@
                                         return Cost::safe;
                                 } else {  // xxx - this discards reference qualifiers from consideration -- reducing qualifiers is a safe conversion; is this right?
-                                        int assignResult = ptrsAssignable( srcAsRef->get_base(), destAsRef->get_base(), env );
+                                        int assignResult = func( srcAsRef->get_base(), destAsRef->get_base(), env, indexer );
                                         PRINT( std::cerr << "comparing references: " << assignResult << " " << srcAsRef << " " << destAsRef << std::endl; )
                                         if ( assignResult < 0 ) {
@@ -157 +158 @@
         }
 
-        Cost convertToReferenceCost( Type * src, ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
+        Cost convertToReferenceCost( Type * src, ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
                 int sdepth = src->referenceDepth(), ddepth = dest->referenceDepth();
-                return convertToReferenceCost( src, dest, sdepth-ddepth, indexer, env );
+                return convertToReferenceCost( src, dest, sdepth-ddepth, indexer, env, func );
         }
 

src/ResolvExpr/ConversionCost.h

@@ -16 +16 @@
 #pragma once
 
+#include <functional>         // for function
+
 #include "Cost.h"             // for Cost
 #include "SynTree/Visitor.h"  // for Visitor
@@ -21 +23 @@
 
 namespace SymTab {
-class Indexer;
+        class Indexer;
 }  // namespace SymTab
 
 namespace ResolvExpr {
-class TypeEnvironment;
+        class TypeEnvironment;
 
         class ConversionCost : public Visitor {
@@ -55 +57 @@
         };
 
-        Cost convertToReferenceCost( Type * src, ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        typedef std::function<int(Type *, Type *, const TypeEnvironment &, const SymTab::Indexer &)> PtrsFunction;
+        Cost convertToReferenceCost( Type * src, ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
 } // namespace ResolvExpr