From ffc9e66b3505990009e47b461eb03d3eb1635258 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 5 Nov 2017 02:00:26 -0800 Subject: 4109 --- html/050scenario.cc.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'html/050scenario.cc.html') diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html index 698ac6c8..e47925c1 100644 --- a/html/050scenario.cc.html +++ b/html/050scenario.cc.html @@ -479,7 +479,7 @@ if ('onhashchange' in window) { 412 ¦ ¦ check_type(lhs, in); 413 ¦ ¦ continue; 414 ¦ } -415 ¦ int address = to_integer(lhs); +415 ¦ int address = to_integer(lhs); 416 ¦ skip_whitespace_and_comments(in); 417 ¦ string _assign; in >> _assign; assert(_assign == "<-"); 418 ¦ skip_whitespace_and_comments(in); @@ -496,16 +496,16 @@ if ('onhashchange' in window) { 429 ¦ ¦ return; 430 ¦ } 431 ¦ double value = to_double(rhs); -432 ¦ if (contains_key(locations_checked, address)) +432 ¦ if (contains_key(locations_checked, address)) 433 ¦ ¦ raise << maybe(current_recipe_name()) << "duplicate expectation for location '" << address << "'\n" << end(); -434 ¦ trace(9999, "run") << "checking location " << address << end(); -435 ¦ if (get_or_insert(Memory, address) != value) { +434 ¦ trace("run") << "checking location " << address << end(); +435 ¦ if (get_or_insert(Memory, address) != value) { 436 ¦ ¦ if (!Hide_errors) cerr << '\n'; -437 ¦ ¦ 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(); +437 ¦ ¦ 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(); 438 ¦ ¦ if (!Scenario_testing_scenario) Passed = false; 439 ¦ ¦ return; 440 ¦ } -441 ¦ locations_checked.insert(address); +441 ¦ locations_checked.insert(address); 442 } 443 } 444 @@ -528,7 +528,7 @@ if ('onhashchange' in window) { 461 ¦ ¦ raise << maybe(current_recipe_name()) << "incomplete 'memory-should-contain' block at end of file (3)\n" << end(); 462 ¦ ¦ return; 463 ¦ } -464 ¦ int address = x.value; +464 ¦ int address = x.value; 465 ¦ // exclude quoting brackets 466 ¦ if (*literal.begin() != '[') { 467 ¦ ¦ raise << maybe(current_recipe_name()) << "array:character types inside 'memory-should-contain' can only be compared with text literals surrounded by [], not '" << literal << "'\n" << end(); @@ -536,7 +536,7 @@ if ('onhashchange' in window) { 469 ¦ } 470 ¦ literal.erase(literal.begin()); 471 ¦ assert(*--literal.end() == ']'); literal.erase(--literal.end()); -472 ¦ check_mu_text(address, literal); +472 ¦ check_mu_text(address, literal); 473 ¦ return; 474 } 475 // End Scenario Type Special-cases @@ -544,7 +544,7 @@ if ('onhashchange' in window) { 477 } 478 479 void check_mu_text(int start, const string& literal) { -480 trace(9999, "run") << "checking text length at " << start << end(); +480 trace("run") << "checking text length at " << start << end(); 481 int array_length = static_cast<int>(get_or_insert(Memory, start)); 482 if (array_length != SIZE(literal)) { 483 ¦ if (!Hide_errors) cerr << '\n'; @@ -554,7 +554,7 @@ if ('onhashchange' in window) { 487 } 488 int curr = start+1; // now skip length 489 for (int i = 0; i < SIZE(literal); ++i) { -490 ¦ trace(9999, "run") << "checking location " << curr+i << end(); +490 ¦ trace("run") << "checking location " << curr+i << end(); 491 ¦ if (get_or_insert(Memory, curr+i) != literal.at(i)) { 492 ¦ ¦ if (!Hide_errors) cerr << '\n'; 493 ¦ ¦ raise << "F - " << maybe(current_recipe_name()) << "expected location " << (curr+i) << " to contain " << literal.at(i) << " but saw " << no_scientific(get_or_insert(Memory, curr+i)) << '\n' << end(); @@ -944,7 +944,7 @@ if ('onhashchange' in window) { 877 :(after "case _SYSTEM:") 878 if (Current_scenario) break; 879 -880 //:: Warn if people use '_' manually in function names. They're reserved for internal use. +880 //:: Warn if people use '_' manually in recipe names. They're reserved for internal use. 881 882 :(scenario recipe_name_with_underscore) 883 % Hide_errors = true; -- cgit 1.4.1-2-gfad0