Changeset 432ce7a for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Jun 11, 2019, 5:52:50 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6625727

Parents:

4b7cce6

Message:

Port CandidateFinder::postvisit for UntypedExpr?, stub dependencies

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (5 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -116 +116 @@
                 /// 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 );
+                void makeFunctionAlternatives( const Alternative &func, FunctionType *funcType, const ExplodedArgs_old& args, OutputIterator out );
                 /// Sets up parameter inference for an output alternative
                 template< typename OutputIterator >
@@ -593 +593 @@
 
                 /// Gets the list of exploded alternatives for this pack
-                const ExplodedActual& getExpl( const ExplodedArgs& args ) const {
+                const ExplodedActual& getExpl( const ExplodedArgs_old& args ) const {
                         return args[nextArg-1][explAlt];
                 }
@@ -617 +617 @@
         /// Instantiates an argument to match a formal, returns false if no results left
         bool instantiateArgument( Type* formalType, Initializer* initializer,
-                        const ExplodedArgs& args, std::vector<ArgPack>& results, std::size_t& genStart,
+                        const ExplodedArgs_old& args, std::vector<ArgPack>& results, std::size_t& genStart,
                         const SymTab::Indexer& indexer, unsigned nTuples = 0 ) {
                 if ( TupleType * tupleType = dynamic_cast<TupleType*>( formalType ) ) {
@@ -889 +889 @@
         template<typename OutputIterator>
         void AlternativeFinder::Finder::makeFunctionAlternatives( const Alternative &func,
-                        FunctionType *funcType, const ExplodedArgs &args, OutputIterator out ) {
+                        FunctionType *funcType, const ExplodedArgs_old &args, OutputIterator out ) {
                 OpenVarSet funcOpenVars;
                 AssertionSet funcNeed, funcHave;
@@ -1021 +1021 @@
 
                 // pre-explode arguments
-                ExplodedArgs argExpansions;
+                ExplodedArgs_old argExpansions;
                 argExpansions.reserve( argAlternatives.size() );