2202 - don't let editor die on syntax errors

Bugfix to 2186. I hadn't taken care of 'reload' as cleanly as I had
'run-interactive'.

3 files changed, 50 insertions, 35 deletions

diff --git a/003trace.cc b/003trace.cc
index 40a8ff9b..c5e651c9 100644
--- a/003trace.cc
+++ b/003trace.cc
@@ -206,6 +206,7 @@ START_TRACING_UNTIL_END_OF_SCOPE
 
 :(before "End Tracing")
 bool check_trace_contents(string FUNCTION, string FILE, int LINE, string expected) {  // missing layer == anywhere
+  if (!Trace_stream) return false;
   vector<string> expected_lines = split(expected, "");
   long long int curr_expected_line = 0;
   while (curr_expected_line < SIZE(expected_lines) && expected_lines.at(curr_expected_line).empty())
diff --git a/038scheduler.cc b/038scheduler.cc
index 9bda9de9..2e0e0322 100644
--- a/038scheduler.cc
+++ b/038scheduler.cc
@@ -275,7 +275,7 @@ recipe f2 [
 -warn: f2: divide by zero in '4:number <- divide-with-remainder 4, 0'
 
 :(after "operator<<(ostream& os, unused end)")
-  if (Trace_stream->curr_layer == "warn" && Current_routine) {
+  if (Trace_stream && Trace_stream->curr_layer == "warn" && Current_routine) {
     Current_routine->state = COMPLETED;
   }
 
diff --git a/081run_interactive.cc b/081run_interactive.cc
index ca314565..dd3fc5c3 100644
--- a/081run_interactive.cc
+++ b/081run_interactive.cc
@@ -3,10 +3,12 @@
 
 :(scenario run_interactive_code)
 recipe main [
+  1:number/raw <- copy 0
   2:address:array:character <- new [1:number/raw <- copy 34]
   run-interactive 2:address:array:character
+  3:number/raw <- copy 1:number/raw
 ]
-+mem: storing 34 in location 1
++mem: storing 34 in location 3
 
 :(scenario run_interactive_empty)
 recipe main [
@@ -42,7 +44,7 @@ case RUN_INTERACTIVE: {
     products.at(2).push_back(0);
     products.at(3).push_back(trace_contents("app"));
     products.at(4).push_back(1);  // completed
-    cleanup_run_interactive();
+    run_code_end();
     break;  // done with this instruction
   }
   else {
@@ -52,6 +54,9 @@ case RUN_INTERACTIVE: {
 
 :(before "End Globals")
 bool Track_most_recent_products = false;
+:(before "End Tracing")
+trace_stream* Save_trace_stream = NULL;
+string Save_trace_file;
 :(before "End Setup")
 Track_most_recent_products = false;
 :(code)
@@ -70,14 +75,7 @@ bool run_interactive(long long int address) {
   if (command.empty()) return false;
   Recipe.erase(Recipe_ordinal["interactive"]);
   Name[Recipe_ordinal["interactive"]].clear();
-  // stuff to undo later, in cleanup_run_interactive()
-  Hide_warnings = true;
-  if (!Trace_stream) {
-    Trace_file = "";  // if there wasn't already a stream we don't want to save it
-    Trace_stream = new trace_stream;
-    Trace_stream->collect_layers.insert("warn");
-    Trace_stream->collect_layers.insert("app");
-  }
+  run_code_begin();
   // don't kill the current routine on parse errors
   routine* save_current_routine = Current_routine;
   Current_routine = NULL;
@@ -99,6 +97,28 @@ bool run_interactive(long long int address) {
   return true;
 }
 
+void run_code_begin() {
+  // stuff to undo later, in run_code_end()
+  Hide_warnings = true;
+  Disable_redefine_warnings = true;
+  Save_trace_stream = Trace_stream;
+  Save_trace_file = Trace_file;
+  Trace_file = "";
+  Trace_stream = new trace_stream;
+  Trace_stream->collect_layers.insert("warn");
+  Trace_stream->collect_layers.insert("app");
+}
+
+void run_code_end() {
+  Hide_warnings = false;
+  Disable_redefine_warnings = false;
+  delete Trace_stream;
+  Trace_stream = Save_trace_stream;
+  Save_trace_stream = NULL;
+  Trace_file = Save_trace_file;
+  Save_trace_file.clear();
+}
+
 :(before "End Load Recipes")
 load(string(
 "recipe interactive [\n") +  // just a dummy version to initialize the Recipe_ordinal and so on
@@ -186,19 +206,10 @@ _CLEANUP_RUN_INTERACTIVE,
 Recipe_ordinal["$cleanup-run-interactive"] = _CLEANUP_RUN_INTERACTIVE;
 :(before "End Primitive Recipe Implementations")
 case _CLEANUP_RUN_INTERACTIVE: {
-  cleanup_run_interactive();
+  run_code_end();
   break;
 }
 
-:(code)
-void cleanup_run_interactive() {
-  Hide_warnings = false;
-  if (Trace_stream && Trace_stream->is_narrowly_collecting("warn")) {  // hack
-    delete Trace_stream;
-    Trace_stream = NULL;
-  }
-}
-
 :(scenario "run_interactive_returns_stringified_result")
 recipe main [
   # try to interactively add 2 and 2
@@ -323,6 +334,7 @@ void truncate(string& x) {
 
 //: simpler version of run-interactive: doesn't do any running, just loads
 //: recipes and reports warnings.
+
 :(before "End Primitive Recipe Declarations")
 RELOAD,
 :(before "End Primitive Recipe Numbers")
@@ -337,33 +349,35 @@ case RELOAD: {
     raise << current_recipe_name() << ": first ingredient of 'reload' should be a literal string, but got " << current_instruction().ingredients.at(0).original_string << '\n' << end();
     break;
   }
-  if (!Trace_stream) {
-    Trace_file = "";  // if there wasn't already a stream we don't want to save it
-    Trace_stream = new trace_stream;
-    Trace_stream->collect_layers.insert("warn");
-  }
-  Hide_warnings = true;
-  Disable_redefine_warnings = true;
   // clear any containers in advance
   for (long long int i = 0; i < SIZE(recently_added_types); ++i) {
     Type_ordinal.erase(Type[recently_added_types.at(i)].name);
     Type.erase(recently_added_types.at(i));
   }
   string code = read_mu_string(ingredients.at(0).at(0));
+  run_code_begin();
+  routine* save_current_routine = Current_routine;
+  Current_routine = NULL;
   vector<recipe_ordinal> recipes_reloaded = load(code);
   for (long long int i = 0; i < SIZE(recipes_reloaded); ++i) {
     Name.erase(recipes_reloaded.at(i));
   }
   transform_all();
   Trace_stream->newline();  // flush trace
-  Disable_redefine_warnings = false;
-  Hide_warnings = false;
+  Current_routine = save_current_routine;
   products.resize(1);
   products.at(0).push_back(trace_contents("warn"));
-  // hack: assume collect_layers isn't set anywhere else
-  if (Trace_stream->is_narrowly_collecting("warn")) {
-    delete Trace_stream;
-    Trace_stream = NULL;
-  }
+  run_code_end();  // wait until we're done with the trace contents
   break;
 }
+
+:(scenario reload_continues_past_warning)
+recipe main [
+  local-scope
+  x:address:array:character <- new [recipe foo [
+  get 1234:number, foo:offset
+]]
+  reload x
+  1:number/raw <- copy 34
+]
++mem: storing 34 in location 1