Changes in src/ResolvExpr/CandidateFinder.hpp [b69233ac:1389810]

File:

• src/ResolvExpr/CandidateFinder.hpp (modified) (4 diffs)

src/ResolvExpr/CandidateFinder.hpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed Jun 5 14:30:00 2019
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Wed Jun 5 14:30:00 2019
-// Update Count     : 1
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Oct  1  9:51:00 2019
+// Update Count     : 2
 //
 
@@ -28 +28 @@
 struct CandidateFinder {
         CandidateList candidates;          ///< List of candidate resolutions
-        const ast::SymbolTable & symtab;   ///< Symbol table to lookup candidates
+        const ast::SymbolTable & localSyms;   ///< Symbol table to lookup candidates
         const ast::TypeEnvironment & env;  ///< Substitutions performed in this resolution
         ast::ptr< ast::Type > targetType;  ///< Target type for resolution
+        std::set< std::string > otypeKeys;  /// different type may map to same key
 
-        CandidateFinder( 
-                const ast::SymbolTable & symtab, const ast::TypeEnvironment & env, 
+        CandidateFinder(
+                const ast::SymbolTable & syms, const ast::TypeEnvironment & env,
                 const ast::Type * tt = nullptr )
-        : candidates(), symtab( symtab ), env( env ), targetType( tt ) {}
+        : candidates(), localSyms( syms ), env( env ), targetType( tt ) {}
 
         /// Fill candidates with feasible resolutions for `expr`
         void find( const ast::Expr * expr, ResolvMode mode = {} );
+        bool pruneCandidates( CandidateList & candidates, CandidateList & out, std::vector<std::string> & errors );
 
         /// Runs new candidate finder on each element in xs, returning the list of finders
@@ -49 +51 @@
         iterator begin() { return candidates.begin(); }
         const_iterator begin() const { return candidates.begin(); }
-        
+
         iterator end() { return candidates.end(); }
         const_iterator end() const { return candidates.end(); }
@@ -55 +57 @@
 
 /// Computes conversion cost between two types
-Cost computeConversionCost( 
-        const ast::Type * argType, const ast::Type * paramType, const ast::SymbolTable & symtab, 
-        const ast::TypeEnvironment & env );
+Cost computeConversionCost(
+        const ast::Type * argType, const ast::Type * paramType, bool argIsLvalue,
+        const ast::SymbolTable & symtab, const ast::TypeEnvironment & env );
 
 } // namespace ResolvExpr