diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2015-10-01 13:13:10 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2015-10-01 13:13:10 -0700 |
commit | 4814bf94e75ffdcbd2a4093eb1ab67851980a37a (patch) | |
tree | 9fde405360c5499fa2ad4b25ca009ed3bcc1f57b /041jump_target.cc | |
parent | 5fdd8e96adcf6f572888078caee62adbee1906a4 (diff) | |
download | mu-4814bf94e75ffdcbd2a4093eb1ab67851980a37a.tar.gz |
2226 - standardize warning format
Always show recipe name where error occurred. But don't show internal 'interactive' name for sandboxes, that's just confusing. What started out as warnings are now ossifying into errors that halt all execution. Is this how things went with C and Unix as well?
Diffstat (limited to '041jump_target.cc')
-rw-r--r-- | 041jump_target.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/041jump_target.cc b/041jump_target.cc index aaa01355..fad1e3c7 100644 --- a/041jump_target.cc +++ b/041jump_target.cc @@ -31,7 +31,7 @@ void transform_labels(const recipe_ordinal r) { offset[inst.label] = i; } else { - raise << Recipe[r].name << ": duplicate label '" << inst.label << "'" << end(); + raise << maybe(Recipe[r].name) << "duplicate label '" << inst.label << "'" << end(); // have all jumps skip some random but noticeable and deterministic amount of code offset[inst.label] = 9999; } @@ -60,19 +60,19 @@ void transform_labels(const recipe_ordinal r) { :(code) void replace_offset(reagent& x, /*const*/ map<string, long long int>& offset, const long long int current_offset, const recipe_ordinal r) { if (!is_literal(x)) { - raise << Recipe[r].name << ": jump target must be offset or label but is " << x.original_string << '\n' << end(); + raise << maybe(Recipe[r].name) << "jump target must be offset or label but is " << x.original_string << '\n' << end(); x.set_value(0); // no jump by default return; } assert(!x.initialized); if (is_integer(x.name)) return; // non-labels will be handled like other number operands if (!is_jump_target(x.name)) { - raise << Recipe[r].name << ": can't jump to label " << x.name << '\n' << end(); + raise << maybe(Recipe[r].name) << "can't jump to label " << x.name << '\n' << end(); x.set_value(0); // no jump by default return; } if (offset.find(x.name) == offset.end()) { - raise << Recipe[r].name << ": can't find label " << x.name << '\n' << end(); + raise << maybe(Recipe[r].name) << "can't find label " << x.name << '\n' << end(); x.set_value(0); // no jump by default return; } |