diff options
| -rw-r--r-- | 002test.cc | 2 | ||||
| -rw-r--r-- | 013update_operation.cc | 5 | ||||
| -rw-r--r-- | 050scenario.cc | 116 | ||||
| -rw-r--r-- | 082scenario_screen.cc | 41 | ||||
| -rw-r--r-- | 101run_sandboxed.cc | 4 |
5 files changed, 66 insertions, 102 deletions
diff --git a/002test.cc b/002test.cc index df2fc2cc..1d8efb08 100644 --- a/002test.cc +++ b/002test.cc @@ -54,7 +54,7 @@ if (Run_tests) { time_t t; time(&t); cerr << "C tests: " << ctime(&t); for (size_t i=0; i < sizeof(Tests)/sizeof(Tests[0]); ++i) { -//? cerr << i << '\n'; +//? cerr << "running .build/test_list line " << (i+1) << '\n'; run_test(i); } cerr << '\n'; diff --git a/013update_operation.cc b/013update_operation.cc index 0468e80d..8366439d 100644 --- a/013update_operation.cc +++ b/013update_operation.cc @@ -22,8 +22,9 @@ void update_instruction_operations(const recipe_ordinal r) { } // hook to suppress inserting recipe name into errors -string maybe(string s) { - return s + ": "; +string maybe(string recipe_name) { + // End maybe(recipe_name) Special-cases + return recipe_name + ": "; } :(scenarios transform) diff --git a/050scenario.cc b/050scenario.cc index 507d7ffb..95a43f75 100644 --- a/050scenario.cc +++ b/050scenario.cc @@ -244,8 +244,12 @@ void run_mu_scenario(const scenario& s) { //: Permit numeric locations to be accessed in scenarios. :(before "End check_default_space Special-cases") // user code should never create recipes with underscores in their names -if (caller.name.find("scenario_") == 0) return; // skip Mu scenarios which will use raw memory locations -if (caller.name.find("run_") == 0) return; // skip calls to 'run', which should be in scenarios and will also use raw memory locations +if (starts_with(caller.name, "scenario_")) return; // skip Mu scenarios which will use raw memory locations +if (starts_with(caller.name, "run_")) return; // skip calls to 'run', which should be in scenarios and will also use raw memory locations + +:(before "End maybe(recipe_name) Special-cases") +if (starts_with(recipe_name, "scenario_")) + return recipe_name.substr(strlen("scenario_")) + ": "; //: Some variables for fake resources always get special /raw addresses in scenarios. @@ -374,7 +378,7 @@ def main [ ] ] +run: checking location 1 -+error: expected location '1' to contain 13 but saw 0 ++error: F - main: expected location '1' to contain 13 but saw 0 :(before "End Primitive Recipe Declarations") MEMORY_SHOULD_CONTAIN, @@ -402,7 +406,7 @@ void check_memory(const string& s) { string lhs = next_word(in); if (lhs.empty()) { assert(!has_data(in)); - raise << "incomplete 'memory-should-contain' block at end of file (0)\n" << end(); + raise << maybe(current_recipe_name()) << "incomplete 'memory-should-contain' block at end of file (0)\n" << end(); return; } if (!is_integer(lhs)) { @@ -416,32 +420,22 @@ void check_memory(const string& s) { string rhs = next_word(in); if (rhs.empty()) { assert(!has_data(in)); - raise << "incomplete 'memory-should-contain' block at end of file (1)\n" << end(); + raise << maybe(current_recipe_name()) << "incomplete 'memory-should-contain' block at end of file (1)\n" << end(); return; } if (!is_integer(rhs) && !is_noninteger(rhs)) { - if (Current_scenario && !Scenario_testing_scenario) - // genuine test in a .mu file - raise << "\nF - " << Current_scenario->name << ": location '" << address << "' can't contain non-number " << rhs << "\n" << end(); - else - // just testing scenario support - raise << "location '" << address << "' can't contain non-number " << rhs << '\n' << end(); + if (!Hide_errors) cerr << '\n'; + raise << "F - " << maybe(current_recipe_name()) << "location '" << address << "' can't contain non-number " << rhs << '\n' << end(); if (!Scenario_testing_scenario) Passed = false; return; } double value = to_double(rhs); if (contains_key(locations_checked, address)) - raise << "duplicate expectation for location '" << address << "'\n" << end(); + raise << maybe(current_recipe_name()) << "duplicate expectation for location '" << address << "'\n" << end(); trace(9999, "run") << "checking location " << address << end(); if (get_or_insert(Memory, address) != value) { - if (Current_scenario && !Scenario_testing_scenario) { - // genuine test in a .mu file - raise << "\nF - " << Current_scenario->name << ": expected location '" << address << "' to contain " << no_scientific(value) << " but saw " << no_scientific(get_or_insert(Memory, address)) << '\n' << end(); - } - else { - // just testing scenario support - raise << "expected location '" << address << "' to contain " << no_scientific(value) << " but saw " << no_scientific(get_or_insert(Memory, address)) << '\n' << end(); - } + if (!Hide_errors) cerr << '\n'; + raise << "F - " << maybe(current_recipe_name()) << "expected location '" << address << "' to contain " << no_scientific(value) << " but saw " << no_scientific(get_or_insert(Memory, address)) << '\n' << end(); if (!Scenario_testing_scenario) Passed = false; return; } @@ -457,7 +451,7 @@ void check_type(const string& lhs, istream& in) { string _assign = next_word(in); if (_assign.empty()) { assert(!has_data(in)); - raise << "incomplete 'memory-should-contain' block at end of file (2)\n" << end(); + raise << maybe(current_recipe_name()) << "incomplete 'memory-should-contain' block at end of file (2)\n" << end(); return; } assert(_assign == "<-"); @@ -465,7 +459,7 @@ void check_type(const string& lhs, istream& in) { string literal = next_word(in); if (literal.empty()) { assert(!has_data(in)); - raise << "incomplete 'memory-should-contain' block at end of file (3)\n" << end(); + raise << maybe(current_recipe_name()) << "incomplete 'memory-should-contain' block at end of file (3)\n" << end(); return; } int address = x.value; @@ -482,10 +476,8 @@ void check_type(const string& lhs, istream& in) { void check_string(int address, const string& literal) { trace(9999, "run") << "checking string length at " << address << end(); if (get_or_insert(Memory, address) != SIZE(literal)) { - if (Current_scenario && !Scenario_testing_scenario) - raise << "\nF - " << Current_scenario->name << ": expected location '" << address << "' to contain length " << SIZE(literal) << " of string [" << literal << "] but saw " << no_scientific(get_or_insert(Memory, address)) << " (" << read_mu_text(address-/*fake refcount*/1) << ")\n" << end(); - else - raise << "expected location '" << address << "' to contain length " << SIZE(literal) << " of string [" << literal << "] but saw " << no_scientific(get_or_insert(Memory, address)) << '\n' << end(); + if (!Hide_errors) cerr << '\n'; + raise << "F - " << maybe(current_recipe_name()) << "expected location '" << address << "' to contain length " << SIZE(literal) << " of string [" << literal << "] but saw " << no_scientific(get_or_insert(Memory, address)) << '\n' << end(); if (!Scenario_testing_scenario) Passed = false; return; } @@ -493,14 +485,8 @@ void check_string(int address, const string& literal) { for (int i = 0; i < SIZE(literal); ++i) { trace(9999, "run") << "checking location " << address+i << end(); if (get_or_insert(Memory, address+i) != literal.at(i)) { - if (Current_scenario && !Scenario_testing_scenario) { - // genuine test in a .mu file - raise << "\nF - " << Current_scenario->name << ": expected location " << (address+i) << " to contain " << literal.at(i) << " but saw " << no_scientific(get_or_insert(Memory, address+i)) << " ('" << static_cast<char>(get_or_insert(Memory, address+i)) << "')\n" << end(); - } - else { - // just testing scenario support - raise << "expected location " << (address+i) << " to contain " << literal.at(i) << " but saw " << no_scientific(get_or_insert(Memory, address+i)) << '\n' << end(); - } + if (!Hide_errors) cerr << '\n'; + raise << "F - " << maybe(current_recipe_name()) << "expected location " << (address+i) << " to contain " << literal.at(i) << " but saw " << no_scientific(get_or_insert(Memory, address+i)) << '\n' << end(); if (!Scenario_testing_scenario) Passed = false; return; } @@ -516,7 +502,7 @@ def main [ 1 <- 0 ] ] -+error: duplicate expectation for location '1' ++error: main: duplicate expectation for location '1' :(scenario memory_check_string_length) % Scenario_testing_scenario = true; @@ -530,7 +516,7 @@ def main [ 1:array:character <- [ab] ] ] -+error: expected location '1' to contain length 2 of string [ab] but saw 3 ++error: F - main: expected location '1' to contain length 2 of string [ab] but saw 3 :(scenario memory_check_string) def main [ @@ -555,7 +541,7 @@ def main [ 1 <- [abc] ] ] -+error: location '1' can't contain non-number [abc] ++error: F - main: location '1' can't contain non-number [abc] :(scenario memory_check_with_comment) % Scenario_testing_scenario = true; @@ -582,7 +568,7 @@ def main [ a: d ] ] -+error: missing [b] in trace with label 'a' ++error: F - main: missing [b] in trace with label 'a' :(before "End Primitive Recipe Declarations") TRACE_SHOULD_CONTAIN, @@ -614,12 +600,9 @@ void check_trace(const string& expected) { ++curr_expected_line; if (curr_expected_line == SIZE(expected_lines)) return; } - if (Current_scenario && !Scenario_testing_scenario) - raise << "\nF - " << Current_scenario->name << ": missing [" << expected_lines.at(curr_expected_line).contents << "] " - << "in trace with label '" << expected_lines.at(curr_expected_line).label << "'\n" << end(); - else - raise << "missing [" << expected_lines.at(curr_expected_line).contents << "] " - << "in trace with label '" << expected_lines.at(curr_expected_line).label << "'\n" << end(); + if (!Hide_errors) cerr << '\n'; + raise << "F - " << maybe(current_recipe_name()) << "missing [" << expected_lines.at(curr_expected_line).contents << "] " + << "in trace with label '" << expected_lines.at(curr_expected_line).label << "'\n" << end(); if (!Hide_errors) DUMP(expected_lines.at(curr_expected_line).label); if (!Scenario_testing_scenario) Passed = false; @@ -633,7 +616,7 @@ vector<trace_line> parse_trace(const string& expected) { if (buf.at(i).empty()) continue; int delim = buf.at(i).find(": "); if (delim == -1) { - raise << Current_scenario->name << ": lines in 'trace-should-contain' should be of the form <label>: <contents>. Both parts are required.\n" << end(); + raise << maybe(current_recipe_name()) << "lines in 'trace-should-contain' should be of the form <label>: <contents>. Both parts are required.\n" << end(); result.clear(); return result; } @@ -654,7 +637,7 @@ def main [ a: d ] ] -+error: missing [d] in trace with label 'a' ++error: F - main: missing [d] in trace with label 'a' :(scenario trace_check_passes_silently) % Scenario_testing_scenario = true; @@ -684,7 +667,7 @@ def main [ a: b ] ] -+error: unexpected [b] in trace with label 'a' ++error: F - main: unexpected [b] in trace with label 'a' :(before "End Primitive Recipe Declarations") TRACE_SHOULD_NOT_CONTAIN, @@ -709,7 +692,7 @@ bool check_trace_missing(const string& in) { vector<trace_line> lines = parse_trace(in); for (int i = 0; i < SIZE(lines); ++i) { if (trace_count(lines.at(i).label, lines.at(i).contents) != 0) { - raise << "unexpected [" << lines.at(i).contents << "] in trace with label '" << lines.at(i).label << "'\n" << end(); + raise << "F - " << maybe(current_recipe_name()) << "unexpected [" << lines.at(i).contents << "] in trace with label '" << lines.at(i).label << "'\n" << end(); if (!Scenario_testing_scenario) Passed = false; return false; } @@ -739,7 +722,7 @@ def main [ a: d ] ] -+error: unexpected [d] in trace with label 'a' ++error: F - main: unexpected [d] in trace with label 'a' :(scenario trace_count_check) def main [ @@ -777,15 +760,8 @@ case CHECK_TRACE_COUNT_FOR_LABEL: { string label = current_instruction().ingredients.at(1).name; int count = trace_count(label); if (count != expected_count) { - if (Current_scenario && !Scenario_testing_scenario) { - // genuine test in a .mu file - raise << "\nF - " << Current_scenario->name << ": " << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label '" << label << "' in trace: " << end(); - DUMP(label); - } - else { - // just testing scenario support - raise << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label '" << label << "' in trace\n" << end(); - } + if (!Hide_errors) cerr << '\n'; + raise << "F - " << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label '" << label << "' in trace\n" << end(); if (!Scenario_testing_scenario) Passed = false; } break; @@ -818,15 +794,12 @@ case CHECK_TRACE_COUNT_FOR_LABEL_GREATER_THAN: { string label = current_instruction().ingredients.at(1).name; int count = trace_count(label); if (count <= expected_count) { - if (Current_scenario && !Scenario_testing_scenario) { - // genuine test in a .mu file - raise << "\nF - " << Current_scenario->name << ": " << maybe(current_recipe_name()) << "expected more than " << expected_count << " lines in trace with label '" << label << "' in trace: " << end(); + if (!Hide_errors) cerr << '\n'; + raise << maybe(current_recipe_name()) << "expected more than " << expected_count << " lines in trace with label '" << label << "' in trace\n" << end(); + if (!Hide_errors) { + cerr << "trace contents:\n"; DUMP(label); } - else { - // just testing scenario support - raise << maybe(current_recipe_name()) << "expected more than " << expected_count << " lines in trace with label '" << label << "' in trace\n" << end(); - } if (!Scenario_testing_scenario) Passed = false; } break; @@ -859,15 +832,12 @@ case CHECK_TRACE_COUNT_FOR_LABEL_LESSER_THAN: { string label = current_instruction().ingredients.at(1).name; int count = trace_count(label); if (count >= expected_count) { - if (Current_scenario && !Scenario_testing_scenario) { - // genuine test in a .mu file - raise << "\nF - " << Current_scenario->name << ": " << maybe(current_recipe_name()) << "expected less than" << expected_count << " lines in trace with label '" << label << "' in trace: " << end(); + if (!Hide_errors) cerr << '\n'; + raise << "F - " << maybe(current_recipe_name()) << "expected less than " << expected_count << " lines in trace with label '" << label << "' in trace\n" << end(); + if (!Hide_errors) { + cerr << "trace contents:\n"; DUMP(label); } - else { - // just testing scenario support - raise << maybe(current_recipe_name()) << "expected less than " << expected_count << " lines in trace with label '" << label << "' in trace\n" << end(); - } if (!Scenario_testing_scenario) Passed = false; } break; @@ -882,7 +852,7 @@ def main [ ] check-trace-count-for-label 2, [a] ] -+error: main: expected 2 lines in trace with label 'a' in trace ++error: F - main: expected 2 lines in trace with label 'a' in trace //: Minor detail: ignore 'system' calls in scenarios, since anything we do //: with them is by definition impossible to test through Mu. diff --git a/082scenario_screen.cc b/082scenario_screen.cc index dff695d7..7121776e 100644 --- a/082scenario_screen.cc +++ b/082scenario_screen.cc @@ -99,7 +99,7 @@ scenario screen-in-scenario-error [ . . ] ] -+error: expected screen location (0, 0) to contain 98 ('b') instead of 97 ('a') ++error: F - screen-in-scenario-error: expected screen location (0, 0) to contain 98 ('b') instead of 97 ('a') :(scenario screen_in_scenario_color_error) % Scenario_testing_scenario = true; @@ -119,7 +119,7 @@ scenario screen-in-scenario-color-error [ . . ] ] -+error: expected screen location (0, 0) to be in color 2 instead of 1 ++error: F - screen-in-scenario-color-error: expected screen location (0, 0) to contain 'a' in color 2 instead of 1 :(scenarios run) :(scenario convert_names_does_not_fail_when_mixing_special_names_and_numeric_locations) @@ -178,7 +178,7 @@ if (curr.name == "assume-screen") { scenario assume-screen-shows-up-in-errors [ assume-screen width, 5 ] -+error: scenario_assume-screen-shows-up-in-errors: missing type for 'width' in 'assume-screen width, 5' ++error: assume-screen-shows-up-in-errors: missing type for 'width' in 'assume-screen width, 5' //: screen-should-contain is a regular instruction :(before "End Primitive Recipe Declarations") @@ -266,7 +266,7 @@ void check_screen(const string& expected_contents, const int color) { cursor.skip_whitespace_and_comments(); if (cursor.at_end()) break; if (cursor.get() != '.') { - raise << Current_scenario->name << ": each row of the expected screen should start with a '.'\n" << end(); + raise << maybe(current_recipe_name()) << "each row of the expected screen should start with a '.'\n" << end(); if (!Scenario_testing_scenario) Passed = false; return; } @@ -281,15 +281,9 @@ void check_screen(const string& expected_contents, const int color) { if (get_or_insert(Memory, addr) != 0 && get_or_insert(Memory, addr) == curr) { if (color == -1 || color == get_or_insert(Memory, addr+cell_color_offset)) continue; // contents match but color is off - if (Current_scenario && !Scenario_testing_scenario) { - // genuine test in a .mu file - raise << "\nF - " << Current_scenario->name << ": expected screen location (" << row << ", " << column << ", address " << addr << ", value " << no_scientific(get_or_insert(Memory, addr)) << ") to be in color " << color << " instead of " << no_scientific(get_or_insert(Memory, addr+cell_color_offset)) << "\n" << end(); - dump_screen(); - } - else { - // just testing check_screen - raise << "expected screen location (" << row << ", " << column << ") to be in color " << color << " instead of " << no_scientific(get_or_insert(Memory, addr+cell_color_offset)) << '\n' << end(); - } + if (!Hide_errors) cerr << '\n'; + raise << "F - " << maybe(current_recipe_name()) << "expected screen location (" << row << ", " << column << ") to contain '" << unicode_character_at(addr) << "' in color " << color << " instead of " << no_scientific(get_or_insert(Memory, addr+cell_color_offset)) << "\n" << end(); + if (!Hide_errors) dump_screen(); if (!Scenario_testing_scenario) Passed = false; return; } @@ -309,31 +303,30 @@ void check_screen(const string& expected_contents, const int color) { ostringstream color_phrase; if (color != -1) color_phrase << " in color " << color; - if (Current_scenario && !Scenario_testing_scenario) { - // genuine test in a .mu file - raise << "\nF - " << Current_scenario->name << ": expected screen location (" << row << ", " << column << ") to contain " << curr << expected_pretty << color_phrase.str() << " instead of " << no_scientific(get_or_insert(Memory, addr)) << actual_pretty << '\n' << end(); - dump_screen(); - } - else { - // just testing check_screen - raise << "expected screen location (" << row << ", " << column << ") to contain " << curr << expected_pretty << color_phrase.str() << " instead of " << no_scientific(get_or_insert(Memory, addr)) << actual_pretty << '\n' << end(); - } + if (!Hide_errors) cerr << '\n'; + raise << "F - " << maybe(current_recipe_name()) << "expected screen location (" << row << ", " << column << ") to contain " << curr << expected_pretty << color_phrase.str() << " instead of " << no_scientific(get_or_insert(Memory, addr)) << actual_pretty << '\n' << end(); + if (!Hide_errors) dump_screen(); if (!Scenario_testing_scenario) Passed = false; return; } if (cursor.get() != '.') { - raise << Current_scenario->name << ": row " << row << " of the expected screen is too long\n" << end(); + raise << maybe(current_recipe_name()) << "row " << row << " of the expected screen is too long\n" << end(); if (!Scenario_testing_scenario) Passed = false; return; } } cursor.skip_whitespace_and_comments(); if (!cursor.at_end()) { - raise << Current_scenario->name << ": expected screen has too many rows\n" << end(); + raise << maybe(current_recipe_name()) << "expected screen has too many rows\n" << end(); Passed = false; } } +const char* unicode_character_at(int addr) { + int unicode_code_point = static_cast<int>(get_or_insert(Memory, addr)); + return to_unicode(unicode_code_point); +} + raw_string_stream::raw_string_stream(const string& backing) :index(0), max(SIZE(backing)), buf(backing.c_str()) {} bool raw_string_stream::at_end() const { diff --git a/101run_sandboxed.cc b/101run_sandboxed.cc index 06b1cb04..b6d42835 100644 --- a/101run_sandboxed.cc +++ b/101run_sandboxed.cc @@ -229,8 +229,8 @@ load(string( "]\n"); //: adjust errors in the sandbox -:(after "string maybe(string s)") - if (s == "interactive") return ""; +:(before "End maybe(recipe_name) Special-cases") +if (recipe_name == "interactive") return ""; :(scenario run_interactive_comments) def main [ |