diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2018-01-25 22:39:31 -0800 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2018-01-25 22:39:31 -0800 |
| commit | 805d58c6aeeeba3e4989c0eed6781b3861e8fae0 (patch) | |
| tree | ea5225bdd7c5fbeea912671cdc5f1c4b2b2828d7 /html/101run_sandboxed.cc.html | |
| parent | aefa8fec6a473be459a2ff33e6bd96e7c22ced20 (diff) | |
| download | mu-805d58c6aeeeba3e4989c0eed6781b3861e8fae0.tar.gz | |
4199
Diffstat (limited to 'html/101run_sandboxed.cc.html')
| -rw-r--r-- | html/101run_sandboxed.cc.html | 207 |
1 files changed, 103 insertions, 104 deletions
diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html index 5e56fb93..632eb48b 100644 --- a/html/101run_sandboxed.cc.html +++ b/html/101run_sandboxed.cc.html @@ -15,19 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color a { color:#eeeeee; text-decoration: none; } a:hover { text-decoration: underline; } * { font-size: 12pt; font-size: 1em; } -.Conceal { color: #4e4e4e; } -.traceContains { color: #008000; } +.cSpecial { color: #008000; } .LineNr { color: #444444; } -.Identifier { color: #c0a020; } -.CommentedCode { color: #6c6c6c; } .Constant { color: #00a0a0; } +.muRecipe { color: #ff8700; } +.Delimiter { color: #800080; } +.Special { color: #c00000; } +.Identifier { color: #c0a020; } .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; } .Comment { color: #9090ff; } .Comment a { color:#0000ee; text-decoration:underline; } -.Delimiter { color: #800080; } -.Special { color: #c00000; } -.cSpecial { color: #008000; } -.muRecipe { color: #ff8700; } +.CommentedCode { color: #6c6c6c; } +.traceContains { color: #008000; } --> </style> @@ -105,12 +104,12 @@ if ('onhashchange' in window) { <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><a href='001help.cc.html#L141'>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> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>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#L203'>end</a><span class="Delimiter">();</span> -<span id="L45" class="LineNr"> 45 </span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span> +<span id="L44" class="LineNr"> 44 </span> <a href='003trace.cc.html#L174'>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#L203'>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> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>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#L203'>end</a><span class="Delimiter">();</span> -<span id="L49" class="LineNr"> 49 </span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span> +<span id="L48" class="LineNr"> 48 </span> <a href='003trace.cc.html#L174'>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#L203'>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> @@ -118,17 +117,17 @@ if ('onhashchange' in window) { <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 = <a href='101run_sandboxed.cc.html#L92'>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> <span class="Conceal">¦</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> <span class="Conceal">¦</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> <span class="Conceal">¦</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#L495'>trace_error_contents</a><span class="Delimiter">());</span> -<span id="L60" class="LineNr"> 60 </span> <span class="Conceal">¦</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> <span class="Conceal">¦</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#L509'>trace_app_contents</a><span class="Delimiter">());</span> -<span id="L62" class="LineNr"> 62 </span> <span class="Conceal">¦</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> <span class="Conceal">¦</span> <a href='101run_sandboxed.cc.html#L158'>run_code_end</a><span class="Delimiter">();</span> -<span id="L64" class="LineNr"> 64 </span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Comment">// done with this instruction</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><a href='101run_sandboxed.cc.html#L495'>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><a href='101run_sandboxed.cc.html#L509'>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> <a href='101run_sandboxed.cc.html#L158'>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> -<span id="L67" class="LineNr"> 67 </span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// not done with caller; don't increment current_step_index()</span> +<span id="L67" class="LineNr"> 67 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// not done with caller; don't increment current_step_index()</span> <span id="L68" class="LineNr"> 68 </span> <span class="Delimiter">}</span> <span id="L69" class="LineNr"> 69 </span><span class="Delimiter">}</span> <span id="L70" class="LineNr"> 70 </span> @@ -153,15 +152,15 @@ if ('onhashchange' in window) { <span id="L89" class="LineNr"> 89 </span><span class="Comment">// reads a string, tries to call it as code (treating it as a test), saving</span> <span id="L90" class="LineNr"> 90 </span><span class="Comment">// all errors.</span> <span id="L91" class="LineNr"> 91 </span><span class="Comment">// returns true if successfully called (no errors found during load and transform)</span> -<span id="L92" class="LineNr"> 92 </span><span class="Normal">bool</span> <a href='101run_sandboxed.cc.html#L92'>run_interactive</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L82'>address</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L92" class="LineNr"> 92 </span><span class="Normal">bool</span> <a href='101run_sandboxed.cc.html#L92'>run_interactive</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L80'>address</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L93" class="LineNr"> 93 </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="L94" class="LineNr"> 94 </span> <span class="Comment">// try to sandbox the run as best you can</span> <span id="L95" class="LineNr"> 95 </span> <span class="Comment">// todo: test this</span> <span id="L96" class="LineNr"> 96 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Current_scenario<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L97" class="LineNr"> 97 </span> <span class="Conceal">¦</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="L98" class="LineNr"> 98 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</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="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="L98" class="LineNr"> 98 </span> Memory<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L99" class="LineNr"> 99 </span> <span class="Delimiter">}</span> -<span id="L100" class="LineNr">100 </span> string command = <a href='003trace.cc.html#L369'>trim</a><span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L474'>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#L82'>address</a><span class="Delimiter">)));</span> +<span id="L100" class="LineNr">100 </span> string command = <a href='003trace.cc.html#L369'>trim</a><span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L474'>strip_comments</a><span class="Delimiter">(</span><a href='038new_text.cc.html#L141'>read_mu_text</a><span class="Delimiter">(</span><a href='043space.cc.html#L80'>address</a><span class="Delimiter">)));</span> <span id="L101" class="LineNr">101 </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="L102" class="LineNr">102 </span> <a href='101run_sandboxed.cc.html#L145'>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="L103" class="LineNr">103 </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> @@ -170,22 +169,22 @@ if ('onhashchange' in window) { <span id="L106" class="LineNr">106 </span> Current_routine = <span class="Constant">NULL</span><span class="Delimiter">;</span> <span id="L107" class="LineNr">107 </span> <span class="Comment">// call run(string) but without the scheduling</span> <span id="L108" class="LineNr">108 </span> load<span class="Delimiter">(</span>string<span class="Delimiter">(</span><span class="Constant">"recipe! interactive [</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">)</span> + -<span id="L109" class="LineNr">109 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">"local-scope</span><span class="cSpecial">\n</span><span class="Constant">"</span> + -<span id="L110" class="LineNr">110 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">"screen:&:screen <- next-ingredient</span><span class="cSpecial">\n</span><span class="Constant">"</span> + -<span id="L111" class="LineNr">111 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">"$start-tracking-products</span><span class="cSpecial">\n</span><span class="Constant">"</span> + -<span id="L112" class="LineNr">112 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> command + <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> + -<span id="L113" class="LineNr">113 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">"$stop-tracking-products</span><span class="cSpecial">\n</span><span class="Constant">"</span> + -<span id="L114" class="LineNr">114 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">"return screen</span><span class="cSpecial">\n</span><span class="Constant">"</span> + -<span id="L115" class="LineNr">115 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span><span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> +<span id="L109" class="LineNr">109 </span> <span class="Constant">"local-scope</span><span class="cSpecial">\n</span><span class="Constant">"</span> + +<span id="L110" class="LineNr">110 </span> <span class="Constant">"screen:&:screen <- next-ingredient</span><span class="cSpecial">\n</span><span class="Constant">"</span> + +<span id="L111" class="LineNr">111 </span> <span class="Constant">"$start-tracking-products</span><span class="cSpecial">\n</span><span class="Constant">"</span> + +<span id="L112" class="LineNr">112 </span> command + <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> + +<span id="L113" class="LineNr">113 </span> <span class="Constant">"$stop-tracking-products</span><span class="cSpecial">\n</span><span class="Constant">"</span> + +<span id="L114" class="LineNr">114 </span> <span class="Constant">"return screen</span><span class="cSpecial">\n</span><span class="Constant">"</span> + +<span id="L115" class="LineNr">115 </span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> <span id="L116" class="LineNr">116 </span> <a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span> <span id="L117" class="LineNr">117 </span> Current_routine = save_current_routine<span class="Delimiter">;</span> <span id="L118" class="LineNr">118 </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="L119" class="LineNr">119 </span> <span class="Comment">// now call 'sandbox' which will run 'interactive' in a separate routine,</span> <span id="L120" class="LineNr">120 </span> <span class="Comment">// and wait for it</span> <span id="L121" class="LineNr">121 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L122" class="LineNr">122 </span> <span class="Conceal">¦</span> ++Save_trace_stream<span class="Delimiter">-></span>callstack_depth<span class="Delimiter">;</span> -<span id="L123" class="LineNr">123 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>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#L203'>end</a><span class="Delimiter">();</span> -<span id="L124" class="LineNr">124 </span> <span class="Conceal">¦</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="L122" class="LineNr">122 </span> ++Save_trace_stream<span class="Delimiter">-></span>callstack_depth<span class="Delimiter">;</span> +<span id="L123" class="LineNr">123 </span> <a href='003trace.cc.html#L167'>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#L203'>end</a><span class="Delimiter">();</span> +<span id="L124" class="LineNr">124 </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="L125" class="LineNr">125 </span> <span class="Delimiter">}</span> <span id="L126" class="LineNr">126 </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> <span id="L127" class="LineNr">127 </span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> @@ -213,7 +212,7 @@ if ('onhashchange' in window) { <span id="L149" class="LineNr">149 </span> Run_profiler_stash = Run_profiler<span class="Delimiter">;</span> <span id="L150" class="LineNr">150 </span> Run_profiler = <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L151" class="LineNr">151 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>should_stash_snapshots<span class="Delimiter">)</span> -<span id="L152" class="LineNr">152 </span> <span class="Conceal">¦</span> <a href='101run_sandboxed.cc.html#L176'>stash_snapshots</a><span class="Delimiter">();</span> +<span id="L152" class="LineNr">152 </span> <a href='101run_sandboxed.cc.html#L176'>stash_snapshots</a><span class="Delimiter">();</span> <span id="L153" class="LineNr">153 </span> Save_trace_stream = Trace_stream<span class="Delimiter">;</span> <span id="L154" class="LineNr">154 </span> Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span id="L155" class="LineNr">155 </span> Trace_stream<span class="Delimiter">-></span>collect_depth = App_depth<span class="Delimiter">;</span> @@ -233,7 +232,7 @@ if ('onhashchange' in window) { <span id="L169" class="LineNr">169 </span> Save_trace_file<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> <span id="L170" class="LineNr">170 </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="L171" class="LineNr">171 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Recipe_snapshot_stash<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> -<span id="L172" class="LineNr">172 </span> <span class="Conceal">¦</span> <a href='101run_sandboxed.cc.html#L197'>unstash_snapshots</a><span class="Delimiter">();</span> +<span id="L172" class="LineNr">172 </span> <a href='101run_sandboxed.cc.html#L197'>unstash_snapshots</a><span class="Delimiter">();</span> <span id="L173" class="LineNr">173 </span><span class="Delimiter">}</span> <span id="L174" class="LineNr">174 </span> <span id="L175" class="LineNr">175 </span><span class="Comment">// keep sync'd with save_snapshots and restore_snapshots</span> @@ -412,8 +411,8 @@ if ('onhashchange' in window) { <span id="L348" class="LineNr">348 </span><span class="muRecipe">def</span> foo [ <span id="L349" class="LineNr">349 </span> <span class="Constant">20</span>:num<span class="Special"> <- </span>copy <span class="Constant">1234</span> <span id="L350" class="LineNr">350 </span> <span class="Delimiter">{</span> -<span id="L351" class="LineNr">351 </span> <span class="Conceal">¦</span> <span class="Identifier">break</span> -<span id="L352" class="LineNr">352 </span> <span class="Conceal">¦</span> reply <span class="Constant">5678</span> +<span id="L351" class="LineNr">351 </span> <span class="Identifier">break</span> +<span id="L352" class="LineNr">352 </span> reply <span class="Constant">5678</span> <span id="L353" class="LineNr">353 </span> <span class="Delimiter">}</span> <span id="L354" class="LineNr">354 </span>] <span id="L355" class="LineNr">355 </span><span class="Comment"># no product should have been tracked</span> @@ -422,16 +421,16 @@ if ('onhashchange' in window) { <span id="L358" class="LineNr">358 </span><span class="Delimiter">:(scenario "run_interactive_ignores_products_in_previous_instructions")</span> <span id="L359" class="LineNr">359 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L360" class="LineNr">360 </span> <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [ -<span id="L361" class="LineNr">361 </span> <span class="Conceal">¦</span> add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> <span class="Comment"># generates a product</span> -<span id="L362" class="LineNr">362 </span> <span class="Conceal">¦</span> foo] <span class="Comment"># no products</span> +<span id="L361" class="LineNr">361 </span> add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> <span class="Comment"># generates a product</span> +<span id="L362" class="LineNr">362 </span> foo] <span class="Comment"># no products</span> <span id="L363" class="LineNr">363 </span> <span class="Constant">2</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text <span id="L364" class="LineNr">364 </span> <span class="Constant">10</span>:@:<span class="Normal">char</span><span class="Special"> <- </span>copy *<span class="Constant">2</span>:text <span id="L365" class="LineNr">365 </span>] <span id="L366" class="LineNr">366 </span><span class="muRecipe">def</span> foo [ <span id="L367" class="LineNr">367 </span> <span class="Constant">20</span>:num<span class="Special"> <- </span>copy <span class="Constant">1234</span> <span id="L368" class="LineNr">368 </span> <span class="Delimiter">{</span> -<span id="L369" class="LineNr">369 </span> <span class="Conceal">¦</span> <span class="Identifier">break</span> -<span id="L370" class="LineNr">370 </span> <span class="Conceal">¦</span> reply <span class="Constant">5678</span> +<span id="L369" class="LineNr">369 </span> <span class="Identifier">break</span> +<span id="L370" class="LineNr">370 </span> reply <span class="Constant">5678</span> <span id="L371" class="LineNr">371 </span> <span class="Delimiter">}</span> <span id="L372" class="LineNr">372 </span>] <span id="L373" class="LineNr">373 </span><span class="Comment"># no product should have been tracked</span> @@ -440,16 +439,16 @@ if ('onhashchange' in window) { <span id="L376" class="LineNr">376 </span><span class="Delimiter">:(scenario "run_interactive_remembers_products_before_final_label")</span> <span id="L377" class="LineNr">377 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L378" class="LineNr">378 </span> <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [ -<span id="L379" class="LineNr">379 </span> <span class="Conceal">¦</span> add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> <span class="Comment"># generates a product</span> -<span id="L380" class="LineNr">380 </span> <span class="Conceal">¦</span> +foo] <span class="Comment"># no products</span> +<span id="L379" class="LineNr">379 </span> add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> <span class="Comment"># generates a product</span> +<span id="L380" class="LineNr">380 </span> +foo] <span class="Comment"># no products</span> <span id="L381" class="LineNr">381 </span> <span class="Constant">2</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text <span id="L382" class="LineNr">382 </span> <span class="Constant">10</span>:@:<span class="Normal">char</span><span class="Special"> <- </span>copy *<span class="Constant">2</span>:text <span id="L383" class="LineNr">383 </span>] <span id="L384" class="LineNr">384 </span><span class="muRecipe">def</span> foo [ <span id="L385" class="LineNr">385 </span> <span class="Constant">20</span>:num<span class="Special"> <- </span>copy <span class="Constant">1234</span> <span id="L386" class="LineNr">386 </span> <span class="Delimiter">{</span> -<span id="L387" class="LineNr">387 </span> <span class="Conceal">¦</span> <span class="Identifier">break</span> -<span id="L388" class="LineNr">388 </span> <span class="Conceal">¦</span> reply <span class="Constant">5678</span> +<span id="L387" class="LineNr">387 </span> <span class="Identifier">break</span> +<span id="L388" class="LineNr">388 </span> reply <span class="Constant">5678</span> <span id="L389" class="LineNr">389 </span> <span class="Delimiter">}</span> <span id="L390" class="LineNr">390 </span>] <span id="L391" class="LineNr">391 </span><span class="Comment"># product tracked</span> @@ -459,9 +458,9 @@ if ('onhashchange' in window) { <span id="L395" class="LineNr">395 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L396" class="LineNr">396 </span> <span class="Comment"># try to interactively add 2 and 2</span> <span id="L397" class="LineNr">397 </span> <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [ -<span id="L398" class="LineNr">398 </span> <span class="Conceal">¦</span> x:text<span class="Special"> <- </span><span class="Normal">new</span> [a] -<span id="L399" class="LineNr">399 </span> <span class="Conceal">¦</span> y:text<span class="Special"> <- </span><span class="Normal">new</span> [b] -<span id="L400" class="LineNr">400 </span> <span class="Conceal">¦</span> z:text<span class="Special"> <- </span>append x:text<span class="Delimiter">,</span> y:text +<span id="L398" class="LineNr">398 </span> <span class="Normal">x</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [a] +<span id="L399" class="LineNr">399 </span> <span class="Normal">y</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [b] +<span id="L400" class="LineNr">400 </span> <span class="Normal">z</span>:text<span class="Special"> <- </span>append x:text<span class="Delimiter">,</span> y:text <span id="L401" class="LineNr">401 </span> ] <span id="L402" class="LineNr">402 </span> <span class="Constant">2</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text <span id="L403" class="LineNr">403 </span> <span class="Constant">10</span>:@:<span class="Normal">char</span><span class="Special"> <- </span>copy *<span class="Constant">2</span>:text @@ -498,8 +497,8 @@ if ('onhashchange' in window) { <span id="L434" class="LineNr">434 </span> <span id="L435" class="LineNr">435 </span><span class="Delimiter">:(after "Running One Instruction")</span> <span id="L436" class="LineNr">436 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Track_most_recent_products && <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-></span>calls<span class="Delimiter">)</span> == Call_depth_to_track_most_recent_products_at -<span id="L437" class="LineNr">437 </span> <span class="Conceal">¦</span> && !current_instruction<span class="Delimiter">().</span>is_label -<span id="L438" class="LineNr">438 </span> <span class="Conceal">¦</span> && <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>name != <span class="Constant">"$stop-tracking-products"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L437" class="LineNr">437 </span> && !current_instruction<span class="Delimiter">().</span>is_label +<span id="L438" class="LineNr">438 </span> && <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>name != <span class="Constant">"$stop-tracking-products"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L439" class="LineNr">439 </span> Most_recent_products = <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L440" class="LineNr">440 </span><span class="Delimiter">}</span> <span id="L441" class="LineNr">441 </span><span class="Delimiter">:(before "End Running One Instruction")</span> @@ -510,26 +509,26 @@ if ('onhashchange' in window) { <span id="L446" class="LineNr">446 </span>string <a href='101run_sandboxed.cc.html#L446'>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="L447" class="LineNr">447 </span> ostringstream out<span class="Delimiter">;</span> <span id="L448" class="LineNr">448 </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#L141'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L449" class="LineNr">449 </span> <span class="Conceal">¦</span> <span class="Comment">// A sandbox can print a string result, but only if it is actually saved</span> -<span id="L450" class="LineNr">450 </span> <span class="Conceal">¦</span> <span class="Comment">// to a variable in the sandbox, because otherwise the results are</span> -<span id="L451" class="LineNr">451 </span> <span class="Conceal">¦</span> <span class="Comment">// reclaimed before the sandbox sees them. So you get these interactions</span> -<span id="L452" class="LineNr">452 </span> <span class="Conceal">¦</span> <span class="Comment">// in the sandbox:</span> -<span id="L453" class="LineNr">453 </span> <span class="Conceal">¦</span> <span class="Comment">//</span> -<span id="L454" class="LineNr">454 </span> <span class="Conceal">¦</span> <span class="Comment">// new [abc]</span> -<span id="L455" class="LineNr">455 </span> <span class="Conceal">¦</span> <span class="Comment">// => <address></span> -<span id="L456" class="LineNr">456 </span> <span class="Conceal">¦</span> <span class="Comment">//</span> -<span id="L457" class="LineNr">457 </span> <span class="Conceal">¦</span> <span class="Comment">// x:text <- new [abc]</span> -<span id="L458" class="LineNr">458 </span> <span class="Conceal">¦</span> <span class="Comment">// => abc</span> -<span id="L459" class="LineNr">459 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i < <a href='001help.cc.html#L141'>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="L460" class="LineNr">460 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='027call_ingredient.cc.html#L177'>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="L461" class="LineNr">461 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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="L462" class="LineNr">462 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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="L463" class="LineNr">463 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> -<span id="L464" class="LineNr">464 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> -<span id="L465" class="LineNr">465 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> -<span id="L466" class="LineNr">466 </span> <span class="Conceal">¦</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#L141'>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="L467" class="LineNr">467 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</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="L468" class="LineNr">468 </span> <span class="Conceal">¦</span> out << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L449" class="LineNr">449 </span> <span class="Comment">// A sandbox can print a string result, but only if it is actually saved</span> +<span id="L450" class="LineNr">450 </span> <span class="Comment">// to a variable in the sandbox, because otherwise the results are</span> +<span id="L451" class="LineNr">451 </span> <span class="Comment">// reclaimed before the sandbox sees them. So you get these interactions</span> +<span id="L452" class="LineNr">452 </span> <span class="Comment">// in the sandbox:</span> +<span id="L453" class="LineNr">453 </span> <span class="Comment">//</span> +<span id="L454" class="LineNr">454 </span> <span class="Comment">// new [abc]</span> +<span id="L455" class="LineNr">455 </span> <span class="Comment">// => <address></span> +<span id="L456" class="LineNr">456 </span> <span class="Comment">//</span> +<span id="L457" class="LineNr">457 </span> <span class="Comment">// x:text <- new [abc]</span> +<span id="L458" class="LineNr">458 </span> <span class="Comment">// => abc</span> +<span id="L459" class="LineNr">459 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i < <a href='001help.cc.html#L141'>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="L460" class="LineNr">460 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='027call_ingredient.cc.html#L177'>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="L461" class="LineNr">461 </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="L462" class="LineNr">462 </span> out << <a href='038new_text.cc.html#L141'>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="L463" class="LineNr">463 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> +<span id="L464" class="LineNr">464 </span> <span class="Delimiter">}</span> +<span id="L465" class="LineNr">465 </span> <span class="Delimiter">}</span> +<span id="L466" class="LineNr">466 </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#L141'>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="L467" class="LineNr">467 </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="L468" class="LineNr">468 </span> out << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L469" class="LineNr">469 </span> <span class="Delimiter">}</span> <span id="L470" class="LineNr">470 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L471" class="LineNr">471 </span><span class="Delimiter">}</span> @@ -538,21 +537,21 @@ if ('onhashchange' in window) { <span id="L474" class="LineNr">474 </span>string <a href='101run_sandboxed.cc.html#L474'>strip_comments</a><span class="Delimiter">(</span>string in<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L475" class="LineNr">475 </span> ostringstream result<span class="Delimiter">;</span> <span id="L476" class="LineNr">476 </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#L141'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L477" class="LineNr">477 </span> <span class="Conceal">¦</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="L478" class="LineNr">478 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> result << in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L479" class="LineNr">479 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> -<span id="L480" class="LineNr">480 </span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L481" class="LineNr">481 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>i+<span class="Constant">1</span> < <a href='001help.cc.html#L141'>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="L482" class="LineNr">482 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++i<span class="Delimiter">;</span> -<span id="L483" class="LineNr">483 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> +<span id="L477" class="LineNr">477 </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="L478" class="LineNr">478 </span> result << in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L479" class="LineNr">479 </span> <span class="Delimiter">}</span> +<span id="L480" class="LineNr">480 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> +<span id="L481" class="LineNr">481 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>i+<span class="Constant">1</span> < <a href='001help.cc.html#L141'>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="L482" class="LineNr">482 </span> ++i<span class="Delimiter">;</span> +<span id="L483" class="LineNr">483 </span> <span class="Delimiter">}</span> <span id="L484" class="LineNr">484 </span> <span class="Delimiter">}</span> <span id="L485" class="LineNr">485 </span> <span class="Identifier">return</span> result<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L486" class="LineNr">486 </span><span class="Delimiter">}</span> <span id="L487" class="LineNr">487 </span> -<span id="L488" class="LineNr">488 </span><span class="Normal">int</span> <a href='101run_sandboxed.cc.html#L488'>stringified_value_of_location</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L82'>address</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L488" class="LineNr">488 </span><span class="Normal">int</span> <a href='101run_sandboxed.cc.html#L488'>stringified_value_of_location</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L80'>address</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L489" class="LineNr">489 </span> <span class="Comment">// convert to string</span> <span id="L490" class="LineNr">490 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L491" class="LineNr">491 </span> out << no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L82'>address</a><span class="Delimiter">));</span> +<span id="L491" class="LineNr">491 </span> out << no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L80'>address</a><span class="Delimiter">));</span> <span id="L492" class="LineNr">492 </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="L493" class="LineNr">493 </span><span class="Delimiter">}</span> <span id="L494" class="LineNr">494 </span> @@ -560,9 +559,9 @@ if ('onhashchange' in window) { <span id="L496" class="LineNr">496 </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="L497" class="LineNr">497 </span> ostringstream out<span class="Delimiter">;</span> <span id="L498" class="LineNr">498 </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#L203'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L499" class="LineNr">499 </span> <span class="Conceal">¦</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="L500" class="LineNr">500 </span> <span class="Conceal">¦</span> out << p<span class="Delimiter">-></span>contents<span class="Delimiter">;</span> -<span id="L501" class="LineNr">501 </span> <span class="Conceal">¦</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#L203'>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="L499" class="LineNr">499 </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="L500" class="LineNr">500 </span> out << p<span class="Delimiter">-></span>contents<span class="Delimiter">;</span> +<span id="L501" class="LineNr">501 </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#L203'>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="L502" class="LineNr">502 </span> <span class="Delimiter">}</span> <span id="L503" class="LineNr">503 </span> string result = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L504" class="LineNr">504 </span> <a href='101run_sandboxed.cc.html#L523'>truncate</a><span class="Delimiter">(</span>result<span class="Delimiter">);</span> @@ -574,9 +573,9 @@ if ('onhashchange' in window) { <span id="L510" class="LineNr">510 </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="L511" class="LineNr">511 </span> ostringstream out<span class="Delimiter">;</span> <span id="L512" class="LineNr">512 </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#L203'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L513" class="LineNr">513 </span> <span class="Conceal">¦</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="L514" class="LineNr">514 </span> <span class="Conceal">¦</span> out << p<span class="Delimiter">-></span>contents<span class="Delimiter">;</span> -<span id="L515" class="LineNr">515 </span> <span class="Conceal">¦</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#L203'>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="L513" class="LineNr">513 </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="L514" class="LineNr">514 </span> out << p<span class="Delimiter">-></span>contents<span class="Delimiter">;</span> +<span id="L515" class="LineNr">515 </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#L203'>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="L516" class="LineNr">516 </span> <span class="Delimiter">}</span> <span id="L517" class="LineNr">517 </span> string result = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L518" class="LineNr">518 </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> @@ -586,10 +585,10 @@ if ('onhashchange' in window) { <span id="L522" class="LineNr">522 </span> <span id="L523" class="LineNr">523 </span><span class="Normal">void</span> <a href='101run_sandboxed.cc.html#L523'>truncate</a><span class="Delimiter">(</span>string& x<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L524" class="LineNr">524 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>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="L525" class="LineNr">525 </span> <span class="Conceal">¦</span> x<span class="Delimiter">.</span>erase<span class="Delimiter">(</span><span class="Constant">1024</span><span class="Delimiter">);</span> -<span id="L526" class="LineNr">526 </span> <span class="Conceal">¦</span> *x<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> = <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L527" class="LineNr">527 </span> <span class="Conceal">¦</span> *++x<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> = <span class="Constant">'.'</span><span class="Delimiter">;</span> -<span id="L528" class="LineNr">528 </span> <span class="Conceal">¦</span> *++++x<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> = <span class="Constant">'.'</span><span class="Delimiter">;</span> +<span id="L525" class="LineNr">525 </span> x<span class="Delimiter">.</span>erase<span class="Delimiter">(</span><span class="Constant">1024</span><span class="Delimiter">);</span> +<span id="L526" class="LineNr">526 </span> *x<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> = <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L527" class="LineNr">527 </span> *++x<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> = <span class="Constant">'.'</span><span class="Delimiter">;</span> +<span id="L528" class="LineNr">528 </span> *++++x<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> = <span class="Constant">'.'</span><span class="Delimiter">;</span> <span id="L529" class="LineNr">529 </span> <span class="Delimiter">}</span> <span id="L530" class="LineNr">530 </span><span class="Delimiter">}</span> <span id="L531" class="LineNr">531 </span> @@ -603,19 +602,19 @@ if ('onhashchange' in window) { <span id="L539" class="LineNr">539 </span><span class="Delimiter">:(before "End Primitive Recipe Checks")</span> <span id="L540" class="LineNr">540 </span><span class="Normal">case</span> RELOAD: <span class="Delimiter">{</span> <span id="L541" class="LineNr">541 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>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="L542" class="LineNr">542 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>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#L203'>end</a><span class="Delimiter">();</span> -<span id="L543" class="LineNr">543 </span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span> +<span id="L542" class="LineNr">542 </span> <a href='003trace.cc.html#L174'>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#L203'>end</a><span class="Delimiter">();</span> +<span id="L543" class="LineNr">543 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L544" class="LineNr">544 </span> <span class="Delimiter">}</span> <span id="L545" class="LineNr">545 </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="L546" class="LineNr">546 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L174'>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#L203'>end</a><span class="Delimiter">();</span> -<span id="L547" class="LineNr">547 </span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span> +<span id="L546" class="LineNr">546 </span> <a href='003trace.cc.html#L174'>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#L203'>end</a><span class="Delimiter">();</span> +<span id="L547" class="LineNr">547 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L548" class="LineNr">548 </span> <span class="Delimiter">}</span> <span id="L549" class="LineNr">549 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L550" class="LineNr">550 </span><span class="Delimiter">}</span> <span id="L551" class="LineNr">551 </span><span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span id="L552" class="LineNr">552 </span><span class="Normal">case</span> RELOAD: <span class="Delimiter">{</span> <span id="L553" class="LineNr">553 </span> restore_non_recipe_snapshots<span class="Delimiter">();</span> -<span id="L554" class="LineNr">554 </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="L554" class="LineNr">554 </span> string code = <a href='038new_text.cc.html#L141'>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="L555" class="LineNr">555 </span> <a href='101run_sandboxed.cc.html#L145'>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="L556" class="LineNr">556 </span> routine* save_current_routine = Current_routine<span class="Delimiter">;</span> <span id="L557" class="LineNr">557 </span> Current_routine = <span class="Constant">NULL</span><span class="Delimiter">;</span> @@ -647,14 +646,14 @@ if ('onhashchange' in window) { <span id="L583" class="LineNr">583 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L584" class="LineNr">584 </span> local-scope <span id="L585" class="LineNr">585 </span> <span class="Normal">x</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [ -<span id="L586" class="LineNr">586 </span> <span class="Conceal">¦</span> container foo [ -<span id="L587" class="LineNr">587 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> x:num -<span id="L588" class="LineNr">588 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> y:num -<span id="L589" class="LineNr">589 </span> <span class="Conceal">¦</span> ] -<span id="L590" class="LineNr">590 </span> <span class="Conceal">¦</span> <a href='010vm.cc.html#L19'>recipe</a> bar [ -<span id="L591" class="LineNr">591 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> local-scope -<span id="L592" class="LineNr">592 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> x:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> -<span id="L593" class="LineNr">593 </span> <span class="Conceal">¦</span> ] +<span id="L586" class="LineNr">586 </span> container foo [ +<span id="L587" class="LineNr">587 </span> <span class="Normal">x</span>:num +<span id="L588" class="LineNr">588 </span> <span class="Normal">y</span>:num +<span id="L589" class="LineNr">589 </span> ] +<span id="L590" class="LineNr">590 </span> <a href='010vm.cc.html#L19'>recipe</a> bar [ +<span id="L591" class="LineNr">591 </span> local-scope +<span id="L592" class="LineNr">592 </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="L593" class="LineNr">593 </span> ] <span id="L594" class="LineNr">594 </span> ] <span id="L595" class="LineNr">595 </span> <span class="Comment"># save warning addresses in locations of type 'number' to avoid spurious changes to them due to 'abandon'</span> <span id="L596" class="LineNr">596 </span> <span class="Constant">1</span>:num/<span class="Special">raw <- </span>reload x |