Changeset 8d182b1 for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Nov 14, 2023, 12:19:09 PM (23 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

1ccae59, 89a8bab

Parents:

df8ba61a (diff), 5625427 (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

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (6 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -61 +61 @@
 namespace {
         /// First index is which argument, second is which alternative, third is which exploded element
-        using ExplodedArgs_new = std::deque< std::vector< ExplodedArg > >;
+        using ExplodedArgs = std::deque< std::vector< ExplodedArg > >;
 
         /// Returns a list of alternatives with the minimum cost in the given list
@@ -255 +255 @@
 
                 /// Gets the list of exploded candidates for this pack
-                const ExplodedArg & getExpl( const ExplodedArgs_new & args ) const {
+                const ExplodedArg & getExpl( const ExplodedArgs & args ) const {
                         return args[ nextArg-1 ][ explAlt ];
                 }
@@ -281 +281 @@
         bool instantiateArgument(
                 const CodeLocation & location,
-                const ast::Type * paramType, const ast::Init * init, const ExplodedArgs_new & args,
+                const ast::Type * paramType, const ast::Init * init, const ExplodedArgs & args,
                 std::vector< ArgPack > & results, std::size_t & genStart, const ast::SymbolTable & symtab,
                 unsigned nTuples = 0
@@ -618 +618 @@
                         const CodeLocation & location,
                         const CandidateRef & func, const ast::FunctionType * funcType,
-                        const ExplodedArgs_new & args, CandidateList & out );
+                        const ExplodedArgs & args, CandidateList & out );
 
                 /// Adds implicit struct-conversions to the alternative list
@@ -737 +737 @@
                 const CodeLocation & location,
                 const CandidateRef & func, const ast::FunctionType * funcType,
-                const ExplodedArgs_new & args, CandidateList & out
+                const ExplodedArgs & args, CandidateList & out
         ) {
                 ast::OpenVarSet funcOpen;
@@ -997 +997 @@
 
                 // pre-explode arguments
-                ExplodedArgs_new argExpansions;
+                ExplodedArgs argExpansions;
                 for ( const CandidateFinder & args : argCandidates ) {
                         argExpansions.emplace_back();