diff options
| author | Kartik Agaram <vc@akkartik.com> | 2019-03-03 08:20:15 -0800 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2019-03-03 09:53:32 -0800 |
| commit | 6bcdfa87a71c00a12a918a0f6e7dad814b6a087a (patch) | |
| tree | f1207f3339061e05ae0b66bc845349e449ebc530 | |
| parent | 065c01845bfc67ba8805cc02817c3de4c36f8cbd (diff) | |
| download | mu-6bcdfa87a71c00a12a918a0f6e7dad814b6a087a.tar.gz | |
4993
Fix CI after commit 4987. And track stack depths more correctly inside sandboxes.
| -rw-r--r-- | 029tools.cc | 5 | ||||
| -rw-r--r-- | 101run_sandboxed.cc | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/029tools.cc b/029tools.cc index 56ac861c..7c4a9a68 100644 --- a/029tools.cc +++ b/029tools.cc @@ -41,6 +41,9 @@ case TRACE: { //: simpler limited version of 'trace' +:(before "End Types") //: include in all cleaved compilation units +const int App_depth = 1; // where all Mu code will trace to by default + :(before "End Primitive Recipe Declarations") STASH, :(before "End Primitive Recipe Numbers") @@ -56,7 +59,7 @@ case STASH: { if (i) out << ' '; out << inspect(current_instruction().ingredients.at(i), ingredients.at(i)); } - trace(2, "app") << out.str() << end(); + trace(App_depth, "app") << out.str() << end(); break; } diff --git a/101run_sandboxed.cc b/101run_sandboxed.cc index 5a9db896..f054cd8b 100644 --- a/101run_sandboxed.cc +++ b/101run_sandboxed.cc @@ -150,9 +150,6 @@ map<string, type_tree*> Type_abbreviations_snapshot_stash; vector<scenario> Scenarios_snapshot_stash; set<string> Scenario_names_snapshot_stash; -:(before "End Types") //: include in all cleaved compilation units -const int App_depth = 1; // where all Mu code will trace to by default - :(code) void run_code_begin(bool should_stash_snapshots) { // stuff to undo later, in run_code_end() @@ -164,6 +161,7 @@ void run_code_begin(bool should_stash_snapshots) { stash_snapshots(); Save_trace_stream = Trace_stream; Save_callstack_depth = Callstack_depth; + Callstack_depth = Initial_callstack_depth; Trace_stream = new trace_stream; Trace_stream->collect_depth = App_depth; } @@ -178,6 +176,7 @@ void run_code_end() { //? fout.close(); delete Trace_stream; Trace_stream = Save_trace_stream; + Callstack_depth = Save_callstack_depth; Save_trace_stream = NULL; Save_trace_file.clear(); Save_callstack_depth = 0; |