Changeset 0872c42 for src

Timestamp:

Nov 20, 2017, 4:31:42 PM (7 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:

73a5cadb

Parents:

a94b829

Message:

Fix bug with ttype/vararg handling in resolver refactor

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -762 +762 @@
                                                 // add new result
                                                 results.emplace_back(
-                                                        i, actual.expr, move(env), copy(results[i].need), 
+                                                        i, exploded.front().expr, move(env), copy(results[i].need), 
                                                         copy(results[i].have), move(openVars), results[i].nextArg + 1, 
                                                         nTuples, actual.cost, move(newExpls) );
@@ -1009 +1009 @@
                                                 // add new result
                                                 results.emplace_back(
-                                                        i, actual.expr, move(env), copy(results[i].need), 
+                                                        i, exploded.front().expr, move(env), copy(results[i].need), 
                                                         copy(results[i].have), move(openVars), j + 1, 0, 
                                                         actual.cost, move(newExpls) );