diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2016-12-26 20:44:10 -0800 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2016-12-26 20:58:37 -0800 |
| commit | 201458e3bd2f1d79a0ea0b853552e9df267e92b1 (patch) | |
| tree | 0a4f13662cde7f92ae0bcf641c9733e2a0fcd6ef /html/101run_sandboxed.cc.html | |
| parent | e35c2d6857e1ed916221faae707e3c53ff8ed042 (diff) | |
| download | mu-201458e3bd2f1d79a0ea0b853552e9df267e92b1.tar.gz | |
3713 - cross-link calls with definitions in html
Diffstat (limited to 'html/101run_sandboxed.cc.html')
| -rw-r--r-- | html/101run_sandboxed.cc.html | 168 |
1 files changed, 84 insertions, 84 deletions
diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html index 8152a5e4..047418bf 100644 --- a/html/101run_sandboxed.cc.html +++ b/html/101run_sandboxed.cc.html @@ -62,7 +62,7 @@ if ('onhashchange' in window) { <span id="L2" class="LineNr"> 2 </span><span class="Comment">//: return some result in text form.</span> <span id="L3" class="LineNr"> 3 </span> <span id="L4" class="LineNr"> 4 </span><span class="Delimiter">:(scenario run_interactive_code)</span> -<span id="L5" class="LineNr"> 5 </span><span class="muRecipe">def</span> main [ +<span id="L5" class="LineNr"> 5 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L6" class="LineNr"> 6 </span> <span class="Constant">1</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">0</span> <span id="L7" class="LineNr"> 7 </span> <span class="Constant">2</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [<span class="Constant">1</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">34</span>] <span id="L8" class="LineNr"> 8 </span> run-sandboxed <span class="Constant">2</span>:text @@ -71,7 +71,7 @@ if ('onhashchange' in window) { <span id="L11" class="LineNr"> 11 </span><span class="traceContains">+mem: storing 34 in location 3</span> <span id="L12" class="LineNr"> 12 </span> <span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(scenario run_interactive_empty)</span> -<span id="L14" class="LineNr"> 14 </span><span class="muRecipe">def</span> main [ +<span id="L14" class="LineNr"> 14 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L15" class="LineNr"> 15 </span> <span class="Constant">1</span>:text<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe <span id="L16" class="LineNr"> 16 </span> <span class="Constant">2</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text <span id="L17" class="LineNr"> 17 </span>] @@ -85,7 +85,7 @@ if ('onhashchange' in window) { <span id="L25" class="LineNr"> 25 </span><span class="Comment">//: for starters, users can't override 'main' when the environment is running</span> <span id="L26" class="LineNr"> 26 </span><span class="Delimiter">:(before "End Load Recipe Name")</span> <span id="L27" class="LineNr"> 27 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Sandbox_mode && result<span class="Delimiter">.</span>name == <span class="Constant">"main"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L28" class="LineNr"> 28 </span> slurp_balanced_bracket<span class="Delimiter">(</span>in<span class="Delimiter">);</span> +<span id="L28" class="LineNr"> 28 </span> <a href='016dilated_reagent.cc.html#L57'>slurp_balanced_bracket</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L29" class="LineNr"> 29 </span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span> <span id="L30" class="LineNr"> 30 </span><span class="Delimiter">}</span> <span id="L31" class="LineNr"> 31 </span> @@ -97,30 +97,30 @@ if ('onhashchange' in window) { <span id="L37" class="LineNr"> 37 </span><span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> <span id="L38" class="LineNr"> 38 </span>RUN_SANDBOXED<span class="Delimiter">,</span> <span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(before "End Primitive Recipe Numbers")</span> -<span id="L40" class="LineNr"> 40 </span>put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"run-sandboxed"</span><span class="Delimiter">,</span> RUN_SANDBOXED<span class="Delimiter">);</span> +<span id="L40" class="LineNr"> 40 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"run-sandboxed"</span><span class="Delimiter">,</span> RUN_SANDBOXED<span class="Delimiter">);</span> <span id="L41" class="LineNr"> 41 </span><span class="Delimiter">:(before "End Primitive Recipe Checks")</span> <span id="L42" class="LineNr"> 42 </span><span class="Normal">case</span> RUN_SANDBOXED: <span class="Delimiter">{</span> -<span id="L43" class="LineNr"> 43 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L44" class="LineNr"> 44 </span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'run-sandboxed' requires exactly one ingredient, but got '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L43" class="LineNr"> 43 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L44" class="LineNr"> 44 </span> <a href='003trace.cc.html#L178'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'run-sandboxed' requires exactly one ingredient, but got '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span> <span id="L45" class="LineNr"> 45 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L46" class="LineNr"> 46 </span> <span class="Delimiter">}</span> <span id="L47" class="LineNr"> 47 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> -<span id="L48" class="LineNr"> 48 </span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of 'run-sandboxed' should be a string, but got '"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L48" class="LineNr"> 48 </span> <a href='003trace.cc.html#L178'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of 'run-sandboxed' should be a string, but got '"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span> <span id="L49" class="LineNr"> 49 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L50" class="LineNr"> 50 </span> <span class="Delimiter">}</span> <span id="L51" class="LineNr"> 51 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L52" class="LineNr"> 52 </span><span class="Delimiter">}</span> <span id="L53" class="LineNr"> 53 </span><span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span id="L54" class="LineNr"> 54 </span><span class="Normal">case</span> RUN_SANDBOXED: <span class="Delimiter">{</span> -<span id="L55" class="LineNr"> 55 </span> <span class="Normal">bool</span> new_code_pushed_to_stack = run_interactive<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> +<span id="L55" class="LineNr"> 55 </span> <span class="Normal">bool</span> new_code_pushed_to_stack = <a href='101run_sandboxed.cc.html#L90'>run_interactive</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> <span id="L56" class="LineNr"> 56 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!new_code_pushed_to_stack<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L57" class="LineNr"> 57 </span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">5</span><span class="Delimiter">);</span> <span id="L58" class="LineNr"> 58 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L59" class="LineNr"> 59 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>trace_error_contents<span class="Delimiter">());</span> +<span id="L59" class="LineNr"> 59 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L421'>trace_error_contents</a><span class="Delimiter">());</span> <span id="L60" class="LineNr"> 60 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L61" class="LineNr"> 61 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>trace_app_contents<span class="Delimiter">());</span> +<span id="L61" class="LineNr"> 61 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L435'>trace_app_contents</a><span class="Delimiter">());</span> <span id="L62" class="LineNr"> 62 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span class="Comment">// completed</span> -<span id="L63" class="LineNr"> 63 </span> run_code_end<span class="Delimiter">();</span> +<span id="L63" class="LineNr"> 63 </span> <a href='101run_sandboxed.cc.html#L151'>run_code_end</a><span class="Delimiter">();</span> <span id="L64" class="LineNr"> 64 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Comment">// done with this instruction</span> <span id="L65" class="LineNr"> 65 </span> <span class="Delimiter">}</span> <span id="L66" class="LineNr"> 66 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> @@ -147,7 +147,7 @@ if ('onhashchange' in window) { <span id="L87" class="LineNr"> 87 </span><span class="Comment">// reads a string, tries to call it as code (treating it as a test), saving</span> <span id="L88" class="LineNr"> 88 </span><span class="Comment">// all errors.</span> <span id="L89" class="LineNr"> 89 </span><span class="Comment">// returns true if successfully called (no errors found during load and transform)</span> -<span id="L90" class="LineNr"> 90 </span><span class="Normal">bool</span> run_interactive<span class="Delimiter">(</span><span class="Normal">int</span> address<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L90" class="LineNr"> 90 </span><span class="Normal">bool</span> <a href='101run_sandboxed.cc.html#L90'>run_interactive</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L76'>address</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L91" class="LineNr"> 91 </span> assert<span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"interactive"</span><span class="Delimiter">)</span> && get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"interactive"</span><span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">);</span> <span id="L92" class="LineNr"> 92 </span> <span class="Comment">// try to sandbox the run as best you can</span> <span id="L93" class="LineNr"> 93 </span> <span class="Comment">// todo: test this</span> @@ -155,9 +155,9 @@ if ('onhashchange' in window) { <span id="L95" class="LineNr"> 95 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">1</span><span class="Delimiter">;</span> i < Reserved_for_tests<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> <span id="L96" class="LineNr"> 96 </span> Memory<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L97" class="LineNr"> 97 </span> <span class="Delimiter">}</span> -<span id="L98" class="LineNr"> 98 </span> string command = trim<span class="Delimiter">(</span>strip_comments<span class="Delimiter">(</span>read_mu_text<span class="Delimiter">(</span>address<span class="Delimiter">)));</span> -<span id="L99" class="LineNr"> 99 </span> Name[get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"interactive"</span><span class="Delimiter">)</span>]<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L100" class="LineNr">100 </span> run_code_begin<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">should_stash_snapshots</span><span class="Comment">*/</span><span class="Constant">true</span><span class="Delimiter">);</span> +<span id="L98" class="LineNr"> 98 </span> string command = <a href='003trace.cc.html#L365'>trim</a><span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L400'>strip_comments</a><span class="Delimiter">(</span><a href='038new_text.cc.html#L143'>read_mu_text</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">)));</span> +<span id="L99" class="LineNr"> 99 </span> Name[get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"interactive"</span><span class="Delimiter">)</span>]<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> +<span id="L100" class="LineNr">100 </span> <a href='101run_sandboxed.cc.html#L140'>run_code_begin</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">should_stash_snapshots</span><span class="Comment">*/</span><span class="Constant">true</span><span class="Delimiter">);</span> <span id="L101" class="LineNr">101 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>command<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L102" class="LineNr">102 </span> <span class="Comment">// don't kill the current routine on parse errors</span> <span id="L103" class="LineNr">103 </span> routine* save_current_routine = Current_routine<span class="Delimiter">;</span> @@ -171,14 +171,14 @@ if ('onhashchange' in window) { <span id="L111" class="LineNr">111 </span> <span class="Constant">"$stop-tracking-products</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span id="L112" class="LineNr">112 </span> <span class="Constant">"return screen</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span id="L113" class="LineNr">113 </span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> -<span id="L114" class="LineNr">114 </span> transform_all<span class="Delimiter">();</span> +<span id="L114" class="LineNr">114 </span> <a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span> <span id="L115" class="LineNr">115 </span> Current_routine = save_current_routine<span class="Delimiter">;</span> <span id="L116" class="LineNr">116 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">"error"</span><span class="Delimiter">)</span> > <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L117" class="LineNr">117 </span> <span class="Comment">// now call 'sandbox' which will run 'interactive' in a separate routine,</span> <span id="L118" class="LineNr">118 </span> <span class="Comment">// and wait for it</span> <span id="L119" class="LineNr">119 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L120" class="LineNr">120 </span> ++Save_trace_stream<span class="Delimiter">-></span>callstack_depth<span class="Delimiter">;</span> -<span id="L121" class="LineNr">121 </span> trace<span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"trace"</span><span class="Delimiter">)</span> << <span class="Constant">"run-sandboxed: incrementing callstack depth to "</span> << Save_trace_stream<span class="Delimiter">-></span>callstack_depth << end<span class="Delimiter">();</span> +<span id="L121" class="LineNr">121 </span> <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"trace"</span><span class="Delimiter">)</span> << <span class="Constant">"run-sandboxed: incrementing callstack depth to "</span> << Save_trace_stream<span class="Delimiter">-></span>callstack_depth << <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span> <span id="L122" class="LineNr">122 </span> assert<span class="Delimiter">(</span>Save_trace_stream<span class="Delimiter">-></span>callstack_depth < <span class="Constant">9000</span><span class="Delimiter">);</span> <span class="Comment">// 9998-101 plus cushion</span> <span id="L123" class="LineNr">123 </span> <span class="Delimiter">}</span> <span id="L124" class="LineNr">124 </span> Current_routine<span class="Delimiter">-></span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>call<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"sandbox"</span><span class="Delimiter">)));</span> @@ -197,18 +197,18 @@ if ('onhashchange' in window) { <span id="L137" class="LineNr">137 </span>map<string<span class="Delimiter">,</span> type_tree*> Type_abbreviations_snapshot_stash<span class="Delimiter">;</span> <span id="L138" class="LineNr">138 </span> <span id="L139" class="LineNr">139 </span><span class="Delimiter">:(code)</span> -<span id="L140" class="LineNr">140 </span><span class="Normal">void</span> run_code_begin<span class="Delimiter">(</span><span class="Normal">bool</span> should_stash_snapshots<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L140" class="LineNr">140 </span><span class="Normal">void</span> <a href='101run_sandboxed.cc.html#L140'>run_code_begin</a><span class="Delimiter">(</span><span class="Normal">bool</span> should_stash_snapshots<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L141" class="LineNr">141 </span> <span class="Comment">// stuff to undo later, in run_code_end()</span> <span id="L142" class="LineNr">142 </span> Hide_errors = <span class="Constant">true</span><span class="Delimiter">;</span> <span id="L143" class="LineNr">143 </span> Disable_redefine_checks = <span class="Constant">true</span><span class="Delimiter">;</span> <span id="L144" class="LineNr">144 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>should_stash_snapshots<span class="Delimiter">)</span> -<span id="L145" class="LineNr">145 </span> stash_snapshots<span class="Delimiter">();</span> +<span id="L145" class="LineNr">145 </span> <a href='101run_sandboxed.cc.html#L167'>stash_snapshots</a><span class="Delimiter">();</span> <span id="L146" class="LineNr">146 </span> Save_trace_stream = Trace_stream<span class="Delimiter">;</span> <span id="L147" class="LineNr">147 </span> Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span id="L148" class="LineNr">148 </span> Trace_stream<span class="Delimiter">-></span>collect_depth = App_depth<span class="Delimiter">;</span> <span id="L149" class="LineNr">149 </span><span class="Delimiter">}</span> <span id="L150" class="LineNr">150 </span> -<span id="L151" class="LineNr">151 </span><span class="Normal">void</span> run_code_end<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L151" class="LineNr">151 </span><span class="Normal">void</span> <a href='101run_sandboxed.cc.html#L151'>run_code_end</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L152" class="LineNr">152 </span> Hide_errors = <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L153" class="LineNr">153 </span> Disable_redefine_checks = <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L154" class="LineNr">154 </span><span class="CommentedCode">//? ofstream fout("sandbox.log");</span> @@ -217,14 +217,14 @@ if ('onhashchange' in window) { <span id="L157" class="LineNr">157 </span> <span class="Normal">delete</span> Trace_stream<span class="Delimiter">;</span> <span id="L158" class="LineNr">158 </span> Trace_stream = Save_trace_stream<span class="Delimiter">;</span> <span id="L159" class="LineNr">159 </span> Save_trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span> -<span id="L160" class="LineNr">160 </span> Save_trace_file<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> +<span id="L160" class="LineNr">160 </span> Save_trace_file<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> <span id="L161" class="LineNr">161 </span> Recipe<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"interactive"</span><span class="Delimiter">));</span> <span class="Comment">// keep past sandboxes from inserting errors</span> <span id="L162" class="LineNr">162 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Recipe_snapshot_stash<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> -<span id="L163" class="LineNr">163 </span> unstash_snapshots<span class="Delimiter">();</span> +<span id="L163" class="LineNr">163 </span> <a href='101run_sandboxed.cc.html#L184'>unstash_snapshots</a><span class="Delimiter">();</span> <span id="L164" class="LineNr">164 </span><span class="Delimiter">}</span> <span id="L165" class="LineNr">165 </span> <span id="L166" class="LineNr">166 </span><span class="Comment">// keep sync'd with save_snapshots and restore_snapshots</span> -<span id="L167" class="LineNr">167 </span><span class="Normal">void</span> stash_snapshots<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L167" class="LineNr">167 </span><span class="Normal">void</span> <a href='101run_sandboxed.cc.html#L167'>stash_snapshots</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L168" class="LineNr">168 </span> assert<span class="Delimiter">(</span>Recipe_ordinal_snapshot_stash<span class="Delimiter">.</span>empty<span class="Delimiter">());</span> <span id="L169" class="LineNr">169 </span> Recipe_ordinal_snapshot_stash = Recipe_ordinal_snapshot<span class="Delimiter">;</span> <span id="L170" class="LineNr">170 </span> assert<span class="Delimiter">(</span>Recipe_snapshot_stash<span class="Delimiter">.</span>empty<span class="Delimiter">());</span> @@ -241,15 +241,15 @@ if ('onhashchange' in window) { <span id="L181" class="LineNr">181 </span> Type_abbreviations_snapshot_stash = Type_abbreviations_snapshot<span class="Delimiter">;</span> <span id="L182" class="LineNr">182 </span> save_snapshots<span class="Delimiter">();</span> <span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span> -<span id="L184" class="LineNr">184 </span><span class="Normal">void</span> unstash_snapshots<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L184" class="LineNr">184 </span><span class="Normal">void</span> <a href='101run_sandboxed.cc.html#L184'>unstash_snapshots</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L185" class="LineNr">185 </span> restore_snapshots<span class="Delimiter">();</span> -<span id="L186" class="LineNr">186 </span> Recipe_ordinal_snapshot = Recipe_ordinal_snapshot_stash<span class="Delimiter">;</span> Recipe_ordinal_snapshot_stash<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L187" class="LineNr">187 </span> Recipe_snapshot = Recipe_snapshot_stash<span class="Delimiter">;</span> Recipe_snapshot_stash<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L188" class="LineNr">188 </span> Type_ordinal_snapshot = Type_ordinal_snapshot_stash<span class="Delimiter">;</span> Type_ordinal_snapshot_stash<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L189" class="LineNr">189 </span> Type_snapshot = Type_snapshot_stash<span class="Delimiter">;</span> Type_snapshot_stash<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L190" class="LineNr">190 </span> Name_snapshot = Name_snapshot_stash<span class="Delimiter">;</span> Name_snapshot_stash<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L191" class="LineNr">191 </span> Recipe_variants_snapshot = Recipe_variants_snapshot_stash<span class="Delimiter">;</span> Recipe_variants_snapshot_stash<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L192" class="LineNr">192 </span> Type_abbreviations_snapshot = Type_abbreviations_snapshot_stash<span class="Delimiter">;</span> Type_abbreviations_snapshot_stash<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> +<span id="L186" class="LineNr">186 </span> Recipe_ordinal_snapshot = Recipe_ordinal_snapshot_stash<span class="Delimiter">;</span> Recipe_ordinal_snapshot_stash<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> +<span id="L187" class="LineNr">187 </span> Recipe_snapshot = Recipe_snapshot_stash<span class="Delimiter">;</span> Recipe_snapshot_stash<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> +<span id="L188" class="LineNr">188 </span> Type_ordinal_snapshot = Type_ordinal_snapshot_stash<span class="Delimiter">;</span> Type_ordinal_snapshot_stash<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> +<span id="L189" class="LineNr">189 </span> Type_snapshot = Type_snapshot_stash<span class="Delimiter">;</span> Type_snapshot_stash<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> +<span id="L190" class="LineNr">190 </span> Name_snapshot = Name_snapshot_stash<span class="Delimiter">;</span> Name_snapshot_stash<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> +<span id="L191" class="LineNr">191 </span> Recipe_variants_snapshot = Recipe_variants_snapshot_stash<span class="Delimiter">;</span> Recipe_variants_snapshot_stash<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> +<span id="L192" class="LineNr">192 </span> Type_abbreviations_snapshot = Type_abbreviations_snapshot_stash<span class="Delimiter">;</span> Type_abbreviations_snapshot_stash<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> <span id="L193" class="LineNr">193 </span><span class="Delimiter">}</span> <span id="L194" class="LineNr">194 </span> <span id="L195" class="LineNr">195 </span><span class="Delimiter">:(before "End Load Recipes")</span> @@ -278,7 +278,7 @@ if ('onhashchange' in window) { <span id="L218" class="LineNr">218 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">"interactive"</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L219" class="LineNr">219 </span> <span id="L220" class="LineNr">220 </span><span class="Delimiter">:(scenario run_interactive_comments)</span> -<span id="L221" class="LineNr">221 </span><span class="muRecipe">def</span> main [ +<span id="L221" class="LineNr">221 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L222" class="LineNr">222 </span> <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [<span class="Comment"># ab</span> <span id="L223" class="LineNr">223 </span>add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span>] <span id="L224" class="LineNr">224 </span> <span class="Constant">2</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text @@ -289,7 +289,7 @@ if ('onhashchange' in window) { <span id="L229" class="LineNr">229 </span><span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> <span id="L230" class="LineNr">230 </span>_START_TRACKING_PRODUCTS<span class="Delimiter">,</span> <span id="L231" class="LineNr">231 </span><span class="Delimiter">:(before "End Primitive Recipe Numbers")</span> -<span id="L232" class="LineNr">232 </span>put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"$start-tracking-products"</span><span class="Delimiter">,</span> _START_TRACKING_PRODUCTS<span class="Delimiter">);</span> +<span id="L232" class="LineNr">232 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"$start-tracking-products"</span><span class="Delimiter">,</span> _START_TRACKING_PRODUCTS<span class="Delimiter">);</span> <span id="L233" class="LineNr">233 </span><span class="Delimiter">:(before "End Primitive Recipe Checks")</span> <span id="L234" class="LineNr">234 </span><span class="Normal">case</span> _START_TRACKING_PRODUCTS: <span class="Delimiter">{</span> <span id="L235" class="LineNr">235 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> @@ -303,7 +303,7 @@ if ('onhashchange' in window) { <span id="L243" class="LineNr">243 </span><span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> <span id="L244" class="LineNr">244 </span>_STOP_TRACKING_PRODUCTS<span class="Delimiter">,</span> <span id="L245" class="LineNr">245 </span><span class="Delimiter">:(before "End Primitive Recipe Numbers")</span> -<span id="L246" class="LineNr">246 </span>put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"$stop-tracking-products"</span><span class="Delimiter">,</span> _STOP_TRACKING_PRODUCTS<span class="Delimiter">);</span> +<span id="L246" class="LineNr">246 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"$stop-tracking-products"</span><span class="Delimiter">,</span> _STOP_TRACKING_PRODUCTS<span class="Delimiter">);</span> <span id="L247" class="LineNr">247 </span><span class="Delimiter">:(before "End Primitive Recipe Checks")</span> <span id="L248" class="LineNr">248 </span><span class="Normal">case</span> _STOP_TRACKING_PRODUCTS: <span class="Delimiter">{</span> <span id="L249" class="LineNr">249 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> @@ -317,7 +317,7 @@ if ('onhashchange' in window) { <span id="L257" class="LineNr">257 </span><span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> <span id="L258" class="LineNr">258 </span>_MOST_RECENT_PRODUCTS<span class="Delimiter">,</span> <span id="L259" class="LineNr">259 </span><span class="Delimiter">:(before "End Primitive Recipe Numbers")</span> -<span id="L260" class="LineNr">260 </span>put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"$most-recent-products"</span><span class="Delimiter">,</span> _MOST_RECENT_PRODUCTS<span class="Delimiter">);</span> +<span id="L260" class="LineNr">260 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"$most-recent-products"</span><span class="Delimiter">,</span> _MOST_RECENT_PRODUCTS<span class="Delimiter">);</span> <span id="L261" class="LineNr">261 </span><span class="Delimiter">:(before "End Primitive Recipe Checks")</span> <span id="L262" class="LineNr">262 </span><span class="Normal">case</span> _MOST_RECENT_PRODUCTS: <span class="Delimiter">{</span> <span id="L263" class="LineNr">263 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> @@ -325,14 +325,14 @@ if ('onhashchange' in window) { <span id="L265" class="LineNr">265 </span><span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span id="L266" class="LineNr">266 </span><span class="Normal">case</span> _MOST_RECENT_PRODUCTS: <span class="Delimiter">{</span> <span id="L267" class="LineNr">267 </span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> -<span id="L268" class="LineNr">268 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>new_mu_text<span class="Delimiter">(</span>Most_recent_products<span class="Delimiter">));</span> +<span id="L268" class="LineNr">268 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span>Most_recent_products<span class="Delimiter">));</span> <span id="L269" class="LineNr">269 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L270" class="LineNr">270 </span><span class="Delimiter">}</span> <span id="L271" class="LineNr">271 </span> <span id="L272" class="LineNr">272 </span><span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> <span id="L273" class="LineNr">273 </span>SAVE_ERRORS<span class="Delimiter">,</span> <span id="L274" class="LineNr">274 </span><span class="Delimiter">:(before "End Primitive Recipe Numbers")</span> -<span id="L275" class="LineNr">275 </span>put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"save-errors"</span><span class="Delimiter">,</span> SAVE_ERRORS<span class="Delimiter">);</span> +<span id="L275" class="LineNr">275 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"save-errors"</span><span class="Delimiter">,</span> SAVE_ERRORS<span class="Delimiter">);</span> <span id="L276" class="LineNr">276 </span><span class="Delimiter">:(before "End Primitive Recipe Checks")</span> <span id="L277" class="LineNr">277 </span><span class="Normal">case</span> SAVE_ERRORS: <span class="Delimiter">{</span> <span id="L278" class="LineNr">278 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> @@ -340,14 +340,14 @@ if ('onhashchange' in window) { <span id="L280" class="LineNr">280 </span><span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span id="L281" class="LineNr">281 </span><span class="Normal">case</span> SAVE_ERRORS: <span class="Delimiter">{</span> <span id="L282" class="LineNr">282 </span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> -<span id="L283" class="LineNr">283 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>trace_error_contents<span class="Delimiter">());</span> +<span id="L283" class="LineNr">283 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L421'>trace_error_contents</a><span class="Delimiter">());</span> <span id="L284" class="LineNr">284 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L285" class="LineNr">285 </span><span class="Delimiter">}</span> <span id="L286" class="LineNr">286 </span> <span id="L287" class="LineNr">287 </span><span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> <span id="L288" class="LineNr">288 </span>SAVE_APP_TRACE<span class="Delimiter">,</span> <span id="L289" class="LineNr">289 </span><span class="Delimiter">:(before "End Primitive Recipe Numbers")</span> -<span id="L290" class="LineNr">290 </span>put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"save-app-trace"</span><span class="Delimiter">,</span> SAVE_APP_TRACE<span class="Delimiter">);</span> +<span id="L290" class="LineNr">290 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"save-app-trace"</span><span class="Delimiter">,</span> SAVE_APP_TRACE<span class="Delimiter">);</span> <span id="L291" class="LineNr">291 </span><span class="Delimiter">:(before "End Primitive Recipe Checks")</span> <span id="L292" class="LineNr">292 </span><span class="Normal">case</span> SAVE_APP_TRACE: <span class="Delimiter">{</span> <span id="L293" class="LineNr">293 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> @@ -355,26 +355,26 @@ if ('onhashchange' in window) { <span id="L295" class="LineNr">295 </span><span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span id="L296" class="LineNr">296 </span><span class="Normal">case</span> SAVE_APP_TRACE: <span class="Delimiter">{</span> <span id="L297" class="LineNr">297 </span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> -<span id="L298" class="LineNr">298 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>trace_app_contents<span class="Delimiter">());</span> +<span id="L298" class="LineNr">298 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L435'>trace_app_contents</a><span class="Delimiter">());</span> <span id="L299" class="LineNr">299 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L300" class="LineNr">300 </span><span class="Delimiter">}</span> <span id="L301" class="LineNr">301 </span> <span id="L302" class="LineNr">302 </span><span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> <span id="L303" class="LineNr">303 </span>_CLEANUP_RUN_SANDBOXED<span class="Delimiter">,</span> <span id="L304" class="LineNr">304 </span><span class="Delimiter">:(before "End Primitive Recipe Numbers")</span> -<span id="L305" class="LineNr">305 </span>put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"$cleanup-run-sandboxed"</span><span class="Delimiter">,</span> _CLEANUP_RUN_SANDBOXED<span class="Delimiter">);</span> +<span id="L305" class="LineNr">305 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"$cleanup-run-sandboxed"</span><span class="Delimiter">,</span> _CLEANUP_RUN_SANDBOXED<span class="Delimiter">);</span> <span id="L306" class="LineNr">306 </span><span class="Delimiter">:(before "End Primitive Recipe Checks")</span> <span id="L307" class="LineNr">307 </span><span class="Normal">case</span> _CLEANUP_RUN_SANDBOXED: <span class="Delimiter">{</span> <span id="L308" class="LineNr">308 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L309" class="LineNr">309 </span><span class="Delimiter">}</span> <span id="L310" class="LineNr">310 </span><span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span id="L311" class="LineNr">311 </span><span class="Normal">case</span> _CLEANUP_RUN_SANDBOXED: <span class="Delimiter">{</span> -<span id="L312" class="LineNr">312 </span> run_code_end<span class="Delimiter">();</span> +<span id="L312" class="LineNr">312 </span> <a href='101run_sandboxed.cc.html#L151'>run_code_end</a><span class="Delimiter">();</span> <span id="L313" class="LineNr">313 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L314" class="LineNr">314 </span><span class="Delimiter">}</span> <span id="L315" class="LineNr">315 </span> <span id="L316" class="LineNr">316 </span><span class="Delimiter">:(scenario "run_interactive_converts_result_to_text")</span> -<span id="L317" class="LineNr">317 </span><span class="muRecipe">def</span> main [ +<span id="L317" class="LineNr">317 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L318" class="LineNr">318 </span> <span class="Comment"># try to interactively add 2 and 2</span> <span id="L319" class="LineNr">319 </span> <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span>] <span id="L320" class="LineNr">320 </span> <span class="Constant">2</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text @@ -384,7 +384,7 @@ if ('onhashchange' in window) { <span id="L324" class="LineNr">324 </span><span class="traceContains">+mem: storing 52 in location 11</span> <span id="L325" class="LineNr">325 </span> <span id="L326" class="LineNr">326 </span><span class="Delimiter">:(scenario "run_interactive_returns_text")</span> -<span id="L327" class="LineNr">327 </span><span class="muRecipe">def</span> main [ +<span id="L327" class="LineNr">327 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L328" class="LineNr">328 </span> <span class="Comment"># try to interactively add 2 and 2</span> <span id="L329" class="LineNr">329 </span> <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [ <span id="L330" class="LineNr">330 </span> <span class="Normal">x</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [a] @@ -399,7 +399,7 @@ if ('onhashchange' in window) { <span id="L339" class="LineNr">339 </span><span class="traceContains">+mem: storing 98 in location 12</span> <span id="L340" class="LineNr">340 </span> <span id="L341" class="LineNr">341 </span><span class="Delimiter">:(scenario "run_interactive_returns_errors")</span> -<span id="L342" class="LineNr">342 </span><span class="muRecipe">def</span> main [ +<span id="L342" class="LineNr">342 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L343" class="LineNr">343 </span> <span class="Comment"># run a command that generates an error</span> <span id="L344" class="LineNr">344 </span> <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [x:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span id="L345" class="LineNr">345 </span>get x:num<span class="Delimiter">,</span> <span class="Constant">foo:offset</span>] @@ -414,7 +414,7 @@ if ('onhashchange' in window) { <span id="L354" class="LineNr">354 </span><span class="Comment"># ...</span> <span id="L355" class="LineNr">355 </span> <span id="L356" class="LineNr">356 </span><span class="Delimiter">:(scenario run_interactive_with_comment)</span> -<span id="L357" class="LineNr">357 </span><span class="muRecipe">def</span> main [ +<span id="L357" class="LineNr">357 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L358" class="LineNr">358 </span> <span class="Comment"># 2 instructions, with a comment after the first</span> <span id="L359" class="LineNr">359 </span> <span class="Constant">1</span>:&:@:num<span class="Special"> <- </span><span class="Normal">new</span> [a:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># abc</span> <span id="L360" class="LineNr">360 </span><span class="Normal">b</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> @@ -426,12 +426,12 @@ if ('onhashchange' in window) { <span id="L366" class="LineNr">366 </span> <span id="L367" class="LineNr">367 </span><span class="Delimiter">:(before "End Running One Instruction")</span> <span id="L368" class="LineNr">368 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Track_most_recent_products<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L369" class="LineNr">369 </span> track_most_recent_products<span class="Delimiter">(</span>current_instruction<span class="Delimiter">(),</span> products<span class="Delimiter">);</span> +<span id="L369" class="LineNr">369 </span> <a href='101run_sandboxed.cc.html#L372'>track_most_recent_products</a><span class="Delimiter">(</span>current_instruction<span class="Delimiter">(),</span> products<span class="Delimiter">);</span> <span id="L370" class="LineNr">370 </span><span class="Delimiter">}</span> <span id="L371" class="LineNr">371 </span><span class="Delimiter">:(code)</span> -<span id="L372" class="LineNr">372 </span><span class="Normal">void</span> track_most_recent_products<span class="Delimiter">(</span><span class="Normal">const</span> instruction& instruction<span class="Delimiter">,</span> <span class="Normal">const</span> vector<vector<<span class="Normal">double</span>> >& products<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L372" class="LineNr">372 </span><span class="Normal">void</span> <a href='101run_sandboxed.cc.html#L372'>track_most_recent_products</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction& <a href='010vm.cc.html#L32'>instruction</a><span class="Delimiter">,</span> <span class="Normal">const</span> vector<vector<<span class="Normal">double</span>> >& products<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L373" class="LineNr">373 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L374" class="LineNr">374 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>products<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L374" class="LineNr">374 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L375" class="LineNr">375 </span> <span class="Comment">// A sandbox can print a string result, but only if it is actually saved</span> <span id="L376" class="LineNr">376 </span> <span class="Comment">// to a variable in the sandbox, because otherwise the results are</span> <span id="L377" class="LineNr">377 </span> <span class="Comment">// reclaimed before the sandbox sees them. So you get these interactions</span> @@ -442,14 +442,14 @@ if ('onhashchange' in window) { <span id="L382" class="LineNr">382 </span> <span class="Comment">//</span> <span id="L383" class="LineNr">383 </span> <span class="Comment">// x:text <- new [abc]</span> <span id="L384" class="LineNr">384 </span> <span class="Comment">// => abc</span> -<span id="L385" class="LineNr">385 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i < SIZE<span class="Delimiter">(</span>instruction<span class="Delimiter">.</span>products<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L386" class="LineNr">386 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_text<span class="Delimiter">(</span>instruction<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span> +<span id="L385" class="LineNr">385 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i < <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span><a href='010vm.cc.html#L32'>instruction</a><span class="Delimiter">.</span>products<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L386" class="LineNr">386 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='027call_ingredient.cc.html#L174'>is_mu_text</a><span class="Delimiter">(</span><a href='010vm.cc.html#L32'>instruction</a><span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span> <span id="L387" class="LineNr">387 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!scalar<span class="Delimiter">(</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// error handled elsewhere</span> -<span id="L388" class="LineNr">388 </span> out << read_mu_text<span class="Delimiter">(</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L388" class="LineNr">388 </span> out << <a href='038new_text.cc.html#L143'>read_mu_text</a><span class="Delimiter">(</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L389" class="LineNr">389 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L390" class="LineNr">390 </span> <span class="Delimiter">}</span> <span id="L391" class="LineNr">391 </span> <span class="Delimiter">}</span> -<span id="L392" class="LineNr">392 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> ++j<span class="Delimiter">)</span> +<span id="L392" class="LineNr">392 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> ++j<span class="Delimiter">)</span> <span id="L393" class="LineNr">393 </span> out << no_scientific<span class="Delimiter">(</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>at<span class="Delimiter">(</span>j<span class="Delimiter">))</span> << <span class="Constant">' '</span><span class="Delimiter">;</span> <span id="L394" class="LineNr">394 </span> out << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L395" class="LineNr">395 </span> <span class="Delimiter">}</span> @@ -457,57 +457,57 @@ if ('onhashchange' in window) { <span id="L397" class="LineNr">397 </span><span class="Delimiter">}</span> <span id="L398" class="LineNr">398 </span> <span id="L399" class="LineNr">399 </span><span class="Delimiter">:(code)</span> -<span id="L400" class="LineNr">400 </span>string strip_comments<span class="Delimiter">(</span>string in<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L400" class="LineNr">400 </span>string <a href='101run_sandboxed.cc.html#L400'>strip_comments</a><span class="Delimiter">(</span>string in<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L401" class="LineNr">401 </span> ostringstream result<span class="Delimiter">;</span> -<span id="L402" class="LineNr">402 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>in<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L402" class="LineNr">402 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L403" class="LineNr">403 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> != <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L404" class="LineNr">404 </span> result << in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L405" class="LineNr">405 </span> <span class="Delimiter">}</span> <span id="L406" class="LineNr">406 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L407" class="LineNr">407 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>i+<span class="Constant">1</span> < SIZE<span class="Delimiter">(</span>in<span class="Delimiter">)</span> && in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i+<span class="Constant">1</span><span class="Delimiter">)</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> +<span id="L407" class="LineNr">407 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>i+<span class="Constant">1</span> < <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> && in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i+<span class="Constant">1</span><span class="Delimiter">)</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span id="L408" class="LineNr">408 </span> ++i<span class="Delimiter">;</span> <span id="L409" class="LineNr">409 </span> <span class="Delimiter">}</span> <span id="L410" class="LineNr">410 </span> <span class="Delimiter">}</span> <span id="L411" class="LineNr">411 </span> <span class="Identifier">return</span> result<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L412" class="LineNr">412 </span><span class="Delimiter">}</span> <span id="L413" class="LineNr">413 </span> -<span id="L414" class="LineNr">414 </span><span class="Normal">int</span> stringified_value_of_location<span class="Delimiter">(</span><span class="Normal">int</span> address<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L414" class="LineNr">414 </span><span class="Normal">int</span> <a href='101run_sandboxed.cc.html#L414'>stringified_value_of_location</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L76'>address</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L415" class="LineNr">415 </span> <span class="Comment">// convert to string</span> <span id="L416" class="LineNr">416 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L417" class="LineNr">417 </span> out << no_scientific<span class="Delimiter">(</span>get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">));</span> -<span id="L418" class="LineNr">418 </span> <span class="Identifier">return</span> new_mu_text<span class="Delimiter">(</span>out<span class="Delimiter">.</span>str<span class="Delimiter">());</span> +<span id="L417" class="LineNr">417 </span> out << no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L76'>address</a><span class="Delimiter">));</span> +<span id="L418" class="LineNr">418 </span> <span class="Identifier">return</span> <a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span>str<span class="Delimiter">());</span> <span id="L419" class="LineNr">419 </span><span class="Delimiter">}</span> <span id="L420" class="LineNr">420 </span> -<span id="L421" class="LineNr">421 </span><span class="Normal">int</span> trace_error_contents<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L421" class="LineNr">421 </span><span class="Normal">int</span> <a href='101run_sandboxed.cc.html#L421'>trace_error_contents</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L422" class="LineNr">422 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L423" class="LineNr">423 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L424" class="LineNr">424 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L424" class="LineNr">424 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L425" class="LineNr">425 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-></span>label != <span class="Constant">"error"</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L426" class="LineNr">426 </span> out << p<span class="Delimiter">-></span>contents<span class="Delimiter">;</span> -<span id="L427" class="LineNr">427 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>*--p<span class="Delimiter">-></span>contents<span class="Delimiter">.</span>end<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> out << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L427" class="LineNr">427 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>*--p<span class="Delimiter">-></span>contents<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> out << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L428" class="LineNr">428 </span> <span class="Delimiter">}</span> <span id="L429" class="LineNr">429 </span> string result = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> -<span id="L430" class="LineNr">430 </span> truncate<span class="Delimiter">(</span>result<span class="Delimiter">);</span> +<span id="L430" class="LineNr">430 </span> <a href='101run_sandboxed.cc.html#L449'>truncate</a><span class="Delimiter">(</span>result<span class="Delimiter">);</span> <span id="L431" class="LineNr">431 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L432" class="LineNr">432 </span> <span class="Identifier">return</span> new_mu_text<span class="Delimiter">(</span>result<span class="Delimiter">);</span> +<span id="L432" class="LineNr">432 </span> <span class="Identifier">return</span> <a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span>result<span class="Delimiter">);</span> <span id="L433" class="LineNr">433 </span><span class="Delimiter">}</span> <span id="L434" class="LineNr">434 </span> -<span id="L435" class="LineNr">435 </span><span class="Normal">int</span> trace_app_contents<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L435" class="LineNr">435 </span><span class="Normal">int</span> <a href='101run_sandboxed.cc.html#L435'>trace_app_contents</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L436" class="LineNr">436 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L437" class="LineNr">437 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L438" class="LineNr">438 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L438" class="LineNr">438 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L439" class="LineNr">439 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-></span>depth != App_depth<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L440" class="LineNr">440 </span> out << p<span class="Delimiter">-></span>contents<span class="Delimiter">;</span> -<span id="L441" class="LineNr">441 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>*--p<span class="Delimiter">-></span>contents<span class="Delimiter">.</span>end<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> out << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L441" class="LineNr">441 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>*--p<span class="Delimiter">-></span>contents<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> out << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L442" class="LineNr">442 </span> <span class="Delimiter">}</span> <span id="L443" class="LineNr">443 </span> string result = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L444" class="LineNr">444 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L445" class="LineNr">445 </span> truncate<span class="Delimiter">(</span>result<span class="Delimiter">);</span> -<span id="L446" class="LineNr">446 </span> <span class="Identifier">return</span> new_mu_text<span class="Delimiter">(</span>result<span class="Delimiter">);</span> +<span id="L445" class="LineNr">445 </span> <a href='101run_sandboxed.cc.html#L449'>truncate</a><span class="Delimiter">(</span>result<span class="Delimiter">);</span> +<span id="L446" class="LineNr">446 </span> <span class="Identifier">return</span> <a href='038new_text.cc.html#L38'>new_mu_text</a><span class="Delimiter">(</span>result<span class="Delimiter">);</span> <span id="L447" class="LineNr">447 </span><span class="Delimiter">}</span> <span id="L448" class="LineNr">448 </span> -<span id="L449" class="LineNr">449 </span><span class="Normal">void</span> truncate<span class="Delimiter">(</span>string& x<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L450" class="LineNr">450 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>x<span class="Delimiter">)</span> > <span class="Constant">1024</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L449" class="LineNr">449 </span><span class="Normal">void</span> <a href='101run_sandboxed.cc.html#L449'>truncate</a><span class="Delimiter">(</span>string& x<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L450" class="LineNr">450 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> > <span class="Constant">1024</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L451" class="LineNr">451 </span> x<span class="Delimiter">.</span>erase<span class="Delimiter">(</span><span class="Constant">1024</span><span class="Delimiter">);</span> <span id="L452" class="LineNr">452 </span> *x<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> = <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L453" class="LineNr">453 </span> *++x<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> = <span class="Constant">'.'</span><span class="Delimiter">;</span> @@ -521,15 +521,15 @@ if ('onhashchange' in window) { <span id="L461" class="LineNr">461 </span><span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> <span id="L462" class="LineNr">462 </span>RELOAD<span class="Delimiter">,</span> <span id="L463" class="LineNr">463 </span><span class="Delimiter">:(before "End Primitive Recipe Numbers")</span> -<span id="L464" class="LineNr">464 </span>put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"reload"</span><span class="Delimiter">,</span> RELOAD<span class="Delimiter">);</span> +<span id="L464" class="LineNr">464 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"reload"</span><span class="Delimiter">,</span> RELOAD<span class="Delimiter">);</span> <span id="L465" class="LineNr">465 </span><span class="Delimiter">:(before "End Primitive Recipe Checks")</span> <span id="L466" class="LineNr">466 </span><span class="Normal">case</span> RELOAD: <span class="Delimiter">{</span> -<span id="L467" class="LineNr">467 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L468" class="LineNr">468 </span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'reload' requires exactly one ingredient, but got '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L467" class="LineNr">467 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L468" class="LineNr">468 </span> <a href='003trace.cc.html#L178'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'reload' requires exactly one ingredient, but got '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span> <span id="L469" class="LineNr">469 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L470" class="LineNr">470 </span> <span class="Delimiter">}</span> <span id="L471" class="LineNr">471 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> -<span id="L472" class="LineNr">472 </span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of 'reload' should be a string, but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L472" class="LineNr">472 </span> <a href='003trace.cc.html#L178'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of 'reload' should be a string, but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span> <span id="L473" class="LineNr">473 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L474" class="LineNr">474 </span> <span class="Delimiter">}</span> <span id="L475" class="LineNr">475 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> @@ -537,24 +537,24 @@ if ('onhashchange' in window) { <span id="L477" class="LineNr">477 </span><span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span id="L478" class="LineNr">478 </span><span class="Normal">case</span> RELOAD: <span class="Delimiter">{</span> <span id="L479" class="LineNr">479 </span> restore_non_recipe_snapshots<span class="Delimiter">();</span> -<span id="L480" class="LineNr">480 </span> string code = read_mu_text<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> -<span id="L481" class="LineNr">481 </span> run_code_begin<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">should_stash_snapshots</span><span class="Comment">*/</span><span class="Constant">false</span><span class="Delimiter">);</span> +<span id="L480" class="LineNr">480 </span> string code = <a href='038new_text.cc.html#L143'>read_mu_text</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> +<span id="L481" class="LineNr">481 </span> <a href='101run_sandboxed.cc.html#L140'>run_code_begin</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">should_stash_snapshots</span><span class="Comment">*/</span><span class="Constant">false</span><span class="Delimiter">);</span> <span id="L482" class="LineNr">482 </span> routine* save_current_routine = Current_routine<span class="Delimiter">;</span> <span id="L483" class="LineNr">483 </span> Current_routine = <span class="Constant">NULL</span><span class="Delimiter">;</span> <span id="L484" class="LineNr">484 </span> Sandbox_mode = <span class="Constant">true</span><span class="Delimiter">;</span> <span id="L485" class="LineNr">485 </span> vector<recipe_ordinal> recipes_reloaded = load<span class="Delimiter">(</span>code<span class="Delimiter">);</span> -<span id="L486" class="LineNr">486 </span> transform_all<span class="Delimiter">();</span> -<span id="L487" class="LineNr">487 </span> Trace_stream<span class="Delimiter">-></span>newline<span class="Delimiter">();</span> <span class="Comment">// flush trace</span> +<span id="L486" class="LineNr">486 </span> <a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span> +<span id="L487" class="LineNr">487 </span> Trace_stream<span class="Delimiter">-></span><a href='003trace.cc.html#L137'>newline</a><span class="Delimiter">();</span> <span class="Comment">// flush trace</span> <span id="L488" class="LineNr">488 </span> Sandbox_mode = <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L489" class="LineNr">489 </span> Current_routine = save_current_routine<span class="Delimiter">;</span> <span id="L490" class="LineNr">490 </span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> -<span id="L491" class="LineNr">491 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>trace_error_contents<span class="Delimiter">());</span> -<span id="L492" class="LineNr">492 </span> run_code_end<span class="Delimiter">();</span> <span class="Comment">// wait until we're done with the trace contents</span> +<span id="L491" class="LineNr">491 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L421'>trace_error_contents</a><span class="Delimiter">());</span> +<span id="L492" class="LineNr">492 </span> <a href='101run_sandboxed.cc.html#L151'>run_code_end</a><span class="Delimiter">();</span> <span class="Comment">// wait until we're done with the trace contents</span> <span id="L493" class="LineNr">493 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L494" class="LineNr">494 </span><span class="Delimiter">}</span> <span id="L495" class="LineNr">495 </span> <span id="L496" class="LineNr">496 </span><span class="Delimiter">:(scenario reload_continues_past_error)</span> -<span id="L497" class="LineNr">497 </span><span class="muRecipe">def</span> main [ +<span id="L497" class="LineNr">497 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L498" class="LineNr">498 </span> local-scope <span id="L499" class="LineNr">499 </span> <span class="Normal">x</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [recipe foo [ <span id="L500" class="LineNr">500 </span> get <span class="Constant">1234</span>:num<span class="Delimiter">,</span> <span class="Constant">foo:offset</span> @@ -566,14 +566,14 @@ if ('onhashchange' in window) { <span id="L506" class="LineNr">506 </span> <span id="L507" class="LineNr">507 </span><span class="Delimiter">:(scenario reload_can_repeatedly_load_container_definitions)</span> <span id="L508" class="LineNr">508 </span><span class="Comment"># define a container and try to create it (merge requires knowing container size)</span> -<span id="L509" class="LineNr">509 </span><span class="muRecipe">def</span> main [ +<span id="L509" class="LineNr">509 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L510" class="LineNr">510 </span> local-scope <span id="L511" class="LineNr">511 </span> <span class="Normal">x</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [ <span id="L512" class="LineNr">512 </span> container foo [ <span id="L513" class="LineNr">513 </span> <span class="Normal">x</span>:num <span id="L514" class="LineNr">514 </span> <span class="Normal">y</span>:num <span id="L515" class="LineNr">515 </span> ] -<span id="L516" class="LineNr">516 </span> recipe bar [ +<span id="L516" class="LineNr">516 </span> <a href='010vm.cc.html#L19'>recipe</a> bar [ <span id="L517" class="LineNr">517 </span> local-scope <span id="L518" class="LineNr">518 </span> <span class="Normal">x</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> <span id="L519" class="LineNr">519 </span> ] |