diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2016-07-21 19:22:03 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2016-07-21 19:22:03 -0700 |
| commit | 8d72e5652147a0218f36757fd9171f3f2beda887 (patch) | |
| tree | b95edd6bb86f7d421327d2f436e0c2d375cb795d /023boolean.cc | |
| parent | fc19980d91e306df87b308d0c2875a2dcaf4b5c7 (diff) | |
| download | mu-8d72e5652147a0218f36757fd9171f3f2beda887.tar.gz | |
3120
Always show instruction before any transforms in error messages. This is likely going to make some errors unclear because they *need* to show the original instruction. But if we don't have tests for those situations did they ever really work?
Diffstat (limited to '023boolean.cc')
| -rw-r--r-- | 023boolean.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/023boolean.cc b/023boolean.cc index 833595fa..8175e365 100644 --- a/023boolean.cc +++ b/023boolean.cc @@ -13,7 +13,7 @@ case AND: { } } if (SIZE(inst.products) > 1) { - raise << maybe(get(Recipe, r).name) << "'and' yields exactly one product in '" << to_original_string(inst) << "'\n" << end(); + raise << maybe(get(Recipe, r).name) << "'and' yields exactly one product in '" << inst.original_string << "'\n" << end(); break; } if (!inst.products.empty() && !is_dummy(inst.products.at(0)) && !is_mu_boolean(inst.products.at(0))) { @@ -71,7 +71,7 @@ case OR: { } } if (SIZE(inst.products) > 1) { - raise << maybe(get(Recipe, r).name) << "'or' yields exactly one product in '" << to_original_string(inst) << "'\n" << end(); + raise << maybe(get(Recipe, r).name) << "'or' yields exactly one product in '" << inst.original_string << "'\n" << end(); break; } if (!inst.products.empty() && !is_dummy(inst.products.at(0)) && !is_mu_boolean(inst.products.at(0))) { @@ -123,7 +123,7 @@ put(Recipe_ordinal, "not", NOT); :(before "End Primitive Recipe Checks") case NOT: { if (SIZE(inst.products) != SIZE(inst.ingredients)) { - raise << "ingredients and products should match in '" << to_original_string(inst) << "'\n" << end(); + raise << "ingredients and products should match in '" << inst.original_string << "'\n" << end(); break; } for (int i = 0; i < SIZE(inst.ingredients); ++i) { |