about summary refs log tree commit diff stats
path: root/072recipe.cc
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2017-12-07 15:59:48 -0800
committerKartik K. Agaram <vc@akkartik.com>2017-12-07 16:00:02 -0800
commit07de3e9536fc1f3fc8f8f77f833c4730b6de1b7d (patch)
tree77278540a072945823364e0abf80d134a98ecb57 /072recipe.cc
parentba2729b2011da0c7e644d1c25a5ff75fca6bb848 (diff)
downloadmu-07de3e9536fc1f3fc8f8f77f833c4730b6de1b7d.tar.gz
4151 - specializing calls returning continuations
Diffstat (limited to '072recipe.cc')
-rw-r--r--072recipe.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/072recipe.cc b/072recipe.cc
index d05e8575..eaf1baf3 100644
--- a/072recipe.cc
+++ b/072recipe.cc
@@ -205,7 +205,17 @@ def f x:point -> y:point [
 +error: main: product 0 has the wrong type at '2:num <- call {1: (recipe point -> point)}, 34'
 
 :(before "End resolve_ambiguous_call(r, index, inst, caller_recipe) Special-cases")
-if (inst.name == "call" && !inst.ingredients.empty() && inst.ingredients.at(0).type && inst.ingredients.at(0).type->atom && inst.ingredients.at(0).type->name == "recipe-literal") {
+if (inst.name == "call" && first_ingredient_is_recipe_literal(inst)) {
+  resolve_indirect_ambiguous_call(r, index, inst, caller_recipe);
+  return;
+}
+:(code)
+bool first_ingredient_is_recipe_literal(const instruction& inst) {
+  if (inst.ingredients.empty()) return false;
+  const reagent& ingredient = inst.ingredients.at(0);
+  return ingredient.type && ingredient.type->atom && ingredient.type->name == "recipe-literal";
+}
+void resolve_indirect_ambiguous_call(const recipe_ordinal r, int index, instruction& inst, const recipe& caller_recipe) {
   instruction inst2;
   inst2.name = inst.ingredients.at(0).name;
   for (int i = /*skip recipe*/1;  i < SIZE(inst.ingredients);  ++i)
@@ -215,7 +225,6 @@ if (inst.name == "call" && !inst.ingredients.empty() && inst.ingredients.at(0).t
   resolve_ambiguous_call(r, index, inst2, caller_recipe);
   inst.ingredients.at(0).name = inst2.name;
   inst.ingredients.at(0).set_value(get(Recipe_ordinal, inst2.name));
-  return;
 }
 
 :(after "Transform.push_back(check_instruction)")