Changeset 1fdfc23

Timestamp:

Oct 20, 2017, 1:37:11 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:

d551d0a

Parents:

4b6ef70

Message:

Fix cost bug in resolver refactor

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -625 +625 @@
 
                 /// Clones and adds an actual, returns this
-                ArgPack& withArg( Expression* expr ) {
-                        actuals.emplace_back( expr->clone(), this->env, Cost::zero );
+                ArgPack& withArg( Expression* expr, Cost cost = Cost::zero ) {
+                        actuals.emplace_back( expr->clone(), this->env, cost );
                         if ( ! tupleEls.empty() ) ++tupleEls.back();
                         return *this;
@@ -686 +686 @@
                                                 // add details of actual to result
                                                 aResult.env.addActual( actual.env, aResult.openVars );
+                                                Cost cost = actual.cost;
                 
                                                 // explode argument
@@ -693 +694 @@
                                                 // add exploded argument to tuple
                                                 for ( Alternative& aActual : exploded ) {
-                                                        aResult.withArg( aActual.expr );
+                                                        aResult.withArg( aActual.expr, cost );
+                                                        cost = Cost::zero;
                                                 }
                                                 ++aResult.nextArg;
@@ -777 +779 @@
                                 if ( unify( formalType, actualType, aResult.env, aResult.need, aResult.have, aResult.openVars, indexer ) ) {
                                         // add argument
-                                        aResult.withArg( aActual.expr );
+                                        aResult.withArg( aActual.expr, actual.cost );
                                         if ( exploded.size() == 1 ) {
                                                 // argument consumed