about summary refs log tree commit diff stats
path: root/020run.cc
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2017-04-27 09:07:53 -0700
committerKartik K. Agaram <vc@akkartik.com>2017-04-27 09:07:53 -0700
commitb8263692a6f2865482abbc21eae5a4e5163ab725 (patch)
treeb1b938d4a83cf2b420001c9188194a5800d12eb2 /020run.cc
parentf6645643953eeb0a493d258759a4421505d13539 (diff)
downloadmu-b8263692a6f2865482abbc21eae5a4e5163ab725.tar.gz
3841
Use the real original instruction in error messages.
Thanks Ella Couch.
Diffstat (limited to '020run.cc')
-rw-r--r--020run.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/020run.cc b/020run.cc
index f5b05ed1..d9d70334 100644
--- a/020run.cc
+++ b/020run.cc
@@ -94,7 +94,7 @@ void run_current_routine() {
     //: used by a later layer
     Writing_products_of_instruction = true;
     if (SIZE(products) < SIZE(current_instruction().products)) {
-      raise << SIZE(products) << " vs " << SIZE(current_instruction().products) << ": failed to write to all products in '" << to_original_string(current_instruction()) << "'\n" << end();
+      raise << SIZE(products) << " vs " << SIZE(current_instruction().products) << ": failed to write to all products in '" << current_instruction().original_string << "'\n" << end();
     }
     else {
       for (int i = 0;  i < SIZE(current_instruction().products);  ++i)
@@ -321,11 +321,11 @@ void write_memory(reagent/*copy*/ x, const vector<double>& data) {
   if (is_literal(x)) return;
   // End Preprocess write_memory(x, data)
   if (x.value == 0) {
-    raise << "can't write to location 0 in '" << to_original_string(current_instruction()) << "'\n" << end();
+    raise << "can't write to location 0 in '" << current_instruction().original_string << "'\n" << end();
     return;
   }
   if (size_mismatch(x, data)) {
-    raise << maybe(current_recipe_name()) << "size mismatch in storing to '" << x.original_string << "' (" << size_of(x) << " vs " << SIZE(data) << ") at '" << to_original_string(current_instruction()) << "'\n" << end();
+    raise << maybe(current_recipe_name()) << "size mismatch in storing to '" << x.original_string << "' (" << size_of(x) << " vs " << SIZE(data) << ") at '" << current_instruction().original_string << "'\n" << end();
     return;
   }
   // End write_memory(x) Special-cases