diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2016-02-19 13:42:45 -0800 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2016-02-19 13:42:45 -0800 |
| commit | 9f95c7451b940b6644cb6fd6783ea9c17168357e (patch) | |
| tree | d1443c9c4dc48bdc6bd67c7e16b43b9185d6d835 /020run.cc | |
| parent | b83b2cfd6676e0caa18b39f22f01bdebf41c9d58 (diff) | |
| download | mu-9f95c7451b940b6644cb6fd6783ea9c17168357e.tar.gz | |
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.
Diffstat (limited to '020run.cc')
| -rw-r--r-- | 020run.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/020run.cc b/020run.cc index 60c1c428..c6617607 100644 --- a/020run.cc +++ b/020run.cc @@ -61,7 +61,7 @@ void run_current_routine() { // Running One Instruction if (current_instruction().is_label) { ++current_step_index(); continue; } - trace(Initial_callstack_depth + Trace_stream->callstack_depth, "run") << current_instruction().to_string() << end(); + trace(Initial_callstack_depth + Trace_stream->callstack_depth, "run") << to_string(current_instruction()) << end(); if (get_or_insert(Memory, 0) != 0) { raise_error << "something wrote to location 0; this should never happen\n" << end(); put(Memory, 0, 0); @@ -86,7 +86,7 @@ void run_current_routine() } } if (SIZE(products) < SIZE(current_instruction().products)) { - raise_error << SIZE(products) << " vs " << SIZE(current_instruction().products) << ": failed to write to all products! " << current_instruction().to_string() << '\n' << end(); + raise_error << SIZE(products) << " vs " << SIZE(current_instruction().products) << ": failed to write to all products! " << to_string(current_instruction()) << '\n' << end(); } else { for (long long int i = 0; i < SIZE(current_instruction().products); ++i) { @@ -267,7 +267,7 @@ vector<double> read_memory(reagent x) { void write_memory(reagent x, vector<double> data) { if (!x.type) { - raise_error << "can't write to " << x.to_string() << "; no type\n" << end(); + raise_error << "can't write to " << to_string(x) << "; no type\n" << end(); return; } if (is_dummy(x)) return; @@ -275,7 +275,7 @@ void write_memory(reagent x, vector<double> data) { long long int base = x.value; if (base == 0) return; if (size_mismatch(x, data)) { - raise_error << maybe(current_recipe_name()) << "size mismatch in storing to " << x.original_string << " (" << size_of(x.type) << " vs " << SIZE(data) << ") at '" << current_instruction().to_string() << "'\n" << end(); + raise_error << maybe(current_recipe_name()) << "size mismatch in storing to " << x.original_string << " (" << size_of(x.type) << " vs " << SIZE(data) << ") at '" << to_string(current_instruction()) << "'\n" << end(); return; } // End write_memory(reagent x, long long int base) Special-cases |