From b8263692a6f2865482abbc21eae5a4e5163ab725 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Thu, 27 Apr 2017 09:07:53 -0700 Subject: 3841 Use the real original instruction in error messages. Thanks Ella Couch. --- 043space.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '043space.cc') diff --git a/043space.cc b/043space.cc index 770871c1..0cd16151 100644 --- a/043space.cc +++ b/043space.cc @@ -62,7 +62,7 @@ void absolutize(reagent& x) { if (is_raw(x) || is_dummy(x)) return; if (x.name == "default-space") return; if (!x.initialized) - raise << to_original_string(current_instruction()) << ": reagent not initialized: '" << x.original_string << "'\n" << end(); + raise << current_instruction().original_string << ": reagent not initialized: '" << x.original_string << "'\n" << end(); x.set_value(address(x.value, space_base(x))); x.properties.push_back(pair("raw", NULL)); assert(is_raw(x)); @@ -311,7 +311,7 @@ bool caller_uses_product(int product_index) { void rewrite_default_space_instruction(instruction& curr) { if (!curr.ingredients.empty()) - raise << to_original_string(curr) << " can't take any ingredients\n" << end(); + raise << "'" << curr.original_string << "' can't take any ingredients\n" << end(); curr.name = "new"; curr.ingredients.push_back(reagent("location:type")); curr.ingredients.push_back(reagent("number-of-locals:literal")); -- cgit 1.4.1-2-gfad0