From 1c2d788b454670bf8fa1cb65c6251a8ff6ddcaf7 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Mon, 19 Jun 2017 11:29:20 -0700 Subject: 3927 --- html/101run_sandboxed.cc.html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'html/101run_sandboxed.cc.html') diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html index 6b234405..10365a78 100644 --- a/html/101run_sandboxed.cc.html +++ b/html/101run_sandboxed.cc.html @@ -105,11 +105,11 @@ if ('onhashchange' in window) { 41 :(before "End Primitive Recipe Checks") 42 case RUN_SANDBOXED: { 43 if (SIZE(inst.ingredients) != 1) { - 44 ¦ raise << maybe(get(Recipe, r).name) << "'run-sandboxed' requires exactly one ingredient, but got '" << inst.original_string << "'\n" << end(); + 44 ¦ raise << maybe(get(Recipe, r).name) << "'run-sandboxed' requires exactly one ingredient, but got '" << inst.original_string << "'\n" << end(); 45 ¦ break; 46 } 47 if (!is_mu_text(inst.ingredients.at(0))) { - 48 ¦ raise << maybe(get(Recipe, r).name) << "first ingredient of 'run-sandboxed' should be a string, but got '" << to_string(inst.ingredients.at(0)) << "'\n" << end(); + 48 ¦ raise << maybe(get(Recipe, r).name) << "first ingredient of 'run-sandboxed' should be a string, but got '" << to_string(inst.ingredients.at(0)) << "'\n" << end(); 49 ¦ break; 50 } 51 break; @@ -161,7 +161,7 @@ if ('onhashchange' in window) { 97 ¦ for (int i = 1; i < Reserved_for_tests; ++i) 98 ¦ ¦ Memory.erase(i); 99 } -100 string command = trim(strip_comments(read_mu_text(address))); +100 string command = trim(strip_comments(read_mu_text(address))); 101 Name[get(Recipe_ordinal, "interactive")].clear(); 102 run_code_begin(/*should_stash_snapshots*/true); 103 if (command.empty()) return false; @@ -184,7 +184,7 @@ if ('onhashchange' in window) { 120 // and wait for it 121 if (Save_trace_stream) { 122 ¦ ++Save_trace_stream->callstack_depth; -123 ¦ trace(9999, "trace") << "run-sandboxed: incrementing callstack depth to " << Save_trace_stream->callstack_depth << end(); +123 ¦ trace(9999, "trace") << "run-sandboxed: incrementing callstack depth to " << Save_trace_stream->callstack_depth << end(); 124 ¦ assert(Save_trace_stream->callstack_depth < 9000); // 9998-101 plus cushion 125 } 126 Current_routine->calls.push_front(call(get(Recipe_ordinal, "sandbox"))); @@ -293,8 +293,8 @@ if ('onhashchange' in window) { 229 "]\n"); 230 231 //: adjust errors in the sandbox -232 :(after "string maybe(string s)") -233 if (s == "interactive") return ""; +232 :(before "End maybe(recipe_name) Special-cases") +233 if (recipe_name == "interactive") return ""; 234 235 :(scenario run_interactive_comments) 236 def main [ @@ -559,10 +559,10 @@ if ('onhashchange' in window) { 495 int trace_error_contents() { 496 if (!Trace_stream) return 0; 497 ostringstream out; -498 for (vector<trace_line>::iterator p = Trace_stream->past_lines.begin(); p != Trace_stream->past_lines.end(); ++p) { +498 for (vector<trace_line>::iterator p = Trace_stream->past_lines.begin(); p != Trace_stream->past_lines.end(); ++p) { 499 ¦ if (p->label != "error") continue; 500 ¦ out << p->contents; -501 ¦ if (*--p->contents.end() != '\n') out << '\n'; +501 ¦ if (*--p->contents.end() != '\n') out << '\n'; 502 } 503 string result = out.str(); 504 truncate(result); @@ -573,10 +573,10 @@ if ('onhashchange' in window) { 509 int trace_app_contents() { 510 if (!Trace_stream) return 0; 511 ostringstream out; -512 for (vector<trace_line>::iterator p = Trace_stream->past_lines.begin(); p != Trace_stream->past_lines.end(); ++p) { +512 for (vector<trace_line>::iterator p = Trace_stream->past_lines.begin(); p != Trace_stream->past_lines.end(); ++p) { 513 ¦ if (p->depth != App_depth) continue; 514 ¦ out << p->contents; -515 ¦ if (*--p->contents.end() != '\n') out << '\n'; +515 ¦ if (*--p->contents.end() != '\n') out << '\n'; 516 } 517 string result = out.str(); 518 if (result.empty()) return 0; @@ -603,11 +603,11 @@ if ('onhashchange' in window) { 539 :(before "End Primitive Recipe Checks") 540 case RELOAD: { 541 if (SIZE(inst.ingredients) != 1) { -542 ¦ raise << maybe(get(Recipe, r).name) << "'reload' requires exactly one ingredient, but got '" << inst.original_string << "'\n" << end(); +542 ¦ raise << maybe(get(Recipe, r).name) << "'reload' requires exactly one ingredient, but got '" << inst.original_string << "'\n" << end(); 543 ¦ break; 544 } 545 if (!is_mu_text(inst.ingredients.at(0))) { -546 ¦ raise << maybe(get(Recipe, r).name) << "first ingredient of 'reload' should be a string, but got '" << inst.ingredients.at(0).original_string << "'\n" << end(); +546 ¦ raise << maybe(get(Recipe, r).name) << "first ingredient of 'reload' should be a string, but got '" << inst.ingredients.at(0).original_string << "'\n" << end(); 547 ¦ break; 548 } 549 break; -- cgit 1.4.1-2-gfad0