From 9f95c7451b940b6644cb6fd6783ea9c17168357e Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Fri, 19 Feb 2016 13:42:45 -0800 Subject: 2685 Stack of plans for cleaning up replace_type_ingredients() and a couple of other things, from main problem to subproblems: include type names in the type_tree rather than in the separate properties vector make type_tree and string_tree real cons cells, with separate leaf nodes redo the vocabulary for dumping various objects: do we really need to_string and debug_string? can we have a version with *all* information? can we have to_string not call debug_string? This commit nibbles at the edges of the final task, switching from member method syntax to global function like almost everything else. I'm mostly using methods just for STL in this project. --- 031address.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '031address.cc') diff --git a/031address.cc b/031address.cc index 5284dea1..be4dd8f8 100644 --- a/031address.cc +++ b/031address.cc @@ -25,7 +25,7 @@ recipe main [ :(before "long long int base = x.value" following "void write_memory(reagent x, vector data)") canonize(x); if (x.value == 0) { - raise_error << "can't write to location 0 in '" << current_instruction().to_string() << "'\n" << end(); + raise_error << "can't write to location 0 in '" << to_string(current_instruction()) << "'\n" << end(); return; } @@ -91,7 +91,7 @@ if (!canonize_type(product)) continue; bool canonize_type(reagent& r) { while (has_property(r, "lookup")) { if (!r.type || r.type->value != get(Type_ordinal, "address")) { - raise_error << "can't lookup non-address: " << r.to_string() << ": " << debug_string(r.type) << '\n' << end(); + raise_error << "can't lookup non-address: " << to_string(r) << ": " << debug_string(r.type) << '\n' << end(); return false; } drop_from_type(r, "address"); -- cgit 1.4.1-2-gfad0