From eaeb955212eb3b133fd98d98457f17bfea8891d1 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Thu, 6 Aug 2015 19:15:57 -0700 Subject: 1949 --- html/050scenario.cc.html | 171 ++++++++++++++++++++++++----------------------- 1 file changed, 86 insertions(+), 85 deletions(-) (limited to 'html/050scenario.cc.html') diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html index 6126a5ce..f2b7c24f 100644 --- a/html/050scenario.cc.html +++ b/html/050scenario.cc.html @@ -13,16 +13,17 @@ pre { white-space: pre-wrap; font-family: monospace; color: #eeeeee; background-color: #080808; } body { font-family: monospace; color: #eeeeee; background-color: #080808; } * { font-size: 1.05em; } -.traceAbsent { color: #c00000; } .traceContains { color: #008000; } +.SalientComment { color: #00ffff; } .Constant { color: #00a0a0; } .cSpecial { color: #008000; } -.SalientComment { color: #00ffff; } +.traceAbsent { color: #c00000; } +.Normal { color: #eeeeee; background-color: #080808; padding-bottom: 1px; } .Comment { color: #9090ff; } .Delimiter { color: #a04060; } .Special { color: #ff6060; } -.CommentedCode { color: #6c6c6c; } .Identifier { color: #804000; } +.CommentedCode { color: #6c6c6c; } --> @@ -79,17 +80,17 @@ scenario foo [ 1 <- 13 ] trace-should-contain [ - a: a b c + a: a b c ] - trace-should-not-contain [ - a: x y z + trace-should-not-contain [ + a: x y z ] ] //:: Core data structure :(before "End Types") -struct scenario { +struct scenario { string name; string to_run; }; @@ -101,7 +102,7 @@ vector<scenario> Scenarios; //: Simply store the text of the scenario. :(before "End Command Handlers") -else if (command == "scenario") { +else if (command == "scenario") { Scenarios.push_back(parse_scenario(in)); } @@ -134,7 +135,7 @@ scenario foo [ :(scenario read_scenario_with_bracket_in_comment_in_nested_string) scenario foo [ - 1:address:array:character <- new [# not a comment] + 1:address:array:character <- new [# not a comment] ] +run: 1:address:array:character <- new [# not a comment] @@ -142,35 +143,35 @@ scenario foo [ //: Treat the text of the scenario as a regular series of instructions. :(before "End Tests") -time_t mu_time; time(&mu_time); +time_t mu_time; time(&mu_time); cerr << "\nMu tests: " << ctime(&mu_time); -for (long long int i = 0; i < SIZE(Scenarios); ++i) { +for (long long int i = 0; i < SIZE(Scenarios); ++i) { //? cerr << Passed << '\n'; //? 1 //? cerr << i << ": " << Scenarios.at(i).name << '\n'; //? 6 run_mu_scenario(Scenarios.at(i)); - if (Passed) cerr << "."; + if (Passed) cerr << "."; } //: Convenience: run a single named scenario. :(after "Test Runs") -for (long long int i = 0; i < SIZE(Scenarios); ++i) { - if (Scenarios.at(i).name == argv[argc-1]) { +for (long long int i = 0; i < SIZE(Scenarios); ++i) { + if (Scenarios.at(i).name == argv[argc-1]) { run_mu_scenario(Scenarios.at(i)); - if (Passed) cerr << ".\n"; + if (Passed) cerr << ".\n"; return 0; } } :(before "End Globals") -const scenario* Current_scenario = NULL; +const scenario* Current_scenario = NULL; :(code) -void run_mu_scenario(const scenario& s) { +void run_mu_scenario(const scenario& s) { Current_scenario = &s; - bool not_already_inside_test = !Trace_stream; + bool not_already_inside_test = !Trace_stream; //? cerr << s.name << '\n'; //? 12 - if (not_already_inside_test) { + if (not_already_inside_test) { Trace_file = s.name; - Trace_stream = new trace_stream; + Trace_stream = new trace_stream; setup(); } assert(Routines.empty()); @@ -178,12 +179,12 @@ void run_mu_scenario(const scenario& s(tmp.at(0)); transform_all(); run(tmp.front()); - if (not_already_inside_test && Trace_stream) { + if (not_already_inside_test && Trace_stream) { teardown(); ofstream fout((Trace_dir+Trace_file).c_str()); fout << Trace_stream->readable_contents(""); fout.close(); - delete Trace_stream; + delete Trace_stream; Trace_stream = NULL; Trace_file = ""; } @@ -206,7 +207,7 @@ recipe scenario-foo [ +warn: redefining recipe scenario-foo :(after "bool warn_on_redefine(const string& recipe_name)") -if (recipe_name.find("scenario-") == 0) return true; +if (recipe_name.find("scenario-") == 0) return true; //:: The special instructions we want to support inside scenarios. //: In a compiler for the mu VM these will require more work. @@ -227,7 +228,7 @@ RUN, :(before "End Primitive Recipe Numbers") Recipe_ordinal["run"] = RUN; :(before "End Primitive Recipe Implementations") -case RUN: { +case RUN: { //? cout << "recipe " << current_instruction().ingredients.at(0).name << '\n'; //? 1 ostringstream tmp; tmp << "recipe run" << Next_recipe_ordinal << " [ " << current_instruction().ingredients.at(0).name << " ]"; @@ -243,7 +244,7 @@ case RUN: { // Some variables for fake resources always get special addresses in // scenarios. :(code) -void bind_special_scenario_names(recipe_ordinal r) { +void bind_special_scenario_names(recipe_ordinal r) { // Special Scenario Variable Names(r) // End Special Scenario Variable Names(r) } @@ -264,7 +265,7 @@ recipe main [ //: Also includes some special support for checking strings. :(before "End Globals") -bool Scenario_testing_scenario = false; +bool Scenario_testing_scenario = false; :(before "End Setup") Scenario_testing_scenario = false; @@ -284,44 +285,44 @@ MEMORY_SHOULD_CONTAIN, :(before "End Primitive Recipe Numbers") Recipe_ordinal["memory-should-contain"] = MEMORY_SHOULD_CONTAIN; :(before "End Primitive Recipe Implementations") -case MEMORY_SHOULD_CONTAIN: { - if (!Passed) break; +case MEMORY_SHOULD_CONTAIN: { + if (!Passed) break; //? cout << current_instruction().ingredients.at(0).name << '\n'; //? 1 check_memory(current_instruction().ingredients.at(0).name); break; } :(code) -void check_memory(const string& s) { +void check_memory(const string& s) { istringstream in(s); in >> std::noskipws; - set<long long int> locations_checked; - while (true) { + set<long long int> locations_checked; + while (true) { skip_whitespace_and_comments(in); - if (in.eof()) break; + if (in.eof()) break; string lhs = next_word(in); - if (!is_integer(lhs)) { + if (!is_integer(lhs)) { check_type(lhs, in); continue; } - int address = to_integer(lhs); + int address = to_integer(lhs); skip_whitespace_and_comments(in); string _assign; in >> _assign; assert(_assign == "<-"); skip_whitespace_and_comments(in); - int value = 0; in >> value; - if (locations_checked.find(address) != locations_checked.end()) + int value = 0; in >> value; + if (locations_checked.find(address) != locations_checked.end()) raise << "duplicate expectation for location " << address << '\n' << end(); trace(Primitive_recipe_depth, "run") << "checking location " << address << end(); - if (Memory[address] != value) { - if (Current_scenario && !Scenario_testing_scenario) { + if (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 " << value << " but saw " << Memory[address] << '\n' << end(); } - else { + else { // just testing scenario support raise << "expected location " << address << " to contain " << value << " but saw " << Memory[address] << '\n' << end(); } - if (!Scenario_testing_scenario) { + if (!Scenario_testing_scenario) { Passed = false; ++Num_failures; } @@ -331,16 +332,16 @@ void check_memory(const string& s} } -void check_type(const string& lhs, istream& in) { +void check_type(const string& lhs, istream& in) { reagent x(lhs); - if (x.properties.at(0).second.at(0) == "string") { + if (x.properties.at(0).second.at(0) == "string") { x.set_value(to_integer(x.name)); skip_whitespace_and_comments(in); string _assign = next_word(in); assert(_assign == "<-"); skip_whitespace_and_comments(in); string literal = next_word(in); - long long int address = x.value; + long long int address = x.value; // exclude quoting brackets assert(*literal.begin() == '['); literal.erase(literal.begin()); assert(*--literal.end() == ']'); literal.erase(--literal.end()); @@ -350,32 +351,32 @@ void check_type(const string& lhs"don't know how to check memory for " << lhs << '\n' << end(); } -void check_string(long long int address, const string& literal) { +void check_string(long long int address, const string& literal) { trace(Primitive_recipe_depth, "run") << "checking string length at " << address << end(); - if (Memory[address] != SIZE(literal)) { - if (Current_scenario && !Scenario_testing_scenario) + if (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 " << Memory[address] << '\n' << end(); - else + else raise << "expected location " << address << " to contain length " << SIZE(literal) << " of string [" << literal << "] but saw " << Memory[address] << '\n' << end(); - if (!Scenario_testing_scenario) { + if (!Scenario_testing_scenario) { Passed = false; ++Num_failures; } return; } ++address; // now skip length - for (long long int i = 0; i < SIZE(literal); ++i) { + for (long long int i = 0; i < SIZE(literal); ++i) { trace(Primitive_recipe_depth, "run") << "checking location " << address+i << end(); - if (Memory[address+i] != literal.at(i)) { - if (Current_scenario && !Scenario_testing_scenario) { + if (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 " << Memory[address+i] << '\n' << end(); } - else { + else { // just testing scenario support raise << "expected location " << (address+i) << " to contain " << literal.at(i) << " but saw " << Memory[address+i] << '\n' << end(); } - if (!Scenario_testing_scenario) { + if (!Scenario_testing_scenario) { Passed = false; ++Num_failures; } @@ -435,8 +436,8 @@ recipe main [ % Hide_warnings = true; recipe main [ trace-should-contain [ - a: b - a: d + a: b + a: d ] ] +warn: missing [b] in trace layer a @@ -446,8 +447,8 @@ TRACE_SHOULD_CONTAIN, :(before "End Primitive Recipe Numbers") Recipe_ordinal["trace-should-contain"] = TRACE_SHOULD_CONTAIN; :(before "End Primitive Recipe Implementations") -case TRACE_SHOULD_CONTAIN: { - if (!Passed) break; +case TRACE_SHOULD_CONTAIN: { + if (!Passed) break; check_trace(current_instruction().ingredients.at(0).name); break; } @@ -455,19 +456,19 @@ case TRACE_SHOULD_CONTAIN: { :(code) // simplified version of check_trace_contents() that emits warnings rather // than just printing to stderr -bool check_trace(const string& expected) { +bool check_trace(const string& expected) { //? cerr << "AAA " << expected << '\n'; //? 1 Trace_stream->newline(); vector<trace_line> expected_lines = parse_trace(expected); //? cerr << "BBB " << SIZE(expected_lines) << '\n'; //? 1 - if (expected_lines.empty()) return true; - long long int curr_expected_line = 0; - for (vector<trace_line>::iterator p = Trace_stream->past_lines.begin(); p != Trace_stream->past_lines.end(); ++p) { - if (expected_lines.at(curr_expected_line).label != p->label) continue; - if (expected_lines.at(curr_expected_line).contents != trim(p->contents)) continue; + if (expected_lines.empty()) return true; + long long int curr_expected_line = 0; + for (vector<trace_line>::iterator p = Trace_stream->past_lines.begin(); p != Trace_stream->past_lines.end(); ++p) { + if (expected_lines.at(curr_expected_line).label != p->label) continue; + if (expected_lines.at(curr_expected_line).contents != trim(p->contents)) continue; // match ++curr_expected_line; - if (curr_expected_line == SIZE(expected_lines)) { + if (curr_expected_line == SIZE(expected_lines)) { //? cerr << "ZZZ\n"; //? 1 return true; } @@ -479,13 +480,13 @@ bool check_trace(const string& expectedreturn false; } -vector<trace_line> parse_trace(const string& expected) { +vector<trace_line> parse_trace(const string& expected) { vector<string> buf = split(expected, "\n"); vector<trace_line> result; - for (long long int i = 0; i < SIZE(buf); ++i) { + for (long long int i = 0; i < SIZE(buf); ++i) { buf.at(i) = trim(buf.at(i)); - if (buf.at(i).empty()) continue; - long long int delim = buf.at(i).find(": "); + if (buf.at(i).empty()) continue; + long long int delim = buf.at(i).find(": "); result.push_back(trace_line(trim(buf.at(i).substr(0, delim)), trim(buf.at(i).substr(delim+2)))); } return result; @@ -499,8 +500,8 @@ recipe main [ trace [a], [b] ] trace-should-contain [ - a: b - a: d + a: b + a: d ] ] +warn: missing [d] in trace layer a @@ -513,7 +514,7 @@ recipe main [ trace [a], [b] ] trace-should-contain [ - a: b + a: b ] ] -warn: missing [b] in trace layer a @@ -530,8 +531,8 @@ recipe main [ run [ trace [a], [b] ] - trace-should-not-contain [ - a: b + trace-should-not-contain [ + a: b ] ] +warn: unexpected [b] in trace layer a @@ -541,8 +542,8 @@ TRACE_SHOULD_NOT_CONTAIN, :(before "End Primitive Recipe Numbers") Recipe_ordinal["trace-should-not-contain"] = TRACE_SHOULD_NOT_CONTAIN; :(before "End Primitive Recipe Implementations") -case TRACE_SHOULD_NOT_CONTAIN: { - if (!Passed) break; +case TRACE_SHOULD_NOT_CONTAIN: { + if (!Passed) break; check_trace_missing(current_instruction().ingredients.at(0).name); break; } @@ -550,11 +551,11 @@ case TRACE_SHOULD_NOT_CONTAIN: { :(code) // simplified version of check_trace_contents() that emits warnings rather // than just printing to stderr -bool check_trace_missing(const string& in) { +bool check_trace_missing(const string& in) { Trace_stream->newline(); vector<trace_line> lines = parse_trace(in); - for (long long int i = 0; i < SIZE(lines); ++i) { - if (trace_count(lines.at(i).label, lines.at(i).contents) != 0) { + for (long long 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 layer " << lines.at(i).label << '\n' << end(); Passed = false; return false; @@ -567,8 +568,8 @@ bool check_trace_missing(const string& in% Scenario_testing_scenario = true; % Hide_warnings = true; recipe main [ - trace-should-not-contain [ - a: b + trace-should-not-contain [ + a: b ] ] -warn: unexpected [b] in trace layer a @@ -581,9 +582,9 @@ recipe main [ run [ trace [a], [d] ] - trace-should-not-contain [ - a: b - a: d + trace-should-not-contain [ + a: b + a: d ] ] +warn: unexpected [d] in trace layer a @@ -591,13 +592,13 @@ recipe main [ //: Minor detail: ignore 'system' calls in scenarios, since anything we do //: with them is by definition impossible to test through mu. :(after "case _SYSTEM:") - if (Current_scenario) break; + if (Current_scenario) break; //:: Helpers :(code) // just for the scenarios running scenarios in C++ layers -void run_mu_scenario(const string& form) { +void run_mu_scenario(const string& form) { //? cerr << form << '\n'; //? 1 istringstream in(form); in >> std::noskipws; -- cgit 1.4.1-2-gfad0