Changeset 54043f4

Timestamp:

Feb 27, 2018, 4:52:10 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

86e84e4

Parents:

eddb399

Message:

Add with expression cost into conversion cost

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -567 +567 @@
                                 //if ( newNeedParents[ curDecl->get_uniqueId() ][ candDecl->get_uniqueId() ]++ > recursionParentLimit ) continue;
 
-                                Expression *varExpr = data.combine( newerAlt.cost );
+                                Expression *varExpr = data.combine( newerAlt.cvtCost );
                                 delete varExpr->get_result();
                                 varExpr->set_result( adjType->clone() );
@@ -1373 +1373 @@
                         Cost cost = Cost::zero;
                         Expression * newExpr = data.combine( cost );
-                        alternatives.push_back( Alternative( newExpr, env, Cost::zero ) ); // xxx
+                        alternatives.push_back( Alternative( newExpr, env, Cost::zero, cost ) );
                         PRINT(
                                 std::cerr << "decl is ";
@@ -1488 +1488 @@
                                 Cost cost = Cost::zero;
                                 Expression * newExpr = data.combine( cost );
-                                alternatives.push_back( Alternative( new AttrExpr( newExpr, argType->clone() ), env, cost ) );
+                                alternatives.push_back( Alternative( new AttrExpr( newExpr, argType->clone() ), env, Cost::zero, cost ) );
                                 for ( DeclarationWithType * retVal : function->returnVals ) {
                                         alternatives.back().expr->result = retVal->get_type()->clone();
@@ -1527 +1527 @@
                                 Cost cost = Cost::zero;
                                 Expression * newExpr = data.combine( cost );
-                                alternatives.push_back( Alternative( newExpr, env, cost ) );
+                                alternatives.push_back( Alternative( newExpr, env, Cost::zero, cost ) );
                                 renameTypes( alternatives.back().expr );
                         } // for