Changes in src/ResolvExpr/Candidate.hpp [432ce7a:99d4584]

File:

• src/ResolvExpr/Candidate.hpp (modified) (3 diffs)

src/ResolvExpr/Candidate.hpp

@@ -30 +30 @@
         /// A list of unresolved assertions
         using AssertionList = std::vector<AssertionSet::value_type>;
-
-        /// Convenience to merge AssertionList into AssertionSet
-        static inline void mergeAssertionSet( AssertionSet & dst, const AssertionList & src ) {
-                for ( const auto & s : src ) { dst.emplace( s ); }
-        }
 }
 
@@ -47 +42 @@
         ast::OpenVarSet open;      ///< Open variables for environment
         ast::AssertionList need;   ///< Assertions which need to be resolved
-
-        Candidate() : expr(), cost( Cost::zero ), cvtCost( Cost::zero ), env(), open(), need() {}
-        
-        Candidate( const ast::Expr * x, const ast::TypeEnvironment & e )
-        : expr( x ), cost( Cost::zero ), cvtCost( Cost::zero ), env( e ), open(), need() {}
-
-        Candidate( const Candidate & o, const ast::Expr * x )
-        : expr( x ), cost( o.cost ), cvtCost( Cost::zero ), env( o.env ), open( o.open ), 
-          need( o.need ) {}
-        
-        Candidate( 
-                const ast::Expr * x, ast::TypeEnvironment && e, ast::OpenVarSet && o, 
-                ast::AssertionSet && n, const Cost & c )
-        : expr( x ), cost( c ), cvtCost( Cost::zero ), env( std::move( e ) ), open( std::move( o ) ), 
-          need( n.begin(), n.end() ) {}
 };
 
@@ -69 +49 @@
 /// List of candidates
 using CandidateList = std::vector< CandidateRef >;
-
-/// Splice src after dst, clearing src
-static inline void splice( CandidateList & dst, CandidateList & src ) {
-        dst.reserve( dst.size() + src.size() );
-        for ( CandidateRef & r : src ) { dst.emplace_back( std::move( r ) ); }
-        src.clear();
-}
-
-/// Splice src before dst
-static inline void spliceBegin( CandidateList & dst, CandidateList & src ) {
-        splice( src, dst );
-        dst.swap( src );
-}
-
-/// Sum the cost of a list of candidates
-static inline Cost sumCost( const CandidateList & candidates ) {
-        Cost total = Cost::zero;
-        for ( const CandidateRef & r : candidates ) { total += r->cost; }
-        return total;
-}
-
-/// Holdover behaviour from old `findMinCost` -- xxx -- can maybe be eliminated?
-static inline void promoteCvtCost( CandidateList & candidates ) {
-        for ( CandidateRef & r : candidates ) {
-                r->cost = r->cvtCost;
-        }
-}
 
 void print( std::ostream & os, const Candidate & cand, Indenter indent = {} );