Changeset 26238c1 for src/ResolvExpr

Timestamp:

Aug 28, 2017, 2:59:36 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

234223f, afce1cf

Parents:

2065609 (diff), 1cb758f2 (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

Location:

src/ResolvExpr

Files:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -698 +698 @@
 
         void AlternativeFinder::visit( UntypedExpr *untypedExpr ) {
-                bool doneInit = false;
-                AlternativeFinder funcOpFinder( indexer, env );
-
-                AlternativeFinder funcFinder( indexer, env );
-
                 {
                         std::string fname = InitTweak::getFunctionName( untypedExpr );
@@ -715 +710 @@
                 }
 
+                AlternativeFinder funcFinder( indexer, env );
                 funcFinder.findWithAdjustment( untypedExpr->get_function() );
+                // if there are no function alternatives, then proceeding is a waste of time.
+                if ( funcFinder.alternatives.empty() ) return;
+
                 std::list< AlternativeFinder > argAlternatives;
                 findSubExprs( untypedExpr->begin_args(), untypedExpr->end_args(), back_inserter( argAlternatives ) );
@@ -725 +724 @@
                 // if not tuple assignment, assignment is taken care of as a normal function call
                 Tuples::handleTupleAssignment( *this, untypedExpr, possibilities );
+
+                // find function operators
+                AlternativeFinder funcOpFinder( indexer, env );
+                NameExpr *opExpr = new NameExpr( "?()" );
+                try {
+                        funcOpFinder.findWithAdjustment( opExpr );
+                } catch( SemanticError &e ) {
+                        // it's ok if there aren't any defined function ops
+                }
+                PRINT(
+                        std::cerr << "known function ops:" << std::endl;
+                        printAlts( funcOpFinder.alternatives, std::cerr, 8 );
+                )
 
                 AltList candidates;
@@ -754 +766 @@
                                                 } // if
                                         } // if
-                                } else {
-                                        // seek a function operator that's compatible
-                                        if ( ! doneInit ) {
-                                                doneInit = true;
-                                                NameExpr *opExpr = new NameExpr( "?()" );
-                                                try {
-                                                        funcOpFinder.findWithAdjustment( opExpr );
-                                                } catch( SemanticError &e ) {
-                                                        // it's ok if there aren't any defined function ops
-                                                }
-                                                PRINT(
-                                                        std::cerr << "known function ops:" << std::endl;
-                                                        printAlts( funcOpFinder.alternatives, std::cerr, 8 );
-                                                )
-                                        }
-
-                                        for ( AltList::iterator funcOp = funcOpFinder.alternatives.begin(); funcOp != funcOpFinder.alternatives.end(); ++funcOp ) {
-                                                // check if the type is pointer to function
-                                                if ( PointerType *pointer = dynamic_cast< PointerType* >( funcOp->expr->get_result()->stripReferences() ) ) {
-                                                        if ( FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() ) ) {
-                                                                referenceToRvalueConversion( funcOp->expr );
-                                                                for ( std::list< AltList >::iterator actualAlt = possibilities.begin(); actualAlt != possibilities.end(); ++actualAlt ) {
-                                                                        AltList currentAlt;
-                                                                        currentAlt.push_back( *func );
-                                                                        currentAlt.insert( currentAlt.end(), actualAlt->begin(), actualAlt->end() );
-                                                                        makeFunctionAlternatives( *funcOp, function, currentAlt, std::back_inserter( candidates ) );
-                                                                } // for
-                                                        } // if
+                                }
+
+                                // try each function operator ?() with the current function alternative and each of the argument combinations
+                                for ( AltList::iterator funcOp = funcOpFinder.alternatives.begin(); funcOp != funcOpFinder.alternatives.end(); ++funcOp ) {
+                                        // check if the type is pointer to function
+                                        if ( PointerType *pointer = dynamic_cast< PointerType* >( funcOp->expr->get_result()->stripReferences() ) ) {
+                                                if ( FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() ) ) {
+                                                        referenceToRvalueConversion( funcOp->expr );
+                                                        for ( std::list< AltList >::iterator actualAlt = possibilities.begin(); actualAlt != possibilities.end(); ++actualAlt ) {
+                                                                AltList currentAlt;
+                                                                currentAlt.push_back( *func );
+                                                                currentAlt.insert( currentAlt.end(), actualAlt->begin(), actualAlt->end() );
+                                                                makeFunctionAlternatives( *funcOp, function, currentAlt, std::back_inserter( candidates ) );
+                                                        } // for
                                                 } // if
-                                        } // for
-                                } // if
+                                        } // if
+                                } // for
                         } catch ( SemanticError &e ) {
                                 errors.append( e );

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