Changes in src/ResolvExpr/AlternativeFinder.h [a8b27c6:4e66a18]

File:

• src/ResolvExpr/AlternativeFinder.h (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.h

@@ -21 +21 @@
 
 #include "Alternative.h"                 // for AltList, Alternative
-#include "ExplodedActual.h"              // for ExplodedActual
 #include "ResolvExpr/Cost.h"             // for Cost, Cost::infinity
 #include "ResolvExpr/TypeEnvironment.h"  // for AssertionSet, OpenVarSet
@@ -32 +31 @@
 
 namespace ResolvExpr {
-        class ArgPack;
-        
-        /// First index is which argument, second index is which alternative for that argument, 
-        /// third index is which exploded element of that alternative
-        using ExplodedArgs = std::vector< std::vector< ExplodedActual > >;
-        
         class AlternativeFinder : public Visitor {
           public:
                 AlternativeFinder( const SymTab::Indexer &indexer, const TypeEnvironment &env );
-
-                AlternativeFinder( const AlternativeFinder& o )
-                        : indexer(o.indexer), alternatives(o.alternatives), env(o.env), 
-                          targetType(o.targetType) {}
-                
-                AlternativeFinder( AlternativeFinder&& o )
-                        : indexer(o.indexer), alternatives(std::move(o.alternatives)), env(o.env), 
-                          targetType(o.targetType) {}
-                
-                AlternativeFinder& operator= ( const AlternativeFinder& o ) {
-                        if (&o == this) return *this;
-                        
-                        // horrific nasty hack to rebind references...
-                        alternatives.~AltList();
-                        new(this) AlternativeFinder(o);
-                        return *this;
-                }
-
-                AlternativeFinder& operator= ( AlternativeFinder&& o ) {
-                        if (&o == this) return *this;
-                        
-                        // horrific nasty hack to rebind references...
-                        alternatives.~AltList();
-                        new(this) AlternativeFinder(std::move(o));
-                        return *this;
-                }
-
                 void find( Expression *expr, bool adjust = false, bool prune = true, bool failFast = true );
                 /// Calls find with the adjust flag set; adjustment turns array and function types into equivalent pointer types
@@ -133 +99 @@
                 /// Adds alternatives for offsetof expressions, given the base type and name of the member
                 template< typename StructOrUnionType > void addOffsetof( StructOrUnionType *aggInst, const std::string &name );
-                /// Takes a final result and checks if its assertions can be satisfied
-                template<typename OutputIterator>
-                void validateFunctionAlternative( const Alternative &func, ArgPack& result, const std::vector<ArgPack>& results, OutputIterator out );
-                /// Finds matching alternatives for a function, given a set of arguments
-                template<typename OutputIterator>
-                void makeFunctionAlternatives( const Alternative &func, FunctionType *funcType, const ExplodedArgs& args, OutputIterator out );
-                /// Checks if assertion parameters match for a new alternative
+                bool instantiateFunction( std::list< DeclarationWithType* >& formals, const AltList &actuals, bool isVarArgs, OpenVarSet& openVars, TypeEnvironment &resultEnv, AssertionSet &resultNeed, AssertionSet &resultHave, AltList & out );
+                template< typename OutputIterator >
+                void makeFunctionAlternatives( const Alternative &func, FunctionType *funcType, const AltList &actualAlt, OutputIterator out );
                 template< typename OutputIterator >
                 void inferParameters( const AssertionSet &need, AssertionSet &have, const Alternative &newAlt, OpenVarSet &openVars, OutputIterator out );