diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2017-05-26 16:43:18 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2017-05-26 17:36:16 -0700 |
commit | 2b25071710656d7a755c2f66c99734cd7990d1ba (patch) | |
tree | f4e3a83d6397343c7c225a354f4f2c837aef8190 /053recipe_header.cc | |
parent | 5e320aa049bc1d5ad78eec23be0127f4a8d6ec3d (diff) | |
download | mu-2b25071710656d7a755c2f66c99734cd7990d1ba.tar.gz |
3877
Diffstat (limited to '053recipe_header.cc')
-rw-r--r-- | 053recipe_header.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/053recipe_header.cc b/053recipe_header.cc index 9128f3bb..54bc452e 100644 --- a/053recipe_header.cc +++ b/053recipe_header.cc @@ -297,7 +297,7 @@ void check_calls_against_header(const recipe_ordinal r) { for (long int i = 0; i < min(SIZE(inst.ingredients), SIZE(callee.ingredients)); ++i) { // ingredients coerced from call to callee if (!types_coercible(callee.ingredients.at(i), inst.ingredients.at(i))) { - raise << maybe(caller.name) << "ingredient " << i << " has the wrong type at '" << inst.original_string << "'\n" << end(); + raise << maybe(caller.name) << "ingredient " << i << " has the wrong type at '" << to_original_string(inst) << "'\n" << end(); raise << " ['" << to_string(callee.ingredients.at(i).type) << "' vs '" << to_string(inst.ingredients.at(i).type) << "']\n" << end(); } } @@ -305,7 +305,7 @@ void check_calls_against_header(const recipe_ordinal r) { if (is_dummy(inst.products.at(i))) continue; // products coerced from callee to call if (!types_coercible(inst.products.at(i), callee.products.at(i))) { - raise << maybe(caller.name) << "product " << i << " has the wrong type at '" << inst.original_string << "'\n" << end(); + raise << maybe(caller.name) << "product " << i << " has the wrong type at '" << to_original_string(inst) << "'\n" << end(); raise << " ['" << to_string(inst.products.at(i).type) << "' vs '" << to_string(callee.products.at(i).type) << "']\n" << end(); } } @@ -337,12 +337,12 @@ void check_return_instructions_against_header(const recipe_ordinal r) { const instruction& inst = caller_recipe.steps.at(i); if (inst.name != "reply" && inst.name != "return") continue; if (SIZE(caller_recipe.products) != SIZE(inst.ingredients)) { - raise << maybe(caller_recipe.name) << "replied with the wrong number of products at '" << inst.original_string << "'\n" << end(); + raise << maybe(caller_recipe.name) << "replied with the wrong number of products at '" << to_original_string(inst) << "'\n" << end(); continue; } for (int i = 0; i < SIZE(caller_recipe.products); ++i) { if (!types_match(caller_recipe.products.at(i), inst.ingredients.at(i))) - raise << maybe(caller_recipe.name) << "replied with the wrong type at '" << inst.original_string << "'\n" << end(); + raise << maybe(caller_recipe.name) << "replied with the wrong type at '" << to_original_string(inst) << "'\n" << end(); } } } |