Changeset fae6f21

Timestamp:

Nov 8, 2017, 3:37:29 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

78315272

Parents:

76a395a

Message:

Fix bugs in resolver refactor with tuples/varargs

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -632 +632 @@
                         std::vector<ArgPack> finalResults{};  /// list of completed tuples
                         // start tuples
-                        for ( ArgPack& result : results ) { result.beginTuple(); }
+                        for ( ArgPack& result : results ) {
+                                result.beginTuple();
+
+                                // use rest of exploded tuple if present
+                                while ( result.nextExpl < result.expls.size() ) {
+                                        const Alternative& actual = result.expls[result.nextExpl];
+                                        result.env.addActual( actual.env, result.openVars );
+                                        result.withArg( actual.expr );
+                                        ++result.nextExpl;
+                                }
+                        }
                         // iterate until all results completed
                         while ( ! results.empty() ) {
@@ -760 +770 @@
                                         // add argument
                                         aResult.withArg( aActual.expr, actual.cost );
-                                        if ( exploded.size() == 1 ) {
-                                                // argument consumed
-                                                ++aResult.nextArg;
-                                        } else {
+                                        ++aResult.nextArg;
+                                        if ( exploded.size() > 1 ) {
                                                 // other parts of tuple left over
                                                 aResult.expls = std::move( exploded );
@@ -815 +823 @@
                 std::vector<ArgPack> finalResults{};
                 if ( funcType->get_isVarArgs() ) {
+                        for ( ArgPack& result : results ) {
+                                // use rest of exploded tuple if present
+                                while ( result.nextExpl < result.expls.size() ) {
+                                        const Alternative& actual = result.expls[result.nextExpl];
+                                        result.env.addActual( actual.env, result.openVars );
+                                        result.withArg( actual.expr );
+                                        ++result.nextExpl;
+                                }
+                        }
+
                         while ( ! results.empty() ) {
                                 // build combinations for all remaining arguments
@@ -852 +870 @@
                         // filter out results that don't use all the arguments
                         for ( ArgPack& result : results ) {
-                                if ( result.nextArg >= args.size() ) {
+                                if ( result.nextExpl >= result.expls.size() && result.nextArg >= args.size() ) {
                                         finalResults.push_back( std::move(result) );
                                 }