about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2017-02-07 00:22:08 -0800
committerKartik K. Agaram <vc@akkartik.com>2017-02-07 00:22:08 -0800
commit598f1b5362eb799e40836ceeb5452c9ba937fd6c (patch)
tree87c60bb17b9a4b5843a7a510c6800150fe6c36d7
parentfbe0f91376a4f1ed98e95b35d1b9e7629a743c30 (diff)
downloadmu-598f1b5362eb799e40836ceeb5452c9ba937fd6c.tar.gz
3746
-rw-r--r--html/010vm.cc.html1605
-rw-r--r--html/011load.cc.html521
-rw-r--r--html/012transform.cc.html2
-rw-r--r--html/014literal_string.cc.html4
-rw-r--r--html/015literal_noninteger.cc.html2
-rw-r--r--html/016dilated_reagent.cc.html10
-rw-r--r--html/017parse_tree.cc.html4
-rw-r--r--html/018type_abbreviations.cc.html6
-rw-r--r--html/020run.cc.html2
-rw-r--r--html/021check_instruction.cc.html2
-rw-r--r--html/028call_return.cc.html2
-rw-r--r--html/030container.cc.html38
-rw-r--r--html/031merge.cc.html4
-rw-r--r--html/032array.cc.html2
-rw-r--r--html/033exclusive_container.cc.html18
-rw-r--r--html/034address.cc.html2
-rw-r--r--html/035lookup.cc.html8
-rw-r--r--html/036refcount.cc.html1598
-rw-r--r--html/037abandon.cc.html4
-rw-r--r--html/040brace.cc.html779
-rw-r--r--html/041jump_target.cc.html10
-rw-r--r--html/042name.cc.html16
-rw-r--r--html/043space.cc.html365
-rw-r--r--html/050scenario.cc.html28
-rw-r--r--html/052tangle.cc.html4
-rw-r--r--html/053recipe_header.cc.html6
-rw-r--r--html/054static_dispatch.cc.html2
-rw-r--r--html/055shape_shifting_container.cc.html10
-rw-r--r--html/056shape_shifting_recipe.cc.html2
-rw-r--r--html/057immutable.cc.html2
-rw-r--r--html/069hash.cc.html10
-rw-r--r--html/071recipe.cc.html4
-rw-r--r--html/072scheduler.cc.html2
-rw-r--r--html/073wait.cc.html4
-rw-r--r--html/074deep_copy.cc.html6
-rw-r--r--html/082scenario_screen.cc.html10
-rw-r--r--html/089scenario_filesystem.cc.html10
-rw-r--r--html/999spaces.cc.html2
38 files changed, 2570 insertions, 2536 deletions
diff --git a/html/010vm.cc.html b/html/010vm.cc.html
index a02ee098..b2811293 100644
--- a/html/010vm.cc.html
+++ b/html/010vm.cc.html
@@ -95,810 +95,827 @@ if ('onhashchange' in window) {
 <span id="L33" class="LineNr"> 33 </span>  <span class="Normal">bool</span> is_label<span class="Delimiter">;</span>
 <span id="L34" class="LineNr"> 34 </span>  string label<span class="Delimiter">;</span>  <span class="Comment">// only if is_label</span>
 <span id="L35" class="LineNr"> 35 </span>  string name<span class="Delimiter">;</span>  <span class="Comment">// only if !is_label</span>
-<span id="L36" class="LineNr"> 36 </span>  string old_name<span class="Delimiter">;</span>  <span class="Comment">// before our automatic rewrite rules</span>
-<span id="L37" class="LineNr"> 37 </span>  string original_string<span class="Delimiter">;</span>  <span class="Comment">// for error messages</span>
-<span id="L38" class="LineNr"> 38 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> operation<span class="Delimiter">;</span>  <span class="Comment">// get(Recipe_ordinal, name)</span>
-<span id="L39" class="LineNr"> 39 </span>  vector&lt;reagent&gt; ingredients<span class="Delimiter">;</span>  <span class="Comment">// only if !is_label</span>
-<span id="L40" class="LineNr"> 40 </span>  vector&lt;reagent&gt; products<span class="Delimiter">;</span>  <span class="Comment">// only if !is_label</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Comment">// End instruction Fields</span>
-<span id="L42" class="LineNr"> 42 </span>  <a href='010vm.cc.html#L32'>instruction</a><span class="Delimiter">();</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Normal">void</span> <a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">bool</span> is_empty<span class="Delimiter">();</span>
-<span id="L45" class="LineNr"> 45 </span><span class="Delimiter">};</span>
-<span id="L46" class="LineNr"> 46 </span>
-<span id="L47" class="LineNr"> 47 </span><span class="Delimiter">:(before &quot;struct instruction&quot;)</span>
-<span id="L48" class="LineNr"> 48 </span><span class="Comment">// Ingredients and products are a single species -- a reagent. Reagents refer</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Comment">// either to numbers or to locations in memory along with 'type' tags telling</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Comment">// us how to interpret them. They also can contain arbitrary other lists of</span>
-<span id="L51" class="LineNr"> 51 </span><span class="Comment">// properties besides types, but we're getting ahead of ourselves.</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Normal">struct</span> reagent <span class="Delimiter">{</span>
-<span id="L53" class="LineNr"> 53 </span>  string original_string<span class="Delimiter">;</span>
-<span id="L54" class="LineNr"> 54 </span>  string name<span class="Delimiter">;</span>
-<span id="L55" class="LineNr"> 55 </span>  type_tree* type<span class="Delimiter">;</span>
-<span id="L56" class="LineNr"> 56 </span>  vector&lt;pair&lt;string<span class="Delimiter">,</span> string_tree*&gt; &gt; properties<span class="Delimiter">;</span>  <span class="Comment">// can't be a map because the string_tree sometimes needs to be NULL, which can be confusing</span>
-<span id="L57" class="LineNr"> 57 </span>  <span class="Normal">double</span> value<span class="Delimiter">;</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Normal">bool</span> initialized<span class="Delimiter">;</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// End reagent Fields</span>
-<span id="L60" class="LineNr"> 60 </span>  reagent<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">);</span>
-<span id="L61" class="LineNr"> 61 </span>  reagent<span class="Delimiter">()</span> :type<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> value<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> initialized<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L62" class="LineNr"> 62 </span>  ~reagent<span class="Delimiter">();</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="Normal">void</span> <a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L64" class="LineNr"> 64 </span>  reagent<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; original<span class="Delimiter">);</span>
-<span id="L65" class="LineNr"> 65 </span>  reagent&amp; <span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; original<span class="Delimiter">);</span>
-<span id="L66" class="LineNr"> 66 </span>  <span class="Normal">void</span> <a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><span class="Normal">double</span> v<span class="Delimiter">)</span> <span class="Delimiter">{</span> value = v<span class="Delimiter">;</span>  initialized = <span class="Constant">true</span><span class="Delimiter">;</span> <span class="Delimiter">}</span>
-<span id="L67" class="LineNr"> 67 </span><span class="Delimiter">};</span>
-<span id="L68" class="LineNr"> 68 </span>
-<span id="L69" class="LineNr"> 69 </span><span class="Delimiter">:(before &quot;struct reagent&quot;)</span>
-<span id="L70" class="LineNr"> 70 </span><span class="Comment">// Types can range from a simple type ordinal, to arbitrarily complex trees of</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Comment">// type parameters, like (map (address array character) (list number))</span>
-<span id="L72" class="LineNr"> 72 </span><span class="Normal">struct</span> type_tree <span class="Delimiter">{</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">bool</span> atom<span class="Delimiter">;</span>
-<span id="L74" class="LineNr"> 74 </span>  string name<span class="Delimiter">;</span>  <span class="Comment">// only if atom</span>
-<span id="L75" class="LineNr"> 75 </span>  <a href='010vm.cc.html#L124'>type_ordinal</a> value<span class="Delimiter">;</span>  <span class="Comment">// only if atom</span>
-<span id="L76" class="LineNr"> 76 </span>  type_tree* left<span class="Delimiter">;</span>  <span class="Comment">// only if !atom</span>
-<span id="L77" class="LineNr"> 77 </span>  type_tree* right<span class="Delimiter">;</span>  <span class="Comment">// only if !atom</span>
-<span id="L78" class="LineNr"> 78 </span>  ~type_tree<span class="Delimiter">();</span>
-<span id="L79" class="LineNr"> 79 </span>  type_tree<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; original<span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment">// atomic type ordinal</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Normal">explicit</span> type_tree<span class="Delimiter">(</span>string name<span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span>  type_tree<span class="Delimiter">(</span>string name<span class="Delimiter">,</span> <a href='010vm.cc.html#L124'>type_ordinal</a> v<span class="Delimiter">)</span> :atom<span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">),</span> name<span class="Delimiter">(</span>name<span class="Delimiter">),</span> value<span class="Delimiter">(</span>v<span class="Delimiter">),</span> left<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> right<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Comment">// tree of type ordinals</span>
-<span id="L84" class="LineNr"> 84 </span>  type_tree<span class="Delimiter">(</span>type_tree* l<span class="Delimiter">,</span> type_tree* r<span class="Delimiter">)</span> :atom<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">),</span> value<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> left<span class="Delimiter">(</span>l<span class="Delimiter">),</span> right<span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L85" class="LineNr"> 85 </span>  type_tree&amp; <span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; original<span class="Delimiter">);</span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Normal">bool</span> <span class="Normal">operator</span>==<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span><span class="Delimiter">;</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="Normal">bool</span> <span class="Normal">operator</span>!=<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span> <span class="Delimiter">{</span> <span class="Identifier">return</span> !<span class="Normal">operator</span>==<span class="Delimiter">(</span>other<span class="Delimiter">);</span> <span class="Delimiter">}</span>
-<span id="L88" class="LineNr"> 88 </span>  <span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span><span class="Delimiter">;</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Normal">bool</span> <span class="Normal">operator</span>&gt;<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span> <span class="Delimiter">{</span> <span class="Identifier">return</span> other<span class="Delimiter">.</span><span class="Normal">operator</span>&lt;<span class="Delimiter">(</span>*<span class="Normal">this</span><span class="Delimiter">);</span> <span class="Delimiter">}</span>
-<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">};</span>
-<span id="L91" class="LineNr"> 91 </span>
-<span id="L92" class="LineNr"> 92 </span><span class="Normal">struct</span> string_tree <span class="Delimiter">{</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Normal">bool</span> atom<span class="Delimiter">;</span>
-<span id="L94" class="LineNr"> 94 </span>  string value<span class="Delimiter">;</span>  <span class="Comment">// only if atom</span>
-<span id="L95" class="LineNr"> 95 </span>  string_tree* left<span class="Delimiter">;</span>  <span class="Comment">// only if !atom</span>
-<span id="L96" class="LineNr"> 96 </span>  string_tree* right<span class="Delimiter">;</span>  <span class="Comment">// only if !atom</span>
-<span id="L97" class="LineNr"> 97 </span>  ~string_tree<span class="Delimiter">();</span>
-<span id="L98" class="LineNr"> 98 </span>  string_tree<span class="Delimiter">(</span><span class="Normal">const</span> string_tree&amp; original<span class="Delimiter">);</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Comment">// atomic string</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Normal">explicit</span> string_tree<span class="Delimiter">(</span>string v<span class="Delimiter">)</span> :atom<span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">),</span> value<span class="Delimiter">(</span>v<span class="Delimiter">),</span> left<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> right<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Comment">// tree of strings</span>
-<span id="L102" class="LineNr">102 </span>  string_tree<span class="Delimiter">(</span>string_tree* l<span class="Delimiter">,</span> string_tree* r<span class="Delimiter">)</span> :atom<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">),</span> left<span class="Delimiter">(</span>l<span class="Delimiter">),</span> right<span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L103" class="LineNr">103 </span><span class="Delimiter">};</span>
-<span id="L104" class="LineNr">104 </span>
-<span id="L105" class="LineNr">105 </span><span class="Comment">// End type_tree Definition</span>
-<span id="L106" class="LineNr">106 </span><span class="Delimiter">:(code)</span>
-<span id="L107" class="LineNr">107 </span>type_tree::type_tree<span class="Delimiter">(</span>string name<span class="Delimiter">)</span> :atom<span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">),</span> name<span class="Delimiter">(</span>name<span class="Delimiter">),</span> value<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">)),</span> left<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> right<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L108" class="LineNr">108 </span>
-<span id="L109" class="LineNr">109 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L110" class="LineNr">110 </span><span class="Comment">// Locations refer to a common 'memory'. Each location can store a number.</span>
-<span id="L111" class="LineNr">111 </span>map&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">double</span>&gt; Memory<span class="Delimiter">;</span>
-<span id="L112" class="LineNr">112 </span><span class="Delimiter">:(before &quot;End Setup&quot;)</span>
-<span id="L113" class="LineNr">113 </span>Memory<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L114" class="LineNr">114 </span>
-<span id="L115" class="LineNr">115 </span><span class="Delimiter">:(after &quot;Types&quot;)</span>
-<span id="L116" class="LineNr">116 </span><span class="Comment">// Mu types encode how the numbers stored in different parts of memory are</span>
-<span id="L117" class="LineNr">117 </span><span class="Comment">// interpreted. A location tagged as a 'character' type will interpret the</span>
-<span id="L118" class="LineNr">118 </span><span class="Comment">// value 97 as the letter 'a', while a different location of type 'number'</span>
-<span id="L119" class="LineNr">119 </span><span class="Comment">// would not.</span>
-<span id="L120" class="LineNr">120 </span><span class="Comment">//</span>
-<span id="L121" class="LineNr">121 </span><span class="Comment">// Unlike most computers today, Mu stores types in a single big table, shared</span>
-<span id="L122" class="LineNr">122 </span><span class="Comment">// by all the Mu programs on the computer. This is useful in providing a</span>
-<span id="L123" class="LineNr">123 </span><span class="Comment">// seamless experience to help understand arbitrary Mu programs.</span>
-<span id="L124" class="LineNr">124 </span><span class="Normal">typedef</span> <span class="Normal">int</span> <a href='010vm.cc.html#L124'>type_ordinal</a><span class="Delimiter">;</span>
-<span id="L125" class="LineNr">125 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L126" class="LineNr">126 </span>map&lt;string<span class="Delimiter">,</span> type_ordinal&gt; Type_ordinal<span class="Delimiter">;</span>
-<span id="L127" class="LineNr">127 </span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt; Type<span class="Delimiter">;</span>
-<span id="L128" class="LineNr">128 </span><a href='010vm.cc.html#L124'>type_ordinal</a> Next_type_ordinal = <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L129" class="LineNr">129 </span><span class="Delimiter">:(code)</span>
-<span id="L130" class="LineNr">130 </span><span class="Normal">void</span> <a href='010vm.cc.html#L130'>setup_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L131" class="LineNr">131 </span>  Type<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>  Type_ordinal<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L132" class="LineNr">132 </span>  <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L133" class="LineNr">133 </span>  Next_type_ordinal = <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Comment">// Mu Types Initialization</span>
-<span id="L135" class="LineNr">135 </span>  <a href='010vm.cc.html#L124'>type_ordinal</a> number = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
-<span id="L136" class="LineNr">136 </span>  <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> number<span class="Delimiter">).</span>name = <span class="Constant">&quot;number&quot;</span><span class="Delimiter">;</span>
-<span id="L137" class="LineNr">137 </span>  <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;location&quot;</span><span class="Delimiter">,</span> number<span class="Delimiter">);</span>  <span class="Comment">// synonym of number to indicate we only care about its size</span>
-<span id="L138" class="LineNr">138 </span>  <a href='010vm.cc.html#L124'>type_ordinal</a> <a href='043space.cc.html#L76'>address</a> = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
-<span id="L139" class="LineNr">139 </span>  <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> <a href='043space.cc.html#L76'>address</a><span class="Delimiter">).</span>name = <span class="Constant">&quot;address&quot;</span><span class="Delimiter">;</span>
-<span id="L140" class="LineNr">140 </span>  <a href='010vm.cc.html#L124'>type_ordinal</a> boolean = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;boolean&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
-<span id="L141" class="LineNr">141 </span>  <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> boolean<span class="Delimiter">).</span>name = <span class="Constant">&quot;boolean&quot;</span><span class="Delimiter">;</span>
-<span id="L142" class="LineNr">142 </span>  <a href='010vm.cc.html#L124'>type_ordinal</a> character = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;character&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
-<span id="L143" class="LineNr">143 </span>  <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> character<span class="Delimiter">).</span>name = <span class="Constant">&quot;character&quot;</span><span class="Delimiter">;</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Comment">// Array types are a special modifier to any other type. For example,</span>
-<span id="L145" class="LineNr">145 </span>  <span class="Comment">// array:number or array:address:boolean.</span>
-<span id="L146" class="LineNr">146 </span>  <a href='010vm.cc.html#L124'>type_ordinal</a> array = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;array&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
-<span id="L147" class="LineNr">147 </span>  <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> array<span class="Delimiter">).</span>name = <span class="Constant">&quot;array&quot;</span><span class="Delimiter">;</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Comment">// End Mu Types Initialization</span>
-<span id="L149" class="LineNr">149 </span><span class="Delimiter">}</span>
-<span id="L150" class="LineNr">150 </span><span class="Normal">void</span> <a href='010vm.cc.html#L150'>teardown_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt;::iterator p = Type<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type<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="L152" class="LineNr">152 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L153" class="LineNr">153 </span>      p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>elements<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Delimiter">}</span>
-<span id="L155" class="LineNr">155 </span>  Type_ordinal<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L156" class="LineNr">156 </span><span class="Delimiter">}</span>
-<span id="L157" class="LineNr">157 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L158" class="LineNr">158 </span><a href='010vm.cc.html#L130'>setup_types</a><span class="Delimiter">();</span>
-<span id="L159" class="LineNr">159 </span>atexit<span class="Delimiter">(</span><a href='010vm.cc.html#L150'>teardown_types</a><span class="Delimiter">);</span>
-<span id="L160" class="LineNr">160 </span>
-<span id="L161" class="LineNr">161 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L162" class="LineNr">162 </span><span class="Comment">// You can construct arbitrary new types. New types are either 'containers'</span>
-<span id="L163" class="LineNr">163 </span><span class="Comment">// with multiple 'elements' of other types, or 'exclusive containers' containing</span>
-<span id="L164" class="LineNr">164 </span><span class="Comment">// one of multiple 'variants'. (These are similar to C structs and unions,</span>
-<span id="L165" class="LineNr">165 </span><span class="Comment">// respectively, though exclusive containers implicitly include a tag element</span>
-<span id="L166" class="LineNr">166 </span><span class="Comment">// recording which variant they should be interpreted as.)</span>
-<span id="L167" class="LineNr">167 </span><span class="Comment">//</span>
-<span id="L168" class="LineNr">168 </span><span class="Comment">// For example, storing bank balance and name for an account might require a</span>
-<span id="L169" class="LineNr">169 </span><span class="Comment">// container, but if bank accounts may be either for individuals or groups,</span>
-<span id="L170" class="LineNr">170 </span><span class="Comment">// with different properties for each, that may require an exclusive container</span>
-<span id="L171" class="LineNr">171 </span><span class="Comment">// whose variants are individual-account and joint-account containers.</span>
-<span id="L172" class="LineNr">172 </span><span class="Normal">enum</span> <a href='010vm.cc.html#L172'>kind_of_type</a> <span class="Delimiter">{</span>
-<span id="L173" class="LineNr">173 </span>  <a href='010vm.cc.html#L173'>PRIMITIVE</a><span class="Delimiter">,</span>
-<span id="L174" class="LineNr">174 </span>  <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">,</span>
-<span id="L175" class="LineNr">175 </span>  <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a>
-<span id="L176" class="LineNr">176 </span><span class="Delimiter">};</span>
-<span id="L177" class="LineNr">177 </span>
-<span id="L178" class="LineNr">178 </span><span class="Normal">struct</span> type_info <span class="Delimiter">{</span>
-<span id="L179" class="LineNr">179 </span>  string name<span class="Delimiter">;</span>
-<span id="L180" class="LineNr">180 </span>  <a href='010vm.cc.html#L172'>kind_of_type</a> kind<span class="Delimiter">;</span>
-<span id="L181" class="LineNr">181 </span>  vector&lt;reagent&gt; elements<span class="Delimiter">;</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Comment">// End type_info Fields</span>
-<span id="L183" class="LineNr">183 </span>  type_info<span class="Delimiter">()</span> :kind<span class="Delimiter">(</span><a href='010vm.cc.html#L173'>PRIMITIVE</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L184" class="LineNr">184 </span>    <span class="Comment">// End type_info Constructor</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Delimiter">}</span>
-<span id="L186" class="LineNr">186 </span><span class="Delimiter">};</span>
-<span id="L187" class="LineNr">187 </span>
-<span id="L188" class="LineNr">188 </span><span class="Normal">enum</span> <a href='010vm.cc.html#L188'>primitive_recipes</a> <span class="Delimiter">{</span>
-<span id="L189" class="LineNr">189 </span>  <a href='010vm.cc.html#L189'>IDLE</a> = <span class="Constant">0</span><span class="Delimiter">,</span>
-<span id="L190" class="LineNr">190 </span>  <a href='010vm.cc.html#L190'>COPY</a><span class="Delimiter">,</span>
-<span id="L191" class="LineNr">191 </span>  <span class="Comment">// End Primitive Recipe Declarations</span>
-<span id="L192" class="LineNr">192 </span>  <a href='010vm.cc.html#L192'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">,</span>
-<span id="L193" class="LineNr">193 </span><span class="Delimiter">};</span>
-<span id="L194" class="LineNr">194 </span><span class="Delimiter">:(code)</span>
-<span id="L195" class="LineNr">195 </span><span class="Comment">//: It's all very well to construct recipes out of other recipes, but we need</span>
-<span id="L196" class="LineNr">196 </span><span class="Comment">//: to know how to do *something* out of the box. For the following</span>
-<span id="L197" class="LineNr">197 </span><span class="Comment">//: recipes there are only codes, no entries in the book, because Mu just knows</span>
-<span id="L198" class="LineNr">198 </span><span class="Comment">//: what to do for them.</span>
-<span id="L199" class="LineNr">199 </span><span class="Normal">void</span> <a href='010vm.cc.html#L199'>setup_recipes</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L200" class="LineNr">200 </span>  Recipe<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>  Recipe_ordinal<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L201" class="LineNr">201 </span>  <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;idle&quot;</span><span class="Delimiter">,</span> <a href='010vm.cc.html#L189'>IDLE</a><span class="Delimiter">);</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Comment">// Primitive Recipe Numbers</span>
-<span id="L203" class="LineNr">203 </span>  <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;copy&quot;</span><span class="Delimiter">,</span> <a href='010vm.cc.html#L190'>COPY</a><span class="Delimiter">);</span>
-<span id="L204" class="LineNr">204 </span>  <span class="Comment">// End Primitive Recipe Numbers</span>
-<span id="L205" class="LineNr">205 </span><span class="Delimiter">}</span>
-<span id="L206" class="LineNr">206 </span><span class="Comment">//: We could just reset the recipe table after every test, but that gets slow</span>
-<span id="L207" class="LineNr">207 </span><span class="Comment">//: all too quickly. Instead, initialize the common stuff just once at</span>
-<span id="L208" class="LineNr">208 </span><span class="Comment">//: startup. Later layers will carefully undo each test's additions after</span>
-<span id="L209" class="LineNr">209 </span><span class="Comment">//: itself.</span>
-<span id="L210" class="LineNr">210 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L211" class="LineNr">211 </span><a href='010vm.cc.html#L199'>setup_recipes</a><span class="Delimiter">();</span>
-<span id="L212" class="LineNr">212 </span>assert<span class="Delimiter">(</span><a href='010vm.cc.html#L192'>MAX_PRIMITIVE_RECIPES</a> &lt; <span class="Constant">200</span><span class="Delimiter">);</span>  <span class="Comment">// level 0 is primitives; until 199</span>
-<span id="L213" class="LineNr">213 </span>Next_recipe_ordinal = <span class="Constant">200</span><span class="Delimiter">;</span>
-<span id="L214" class="LineNr">214 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">,</span> Next_recipe_ordinal++<span class="Delimiter">);</span>
-<span id="L215" class="LineNr">215 </span><span class="Comment">// End Load Recipes</span>
-<span id="L216" class="LineNr">216 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
-<span id="L217" class="LineNr">217 </span>assert<span class="Delimiter">(</span>Next_recipe_ordinal &lt; <span class="Constant">1000</span><span class="Delimiter">);</span>  <span class="Comment">// recipes being tested didn't overflow into test space</span>
-<span id="L218" class="LineNr">218 </span><span class="Delimiter">:(before &quot;End Setup&quot;)</span>
-<span id="L219" class="LineNr">219 </span>Next_recipe_ordinal = <span class="Constant">1000</span><span class="Delimiter">;</span>  <span class="Comment">// consistent new numbers for each test</span>
-<span id="L220" class="LineNr">220 </span>
-<span id="L221" class="LineNr">221 </span><span class="Comment">//: One final detail: tests can modify our global tables of recipes and types,</span>
-<span id="L222" class="LineNr">222 </span><span class="Comment">//: so we need some way to clean up after each test is done so it doesn't</span>
-<span id="L223" class="LineNr">223 </span><span class="Comment">//: influence later ones.</span>
-<span id="L224" class="LineNr">224 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L225" class="LineNr">225 </span>map&lt;string<span class="Delimiter">,</span> recipe_ordinal&gt; Recipe_ordinal_snapshot<span class="Delimiter">;</span>
-<span id="L226" class="LineNr">226 </span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe&gt; Recipe_snapshot<span class="Delimiter">;</span>
-<span id="L227" class="LineNr">227 </span>map&lt;string<span class="Delimiter">,</span> type_ordinal&gt; Type_ordinal_snapshot<span class="Delimiter">;</span>
-<span id="L228" class="LineNr">228 </span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt; Type_snapshot<span class="Delimiter">;</span>
-<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L230" class="LineNr">230 </span>save_snapshots<span class="Delimiter">();</span>
-<span id="L231" class="LineNr">231 </span><span class="Delimiter">:(before &quot;End Setup&quot;)</span>
-<span id="L232" class="LineNr">232 </span>restore_snapshots<span class="Delimiter">();</span>
-<span id="L233" class="LineNr">233 </span>
-<span id="L234" class="LineNr">234 </span><span class="Delimiter">:(code)</span>
-<span id="L235" class="LineNr">235 </span><span class="Normal">void</span> save_snapshots<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L236" class="LineNr">236 </span>  Recipe_ordinal_snapshot = Recipe_ordinal<span class="Delimiter">;</span>
-<span id="L237" class="LineNr">237 </span>  Recipe_snapshot = Recipe<span class="Delimiter">;</span>
-<span id="L238" class="LineNr">238 </span>  Type_ordinal_snapshot = Type_ordinal<span class="Delimiter">;</span>
-<span id="L239" class="LineNr">239 </span>  Type_snapshot = Type<span class="Delimiter">;</span>
-<span id="L240" class="LineNr">240 </span>  <span class="Comment">// End save_snapshots</span>
-<span id="L241" class="LineNr">241 </span><span class="Delimiter">}</span>
-<span id="L242" class="LineNr">242 </span>
-<span id="L243" class="LineNr">243 </span><span class="Normal">void</span> restore_snapshots<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L244" class="LineNr">244 </span>  Recipe = Recipe_snapshot<span class="Delimiter">;</span>
-<span id="L245" class="LineNr">245 </span>  Recipe_ordinal = Recipe_ordinal_snapshot<span class="Delimiter">;</span>
-<span id="L246" class="LineNr">246 </span>  restore_non_recipe_snapshots<span class="Delimiter">();</span>
-<span id="L247" class="LineNr">247 </span><span class="Delimiter">}</span>
-<span id="L248" class="LineNr">248 </span><span class="Comment">// when running sandboxes in the edit/ app we'll want to restore everything except recipes defined in the app</span>
-<span id="L249" class="LineNr">249 </span><span class="Normal">void</span> restore_non_recipe_snapshots<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L250" class="LineNr">250 </span>  Type_ordinal = Type_ordinal_snapshot<span class="Delimiter">;</span>
-<span id="L251" class="LineNr">251 </span>  Type = Type_snapshot<span class="Delimiter">;</span>
-<span id="L252" class="LineNr">252 </span>  <span class="Comment">// End restore_snapshots</span>
-<span id="L253" class="LineNr">253 </span><span class="Delimiter">}</span>
-<span id="L254" class="LineNr">254 </span>
-<span id="L255" class="LineNr">255 </span><span class="SalientComment">//:: Helpers</span>
-<span id="L256" class="LineNr">256 </span>
-<span id="L257" class="LineNr">257 </span><span class="Delimiter">:(code)</span>
-<span id="L258" class="LineNr">258 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span>::<a href='010vm.cc.html#L19'>recipe</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L259" class="LineNr">259 </span>  <span class="Comment">// End recipe Constructor</span>
-<span id="L260" class="LineNr">260 </span><span class="Delimiter">}</span>
-<span id="L261" class="LineNr">261 </span>
-<span id="L262" class="LineNr">262 </span><a href='010vm.cc.html#L32'>instruction</a>::<a href='010vm.cc.html#L32'>instruction</a><span class="Delimiter">()</span> :is_label<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">),</span> operation<span class="Delimiter">(</span><a href='010vm.cc.html#L189'>IDLE</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L263" class="LineNr">263 </span>  <span class="Comment">// End instruction Constructor</span>
-<span id="L264" class="LineNr">264 </span><span class="Delimiter">}</span>
-<span id="L265" class="LineNr">265 </span><span class="Normal">void</span> <a href='010vm.cc.html#L32'>instruction</a>::<a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> is_label=<span class="Constant">false</span><span class="Delimiter">;</span>  label<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>  name<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>  old_name<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>  operation=IDLE<span class="Delimiter">;</span>  ingredients<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>  products<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>  original_string<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> <span class="Delimiter">}</span>
-<span id="L266" class="LineNr">266 </span><span class="Normal">bool</span> <a href='010vm.cc.html#L32'>instruction</a>::is_empty<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Identifier">return</span> !is_label &amp;&amp; name<span class="Delimiter">.</span>empty<span class="Delimiter">();</span> <span class="Delimiter">}</span>
-<span id="L267" class="LineNr">267 </span>
-<span id="L268" class="LineNr">268 </span><span class="Comment">// Reagents have the form &lt;name&gt;:&lt;type&gt;:&lt;type&gt;:.../&lt;property&gt;/&lt;property&gt;/...</span>
-<span id="L269" class="LineNr">269 </span>reagent::reagent<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> :original_string<span class="Delimiter">(</span>s<span class="Delimiter">),</span> type<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> value<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> initialized<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L270" class="LineNr">270 </span>  <span class="Comment">// Parsing reagent(string s)</span>
-<span id="L271" class="LineNr">271 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L272" class="LineNr">272 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Comment">// name and type</span>
-<span id="L274" class="LineNr">274 </span>  istringstream first_row<span class="Delimiter">(</span>slurp_until<span class="Delimiter">(</span>in<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">));</span>
-<span id="L275" class="LineNr">275 </span>  first_row &gt;&gt; std::noskipws<span class="Delimiter">;</span>
-<span id="L276" class="LineNr">276 </span>  name = slurp_until<span class="Delimiter">(</span>first_row<span class="Delimiter">,</span> <span class="Constant">':'</span><span class="Delimiter">);</span>
-<span id="L277" class="LineNr">277 </span>  string_tree* type_names = parse_property_list<span class="Delimiter">(</span>first_row<span class="Delimiter">);</span>
-<span id="L278" class="LineNr">278 </span>  <span class="Comment">// End Parsing Reagent Type Property(type_names)</span>
-<span id="L279" class="LineNr">279 </span>  type = <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>type_names<span class="Delimiter">);</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Normal">delete</span> type_names<span class="Delimiter">;</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Comment">// special cases</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L86'>is_integer</a><span class="Delimiter">(</span>name<span class="Delimiter">)</span> &amp;&amp; type == <span class="Constant">NULL</span><span class="Delimiter">)</span>
-<span id="L283" class="LineNr">283 </span>    type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;literal&quot;</span><span class="Delimiter">);</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>name == <span class="Constant">&quot;_&quot;</span> &amp;&amp; type == <span class="Constant">NULL</span><span class="Delimiter">)</span>
-<span id="L285" class="LineNr">285 </span>    type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;literal&quot;</span><span class="Delimiter">);</span>
-<span id="L286" class="LineNr">286 </span>  <span class="Comment">// other properties</span>
-<span id="L287" class="LineNr">287 </span>  slurp_properties<span class="Delimiter">(</span>in<span class="Delimiter">,</span> properties<span class="Delimiter">);</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Comment">// End Parsing reagent</span>
-<span id="L289" class="LineNr">289 </span><span class="Delimiter">}</span>
-<span id="L290" class="LineNr">290 </span>
-<span id="L291" class="LineNr">291 </span><span class="Normal">void</span> slurp_properties<span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">,</span> vector&lt;pair&lt;string<span class="Delimiter">,</span> string_tree*&gt; &gt;&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L292" class="LineNr">292 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L293" class="LineNr">293 </span>    istringstream row<span class="Delimiter">(</span>slurp_until<span class="Delimiter">(</span>in<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">));</span>
-<span id="L294" class="LineNr">294 </span>    row &gt;&gt; std::noskipws<span class="Delimiter">;</span>
-<span id="L295" class="LineNr">295 </span>    string key = slurp_until<span class="Delimiter">(</span>row<span class="Delimiter">,</span> <span class="Constant">':'</span><span class="Delimiter">);</span>
-<span id="L296" class="LineNr">296 </span>    string_tree* value = parse_property_list<span class="Delimiter">(</span>row<span class="Delimiter">);</span>
-<span id="L297" class="LineNr">297 </span>    out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span>key<span class="Delimiter">,</span> value<span class="Delimiter">));</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Delimiter">}</span>
-<span id="L299" class="LineNr">299 </span><span class="Delimiter">}</span>
-<span id="L300" class="LineNr">300 </span>
-<span id="L301" class="LineNr">301 </span>string_tree* parse_property_list<span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L302" class="LineNr">302 </span>  skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L304" class="LineNr">304 </span>  string_tree* first = <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>slurp_until<span class="Delimiter">(</span>in<span class="Delimiter">,</span> <span class="Constant">':'</span><span class="Delimiter">));</span>
-<span id="L305" class="LineNr">305 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">return</span> first<span class="Delimiter">;</span>
-<span id="L306" class="LineNr">306 </span>  string_tree* rest = parse_property_list<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; rest<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
-<span id="L308" class="LineNr">308 </span>    <span class="Identifier">return</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>first<span class="Delimiter">,</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>rest<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L309" class="LineNr">309 </span>  <span class="Identifier">return</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>first<span class="Delimiter">,</span> rest<span class="Delimiter">);</span>
-<span id="L310" class="LineNr">310 </span><span class="Delimiter">}</span>
-<span id="L311" class="LineNr">311 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L312" class="LineNr">312 </span><span class="Normal">void</span> test_parse_property_list_atom<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L313" class="LineNr">313 </span>  istringstream in<span class="Delimiter">(</span><span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L314" class="LineNr">314 </span>  string_tree* x = parse_property_list<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L315" class="LineNr">315 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Normal">delete</span> x<span class="Delimiter">;</span>
-<span id="L317" class="LineNr">317 </span><span class="Delimiter">}</span>
-<span id="L318" class="LineNr">318 </span><span class="Normal">void</span> test_parse_property_list_list<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L319" class="LineNr">319 </span>  istringstream in<span class="Delimiter">(</span><span class="Constant">&quot;a:b&quot;</span><span class="Delimiter">);</span>
-<span id="L320" class="LineNr">320 </span>  string_tree* x = parse_property_list<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L321" class="LineNr">321 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L322" class="LineNr">322 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L323" class="LineNr">323 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value<span class="Delimiter">,</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L324" class="LineNr">324 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!x<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L325" class="LineNr">325 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L326" class="LineNr">326 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value<span class="Delimiter">,</span> <span class="Constant">&quot;b&quot;</span><span class="Delimiter">);</span>
-<span id="L327" class="LineNr">327 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right == <span class="Constant">NULL</span><span class="Delimiter">);</span>
-<span id="L328" class="LineNr">328 </span>  <span class="Normal">delete</span> x<span class="Delimiter">;</span>
-<span id="L329" class="LineNr">329 </span><span class="Delimiter">}</span>
-<span id="L330" class="LineNr">330 </span>
-<span id="L331" class="LineNr">331 </span><span class="Delimiter">:(code)</span>
-<span id="L332" class="LineNr">332 </span>type_tree* <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span><span class="Normal">const</span> string_tree* properties<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L333" class="LineNr">333 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!properties<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L334" class="LineNr">334 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L335" class="LineNr">335 </span>    <span class="Normal">const</span> string&amp; type_name = properties<span class="Delimiter">-&gt;</span>value<span class="Delimiter">;</span>
-<span id="L336" class="LineNr">336 </span>    <span class="Normal">int</span> value = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L337" class="LineNr">337 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type_name<span class="Delimiter">))</span>
-<span id="L338" class="LineNr">338 </span>      value = get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type_name<span class="Delimiter">);</span>
-<span id="L339" class="LineNr">339 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L86'>is_integer</a><span class="Delimiter">(</span>type_name<span class="Delimiter">))</span>  <span class="Comment">// sometimes types will contain non-type tags, like numbers for the size of an array</span>
-<span id="L340" class="LineNr">340 </span>      value = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L341" class="LineNr">341 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">-&gt;</span>value == <span class="Constant">&quot;-&gt;&quot;</span><span class="Delimiter">)</span>  <span class="Comment">// used in recipe types</span>
-<span id="L342" class="LineNr">342 </span>      value = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L343" class="LineNr">343 </span>    <span class="Normal">else</span>
-<span id="L344" class="LineNr">344 </span>      value = -<span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// should never happen; will trigger errors later</span>
-<span id="L345" class="LineNr">345 </span>    <span class="Identifier">return</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>type_name<span class="Delimiter">,</span> value<span class="Delimiter">);</span>
-<span id="L346" class="LineNr">346 </span>  <span class="Delimiter">}</span>
-<span id="L347" class="LineNr">347 </span>  <span class="Identifier">return</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>properties<span class="Delimiter">-&gt;</span>left<span class="Delimiter">),</span>
-<span id="L348" class="LineNr">348 </span>                       <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>properties<span class="Delimiter">-&gt;</span>right<span class="Delimiter">));</span>
-<span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span>
-<span id="L350" class="LineNr">350 </span>
-<span id="L351" class="LineNr">351 </span><span class="Comment">//: avoid memory leaks for the type tree</span>
-<span id="L352" class="LineNr">352 </span>
-<span id="L353" class="LineNr">353 </span>reagent::reagent<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L354" class="LineNr">354 </span>  original_string = other<span class="Delimiter">.</span>original_string<span class="Delimiter">;</span>
-<span id="L355" class="LineNr">355 </span>  name = other<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
-<span id="L356" class="LineNr">356 </span>  value = other<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
-<span id="L357" class="LineNr">357 </span>  initialized = other<span class="Delimiter">.</span>initialized<span class="Delimiter">;</span>
-<span id="L358" class="LineNr">358 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L359" class="LineNr">359 </span>    properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first<span class="Delimiter">,</span>
-<span id="L360" class="LineNr">360 </span>                                                    other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second ? <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>*other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L361" class="LineNr">361 </span>  <span class="Delimiter">}</span>
-<span id="L362" class="LineNr">362 </span>  type = other<span class="Delimiter">.</span>type ? <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*other<span class="Delimiter">.</span>type<span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Comment">// End reagent Copy Constructor</span>
-<span id="L364" class="LineNr">364 </span><span class="Delimiter">}</span>
-<span id="L365" class="LineNr">365 </span>
-<span id="L366" class="LineNr">366 </span>type_tree::type_tree<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; original<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L367" class="LineNr">367 </span>  atom = original<span class="Delimiter">.</span>atom<span class="Delimiter">;</span>
-<span id="L368" class="LineNr">368 </span>  name = original<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
-<span id="L369" class="LineNr">369 </span>  value = original<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
-<span id="L370" class="LineNr">370 </span>  left = original<span class="Delimiter">.</span>left ? <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*original<span class="Delimiter">.</span>left<span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L371" class="LineNr">371 </span>  right = original<span class="Delimiter">.</span>right ? <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*original<span class="Delimiter">.</span>right<span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L372" class="LineNr">372 </span><span class="Delimiter">}</span>
-<span id="L373" class="LineNr">373 </span>
-<span id="L374" class="LineNr">374 </span>type_tree&amp; type_tree::<span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; original<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L375" class="LineNr">375 </span>  atom = original<span class="Delimiter">.</span>atom<span class="Delimiter">;</span>
-<span id="L376" class="LineNr">376 </span>  name = original<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
-<span id="L377" class="LineNr">377 </span>  value = original<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
-<span id="L378" class="LineNr">378 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>left<span class="Delimiter">)</span> <span class="Normal">delete</span> left<span class="Delimiter">;</span>
-<span id="L379" class="LineNr">379 </span>  left = original<span class="Delimiter">.</span>left ? <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*original<span class="Delimiter">.</span>left<span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L380" class="LineNr">380 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>right<span class="Delimiter">)</span> <span class="Normal">delete</span> right<span class="Delimiter">;</span>
-<span id="L381" class="LineNr">381 </span>  right = original<span class="Delimiter">.</span>right ? <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*original<span class="Delimiter">.</span>right<span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L382" class="LineNr">382 </span>  <span class="Identifier">return</span> *<span class="Normal">this</span><span class="Delimiter">;</span>
-<span id="L383" class="LineNr">383 </span><span class="Delimiter">}</span>
-<span id="L384" class="LineNr">384 </span>
-<span id="L385" class="LineNr">385 </span><span class="Normal">bool</span> type_tree::<span class="Normal">operator</span>==<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
-<span id="L386" class="LineNr">386 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>atom != other<span class="Delimiter">.</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L387" class="LineNr">387 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>atom<span class="Delimiter">)</span>
-<span id="L388" class="LineNr">388 </span>    <span class="Identifier">return</span> name == other<span class="Delimiter">.</span>name &amp;&amp; value == other<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Identifier">return</span> <span class="Delimiter">(</span>left == other<span class="Delimiter">.</span>left || *left == *other<span class="Delimiter">.</span>left<span class="Delimiter">)</span>
-<span id="L390" class="LineNr">390 </span>      &amp;&amp; <span class="Delimiter">(</span>right == other<span class="Delimiter">.</span>right || *right == *other<span class="Delimiter">.</span>right<span class="Delimiter">);</span>
-<span id="L391" class="LineNr">391 </span><span class="Delimiter">}</span>
-<span id="L392" class="LineNr">392 </span>
-<span id="L393" class="LineNr">393 </span><span class="Comment">// only constraint we care about: if a &lt; b then !(b &lt; a)</span>
-<span id="L394" class="LineNr">394 </span><span class="Normal">bool</span> type_tree::<span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>atom != other<span class="Delimiter">.</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> atom &gt; other<span class="Delimiter">.</span>atom<span class="Delimiter">;</span>  <span class="Comment">// atoms before non-atoms</span>
-<span id="L396" class="LineNr">396 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> name &lt; other<span class="Delimiter">.</span>name<span class="Delimiter">;</span>  <span class="Comment">// sort atoms in lexical order</span>
-<span id="L397" class="LineNr">397 </span>  <span class="Comment">// first location in one that's missing in the other makes that side 'smaller'</span>
-<span id="L398" class="LineNr">398 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>left &amp;&amp; !other<span class="Delimiter">.</span>left<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L399" class="LineNr">399 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!left &amp;&amp; other<span class="Delimiter">.</span>left<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L400" class="LineNr">400 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>right &amp;&amp; !other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L401" class="LineNr">401 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!right &amp;&amp; other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L402" class="LineNr">402 </span>  <span class="Comment">// now if either pointer is unequal neither side can be null</span>
-<span id="L403" class="LineNr">403 </span>  <span class="Comment">// if one side is equal that's easy</span>
-<span id="L404" class="LineNr">404 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>left == other<span class="Delimiter">.</span>left || *left == *other<span class="Delimiter">.</span>left<span class="Delimiter">)</span> <span class="Identifier">return</span> right &amp;&amp; *right &lt; *other<span class="Delimiter">.</span>right<span class="Delimiter">;</span>
-<span id="L405" class="LineNr">405 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>right == other<span class="Delimiter">.</span>right || *right == *other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> <span class="Identifier">return</span> left &amp;&amp; *left &lt; *other<span class="Delimiter">.</span>left<span class="Delimiter">;</span>
-<span id="L406" class="LineNr">406 </span>  <span class="Comment">// if the two sides criss-cross, pick the side with the smaller lhs</span>
-<span id="L407" class="LineNr">407 </span>  <span class="Normal">if</span> <span class="Delimiter">((</span>left == other<span class="Delimiter">.</span>right || *left == *other<span class="Delimiter">.</span>right<span class="Delimiter">)</span>
-<span id="L408" class="LineNr">408 </span>      &amp;&amp; <span class="Delimiter">(</span>right == other<span class="Delimiter">.</span>left || *right == *other<span class="Delimiter">.</span>left<span class="Delimiter">))</span>
-<span id="L409" class="LineNr">409 </span>    <span class="Identifier">return</span> *left &lt; *other<span class="Delimiter">.</span>left<span class="Delimiter">;</span>
-<span id="L410" class="LineNr">410 </span>  <span class="Comment">// now the hard case: both sides are not equal</span>
-<span id="L411" class="LineNr">411 </span>  <span class="Comment">// make sure we stay consistent between (a &lt; b) and (b &lt; a)</span>
-<span id="L412" class="LineNr">412 </span>  <span class="Comment">// just return the side with the smallest of the 4 branches</span>
-<span id="L413" class="LineNr">413 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>*left &lt; *other<span class="Delimiter">.</span>left &amp;&amp; *left &lt; *other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L414" class="LineNr">414 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>*right &lt; *other<span class="Delimiter">.</span>left &amp;&amp; *right &lt; *other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L415" class="LineNr">415 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L416" class="LineNr">416 </span><span class="Delimiter">}</span>
-<span id="L417" class="LineNr">417 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L418" class="LineNr">418 </span><span class="Comment">// These unit tests don't always use valid types.</span>
-<span id="L419" class="LineNr">419 </span><span class="Normal">void</span> test_compare_atom_types<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L420" class="LineNr">420 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean&quot;</span><span class="Delimiter">);</span>
-<span id="L421" class="LineNr">421 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L422" class="LineNr">422 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L36" class="LineNr"> 36 </span>  string original_string<span class="Delimiter">;</span>  <span class="Comment">// for error messages</span>
+<span id="L37" class="LineNr"> 37 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> operation<span class="Delimiter">;</span>  <span class="Comment">// get(Recipe_ordinal, name)</span>
+<span id="L38" class="LineNr"> 38 </span>  vector&lt;reagent&gt; ingredients<span class="Delimiter">;</span>  <span class="Comment">// only if !is_label</span>
+<span id="L39" class="LineNr"> 39 </span>  vector&lt;reagent&gt; products<span class="Delimiter">;</span>  <span class="Comment">// only if !is_label</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="Comment">// End instruction Fields</span>
+<span id="L41" class="LineNr"> 41 </span>  <a href='010vm.cc.html#L32'>instruction</a><span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>  <span class="Normal">void</span> <a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="Normal">bool</span> is_empty<span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Delimiter">};</span>
+<span id="L45" class="LineNr"> 45 </span>
+<span id="L46" class="LineNr"> 46 </span><span class="Delimiter">:(before &quot;struct instruction&quot;)</span>
+<span id="L47" class="LineNr"> 47 </span><span class="Comment">// Ingredients and products are a single species -- a reagent. Reagents refer</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Comment">// either to numbers or to locations in memory along with 'type' tags telling</span>
+<span id="L49" class="LineNr"> 49 </span><span class="Comment">// us how to interpret them. They also can contain arbitrary other lists of</span>
+<span id="L50" class="LineNr"> 50 </span><span class="Comment">// properties besides types, but we're getting ahead of ourselves.</span>
+<span id="L51" class="LineNr"> 51 </span><span class="Normal">struct</span> reagent <span class="Delimiter">{</span>
+<span id="L52" class="LineNr"> 52 </span>  string original_string<span class="Delimiter">;</span>
+<span id="L53" class="LineNr"> 53 </span>  string name<span class="Delimiter">;</span>
+<span id="L54" class="LineNr"> 54 </span>  type_tree* type<span class="Delimiter">;</span>
+<span id="L55" class="LineNr"> 55 </span>  vector&lt;pair&lt;string<span class="Delimiter">,</span> string_tree*&gt; &gt; properties<span class="Delimiter">;</span>  <span class="Comment">// can't be a map because the string_tree sometimes needs to be NULL, which can be confusing</span>
+<span id="L56" class="LineNr"> 56 </span>  <span class="Normal">double</span> value<span class="Delimiter">;</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Normal">bool</span> initialized<span class="Delimiter">;</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Comment">// End reagent Fields</span>
+<span id="L59" class="LineNr"> 59 </span>  reagent<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">);</span>
+<span id="L60" class="LineNr"> 60 </span>  reagent<span class="Delimiter">()</span> :type<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> value<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> initialized<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L61" class="LineNr"> 61 </span>  ~reagent<span class="Delimiter">();</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">void</span> <a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L63" class="LineNr"> 63 </span>  reagent<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; original<span class="Delimiter">);</span>
+<span id="L64" class="LineNr"> 64 </span>  reagent&amp; <span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; original<span class="Delimiter">);</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Normal">void</span> <a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><span class="Normal">double</span> v<span class="Delimiter">)</span> <span class="Delimiter">{</span> value = v<span class="Delimiter">;</span>  initialized = <span class="Constant">true</span><span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Delimiter">};</span>
+<span id="L67" class="LineNr"> 67 </span>
+<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;struct reagent&quot;)</span>
+<span id="L69" class="LineNr"> 69 </span><span class="Comment">// Types can range from a simple type ordinal, to arbitrarily complex trees of</span>
+<span id="L70" class="LineNr"> 70 </span><span class="Comment">// type parameters, like (map (address array character) (list number))</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Normal">struct</span> type_tree <span class="Delimiter">{</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">bool</span> atom<span class="Delimiter">;</span>
+<span id="L73" class="LineNr"> 73 </span>  string name<span class="Delimiter">;</span>  <span class="Comment">// only if atom</span>
+<span id="L74" class="LineNr"> 74 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> value<span class="Delimiter">;</span>  <span class="Comment">// only if atom</span>
+<span id="L75" class="LineNr"> 75 </span>  type_tree* left<span class="Delimiter">;</span>  <span class="Comment">// only if !atom</span>
+<span id="L76" class="LineNr"> 76 </span>  type_tree* right<span class="Delimiter">;</span>  <span class="Comment">// only if !atom</span>
+<span id="L77" class="LineNr"> 77 </span>  ~type_tree<span class="Delimiter">();</span>
+<span id="L78" class="LineNr"> 78 </span>  type_tree<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; original<span class="Delimiter">);</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Comment">// atomic type ordinal</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Normal">explicit</span> type_tree<span class="Delimiter">(</span>string name<span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>  type_tree<span class="Delimiter">(</span>string name<span class="Delimiter">,</span> <a href='010vm.cc.html#L123'>type_ordinal</a> v<span class="Delimiter">)</span> :atom<span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">),</span> name<span class="Delimiter">(</span>name<span class="Delimiter">),</span> value<span class="Delimiter">(</span>v<span class="Delimiter">),</span> left<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> right<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Comment">// tree of type ordinals</span>
+<span id="L83" class="LineNr"> 83 </span>  type_tree<span class="Delimiter">(</span>type_tree* l<span class="Delimiter">,</span> type_tree* r<span class="Delimiter">)</span> :atom<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">),</span> value<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> left<span class="Delimiter">(</span>l<span class="Delimiter">),</span> right<span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L84" class="LineNr"> 84 </span>  type_tree&amp; <span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; original<span class="Delimiter">);</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Normal">bool</span> <span class="Normal">operator</span>==<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span><span class="Delimiter">;</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="Normal">bool</span> <span class="Normal">operator</span>!=<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span> <span class="Delimiter">{</span> <span class="Identifier">return</span> !<span class="Normal">operator</span>==<span class="Delimiter">(</span>other<span class="Delimiter">);</span> <span class="Delimiter">}</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span><span class="Delimiter">;</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Normal">bool</span> <span class="Normal">operator</span>&gt;<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span> <span class="Delimiter">{</span> <span class="Identifier">return</span> other<span class="Delimiter">.</span><span class="Normal">operator</span>&lt;<span class="Delimiter">(</span>*<span class="Normal">this</span><span class="Delimiter">);</span> <span class="Delimiter">}</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">};</span>
+<span id="L90" class="LineNr"> 90 </span>
+<span id="L91" class="LineNr"> 91 </span><span class="Normal">struct</span> string_tree <span class="Delimiter">{</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">bool</span> atom<span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span>  string value<span class="Delimiter">;</span>  <span class="Comment">// only if atom</span>
+<span id="L94" class="LineNr"> 94 </span>  string_tree* left<span class="Delimiter">;</span>  <span class="Comment">// only if !atom</span>
+<span id="L95" class="LineNr"> 95 </span>  string_tree* right<span class="Delimiter">;</span>  <span class="Comment">// only if !atom</span>
+<span id="L96" class="LineNr"> 96 </span>  ~string_tree<span class="Delimiter">();</span>
+<span id="L97" class="LineNr"> 97 </span>  string_tree<span class="Delimiter">(</span><span class="Normal">const</span> string_tree&amp; original<span class="Delimiter">);</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Comment">// atomic string</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Normal">explicit</span> string_tree<span class="Delimiter">(</span>string v<span class="Delimiter">)</span> :atom<span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">),</span> value<span class="Delimiter">(</span>v<span class="Delimiter">),</span> left<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> right<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Comment">// tree of strings</span>
+<span id="L101" class="LineNr">101 </span>  string_tree<span class="Delimiter">(</span>string_tree* l<span class="Delimiter">,</span> string_tree* r<span class="Delimiter">)</span> :atom<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">),</span> left<span class="Delimiter">(</span>l<span class="Delimiter">),</span> right<span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L102" class="LineNr">102 </span><span class="Delimiter">};</span>
+<span id="L103" class="LineNr">103 </span>
+<span id="L104" class="LineNr">104 </span><span class="Comment">// End type_tree Definition</span>
+<span id="L105" class="LineNr">105 </span><span class="Delimiter">:(code)</span>
+<span id="L106" class="LineNr">106 </span>type_tree::type_tree<span class="Delimiter">(</span>string name<span class="Delimiter">)</span> :atom<span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">),</span> name<span class="Delimiter">(</span>name<span class="Delimiter">),</span> value<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">)),</span> left<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> right<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L107" class="LineNr">107 </span>
+<span id="L108" class="LineNr">108 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L109" class="LineNr">109 </span><span class="Comment">// Locations refer to a common 'memory'. Each location can store a number.</span>
+<span id="L110" class="LineNr">110 </span>map&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">double</span>&gt; Memory<span class="Delimiter">;</span>
+<span id="L111" class="LineNr">111 </span><span class="Delimiter">:(before &quot;End Setup&quot;)</span>
+<span id="L112" class="LineNr">112 </span>Memory<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L113" class="LineNr">113 </span>
+<span id="L114" class="LineNr">114 </span><span class="Delimiter">:(after &quot;Types&quot;)</span>
+<span id="L115" class="LineNr">115 </span><span class="Comment">// Mu types encode how the numbers stored in different parts of memory are</span>
+<span id="L116" class="LineNr">116 </span><span class="Comment">// interpreted. A location tagged as a 'character' type will interpret the</span>
+<span id="L117" class="LineNr">117 </span><span class="Comment">// value 97 as the letter 'a', while a different location of type 'number'</span>
+<span id="L118" class="LineNr">118 </span><span class="Comment">// would not.</span>
+<span id="L119" class="LineNr">119 </span><span class="Comment">//</span>
+<span id="L120" class="LineNr">120 </span><span class="Comment">// Unlike most computers today, Mu stores types in a single big table, shared</span>
+<span id="L121" class="LineNr">121 </span><span class="Comment">// by all the Mu programs on the computer. This is useful in providing a</span>
+<span id="L122" class="LineNr">122 </span><span class="Comment">// seamless experience to help understand arbitrary Mu programs.</span>
+<span id="L123" class="LineNr">123 </span><span class="Normal">typedef</span> <span class="Normal">int</span> <a href='010vm.cc.html#L123'>type_ordinal</a><span class="Delimiter">;</span>
+<span id="L124" class="LineNr">124 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L125" class="LineNr">125 </span>map&lt;string<span class="Delimiter">,</span> type_ordinal&gt; Type_ordinal<span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt; Type<span class="Delimiter">;</span>
+<span id="L127" class="LineNr">127 </span><a href='010vm.cc.html#L123'>type_ordinal</a> Next_type_ordinal = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span><span class="Delimiter">:(code)</span>
+<span id="L129" class="LineNr">129 </span><span class="Normal">void</span> <a href='010vm.cc.html#L129'>setup_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L130" class="LineNr">130 </span>  Type<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>  Type_ordinal<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L131" class="LineNr">131 </span>  <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>  Next_type_ordinal = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Comment">// Mu Types Initialization</span>
+<span id="L134" class="LineNr">134 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> number = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
+<span id="L135" class="LineNr">135 </span>  <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> number<span class="Delimiter">).</span>name = <span class="Constant">&quot;number&quot;</span><span class="Delimiter">;</span>
+<span id="L136" class="LineNr">136 </span>  <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;location&quot;</span><span class="Delimiter">,</span> number<span class="Delimiter">);</span>  <span class="Comment">// synonym of number to indicate we only care about its size</span>
+<span id="L137" class="LineNr">137 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> <a href='043space.cc.html#L76'>address</a> = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
+<span id="L138" class="LineNr">138 </span>  <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> <a href='043space.cc.html#L76'>address</a><span class="Delimiter">).</span>name = <span class="Constant">&quot;address&quot;</span><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> boolean = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;boolean&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
+<span id="L140" class="LineNr">140 </span>  <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> boolean<span class="Delimiter">).</span>name = <span class="Constant">&quot;boolean&quot;</span><span class="Delimiter">;</span>
+<span id="L141" class="LineNr">141 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> character = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;character&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
+<span id="L142" class="LineNr">142 </span>  <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> character<span class="Delimiter">).</span>name = <span class="Constant">&quot;character&quot;</span><span class="Delimiter">;</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Comment">// Array types are a special modifier to any other type. For example,</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Comment">// array:number or array:address:boolean.</span>
+<span id="L145" class="LineNr">145 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> array = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;array&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>  <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> array<span class="Delimiter">).</span>name = <span class="Constant">&quot;array&quot;</span><span class="Delimiter">;</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Comment">// End Mu Types Initialization</span>
+<span id="L148" class="LineNr">148 </span><span class="Delimiter">}</span>
+<span id="L149" class="LineNr">149 </span><span class="Normal">void</span> <a href='010vm.cc.html#L149'>teardown_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt;::iterator p = Type<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type<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="L151" class="LineNr">151 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L152" class="LineNr">152 </span>      p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>elements<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Delimiter">}</span>
+<span id="L154" class="LineNr">154 </span>  Type_ordinal<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L155" class="LineNr">155 </span><span class="Delimiter">}</span>
+<span id="L156" class="LineNr">156 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L157" class="LineNr">157 </span><a href='010vm.cc.html#L129'>setup_types</a><span class="Delimiter">();</span>
+<span id="L158" class="LineNr">158 </span>atexit<span class="Delimiter">(</span><a href='010vm.cc.html#L149'>teardown_types</a><span class="Delimiter">);</span>
+<span id="L159" class="LineNr">159 </span>
+<span id="L160" class="LineNr">160 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L161" class="LineNr">161 </span><span class="Comment">// You can construct arbitrary new types. New types are either 'containers'</span>
+<span id="L162" class="LineNr">162 </span><span class="Comment">// with multiple 'elements' of other types, or 'exclusive containers' containing</span>
+<span id="L163" class="LineNr">163 </span><span class="Comment">// one of multiple 'variants'. (These are similar to C structs and unions,</span>
+<span id="L164" class="LineNr">164 </span><span class="Comment">// respectively, though exclusive containers implicitly include a tag element</span>
+<span id="L165" class="LineNr">165 </span><span class="Comment">// recording which variant they should be interpreted as.)</span>
+<span id="L166" class="LineNr">166 </span><span class="Comment">//</span>
+<span id="L167" class="LineNr">167 </span><span class="Comment">// For example, storing bank balance and name for an account might require a</span>
+<span id="L168" class="LineNr">168 </span><span class="Comment">// container, but if bank accounts may be either for individuals or groups,</span>
+<span id="L169" class="LineNr">169 </span><span class="Comment">// with different properties for each, that may require an exclusive container</span>
+<span id="L170" class="LineNr">170 </span><span class="Comment">// whose variants are individual-account and joint-account containers.</span>
+<span id="L171" class="LineNr">171 </span><span class="Normal">enum</span> <a href='010vm.cc.html#L171'>kind_of_type</a> <span class="Delimiter">{</span>
+<span id="L172" class="LineNr">172 </span>  <a href='010vm.cc.html#L172'>PRIMITIVE</a><span class="Delimiter">,</span>
+<span id="L173" class="LineNr">173 </span>  <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">,</span>
+<span id="L174" class="LineNr">174 </span>  <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a>
+<span id="L175" class="LineNr">175 </span><span class="Delimiter">};</span>
+<span id="L176" class="LineNr">176 </span>
+<span id="L177" class="LineNr">177 </span><span class="Normal">struct</span> type_info <span class="Delimiter">{</span>
+<span id="L178" class="LineNr">178 </span>  string name<span class="Delimiter">;</span>
+<span id="L179" class="LineNr">179 </span>  <a href='010vm.cc.html#L171'>kind_of_type</a> kind<span class="Delimiter">;</span>
+<span id="L180" class="LineNr">180 </span>  vector&lt;reagent&gt; elements<span class="Delimiter">;</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Comment">// End type_info Fields</span>
+<span id="L182" class="LineNr">182 </span>  type_info<span class="Delimiter">()</span> :kind<span class="Delimiter">(</span><a href='010vm.cc.html#L172'>PRIMITIVE</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L183" class="LineNr">183 </span>    <span class="Comment">// End type_info Constructor</span>
+<span id="L184" class="LineNr">184 </span>  <span class="Delimiter">}</span>
+<span id="L185" class="LineNr">185 </span><span class="Delimiter">};</span>
+<span id="L186" class="LineNr">186 </span>
+<span id="L187" class="LineNr">187 </span><span class="Normal">enum</span> <a href='010vm.cc.html#L187'>primitive_recipes</a> <span class="Delimiter">{</span>
+<span id="L188" class="LineNr">188 </span>  <a href='010vm.cc.html#L188'>IDLE</a> = <span class="Constant">0</span><span class="Delimiter">,</span>
+<span id="L189" class="LineNr">189 </span>  <a href='010vm.cc.html#L189'>COPY</a><span class="Delimiter">,</span>
+<span id="L190" class="LineNr">190 </span>  <span class="Comment">// End Primitive Recipe Declarations</span>
+<span id="L191" class="LineNr">191 </span>  <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">,</span>
+<span id="L192" class="LineNr">192 </span><span class="Delimiter">};</span>
+<span id="L193" class="LineNr">193 </span><span class="Delimiter">:(code)</span>
+<span id="L194" class="LineNr">194 </span><span class="Comment">//: It's all very well to construct recipes out of other recipes, but we need</span>
+<span id="L195" class="LineNr">195 </span><span class="Comment">//: to know how to do *something* out of the box. For the following</span>
+<span id="L196" class="LineNr">196 </span><span class="Comment">//: recipes there are only codes, no entries in the book, because Mu just knows</span>
+<span id="L197" class="LineNr">197 </span><span class="Comment">//: what to do for them.</span>
+<span id="L198" class="LineNr">198 </span><span class="Normal">void</span> <a href='010vm.cc.html#L198'>setup_recipes</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L199" class="LineNr">199 </span>  Recipe<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>  Recipe_ordinal<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L200" class="LineNr">200 </span>  <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;idle&quot;</span><span class="Delimiter">,</span> <a href='010vm.cc.html#L188'>IDLE</a><span class="Delimiter">);</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Comment">// Primitive Recipe Numbers</span>
+<span id="L202" class="LineNr">202 </span>  <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;copy&quot;</span><span class="Delimiter">,</span> <a href='010vm.cc.html#L189'>COPY</a><span class="Delimiter">);</span>
+<span id="L203" class="LineNr">203 </span>  <span class="Comment">// End Primitive Recipe Numbers</span>
+<span id="L204" class="LineNr">204 </span><span class="Delimiter">}</span>
+<span id="L205" class="LineNr">205 </span><span class="Comment">//: We could just reset the recipe table after every test, but that gets slow</span>
+<span id="L206" class="LineNr">206 </span><span class="Comment">//: all too quickly. Instead, initialize the common stuff just once at</span>
+<span id="L207" class="LineNr">207 </span><span class="Comment">//: startup. Later layers will carefully undo each test's additions after</span>
+<span id="L208" class="LineNr">208 </span><span class="Comment">//: itself.</span>
+<span id="L209" class="LineNr">209 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L210" class="LineNr">210 </span><a href='010vm.cc.html#L198'>setup_recipes</a><span class="Delimiter">();</span>
+<span id="L211" class="LineNr">211 </span>assert<span class="Delimiter">(</span><a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a> &lt; <span class="Constant">200</span><span class="Delimiter">);</span>  <span class="Comment">// level 0 is primitives; until 199</span>
+<span id="L212" class="LineNr">212 </span>Next_recipe_ordinal = <span class="Constant">200</span><span class="Delimiter">;</span>
+<span id="L213" class="LineNr">213 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">,</span> Next_recipe_ordinal++<span class="Delimiter">);</span>
+<span id="L214" class="LineNr">214 </span><span class="Comment">// End Load Recipes</span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
+<span id="L216" class="LineNr">216 </span>assert<span class="Delimiter">(</span>Next_recipe_ordinal &lt; <span class="Constant">1000</span><span class="Delimiter">);</span>  <span class="Comment">// recipes being tested didn't overflow into test space</span>
+<span id="L217" class="LineNr">217 </span><span class="Delimiter">:(before &quot;End Setup&quot;)</span>
+<span id="L218" class="LineNr">218 </span>Next_recipe_ordinal = <span class="Constant">1000</span><span class="Delimiter">;</span>  <span class="Comment">// consistent new numbers for each test</span>
+<span id="L219" class="LineNr">219 </span>
+<span id="L220" class="LineNr">220 </span><span class="Comment">//: One final detail: tests can modify our global tables of recipes and types,</span>
+<span id="L221" class="LineNr">221 </span><span class="Comment">//: so we need some way to clean up after each test is done so it doesn't</span>
+<span id="L222" class="LineNr">222 </span><span class="Comment">//: influence later ones.</span>
+<span id="L223" class="LineNr">223 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L224" class="LineNr">224 </span>map&lt;string<span class="Delimiter">,</span> recipe_ordinal&gt; Recipe_ordinal_snapshot<span class="Delimiter">;</span>
+<span id="L225" class="LineNr">225 </span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe&gt; Recipe_snapshot<span class="Delimiter">;</span>
+<span id="L226" class="LineNr">226 </span>map&lt;string<span class="Delimiter">,</span> type_ordinal&gt; Type_ordinal_snapshot<span class="Delimiter">;</span>
+<span id="L227" class="LineNr">227 </span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt; Type_snapshot<span class="Delimiter">;</span>
+<span id="L228" class="LineNr">228 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L229" class="LineNr">229 </span>save_snapshots<span class="Delimiter">();</span>
+<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(before &quot;End Setup&quot;)</span>
+<span id="L231" class="LineNr">231 </span>restore_snapshots<span class="Delimiter">();</span>
+<span id="L232" class="LineNr">232 </span>
+<span id="L233" class="LineNr">233 </span><span class="Delimiter">:(code)</span>
+<span id="L234" class="LineNr">234 </span><span class="Normal">void</span> save_snapshots<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L235" class="LineNr">235 </span>  Recipe_ordinal_snapshot = Recipe_ordinal<span class="Delimiter">;</span>
+<span id="L236" class="LineNr">236 </span>  Recipe_snapshot = Recipe<span class="Delimiter">;</span>
+<span id="L237" class="LineNr">237 </span>  Type_ordinal_snapshot = Type_ordinal<span class="Delimiter">;</span>
+<span id="L238" class="LineNr">238 </span>  Type_snapshot = Type<span class="Delimiter">;</span>
+<span id="L239" class="LineNr">239 </span>  <span class="Comment">// End save_snapshots</span>
+<span id="L240" class="LineNr">240 </span><span class="Delimiter">}</span>
+<span id="L241" class="LineNr">241 </span>
+<span id="L242" class="LineNr">242 </span><span class="Normal">void</span> restore_snapshots<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L243" class="LineNr">243 </span>  Recipe = Recipe_snapshot<span class="Delimiter">;</span>
+<span id="L244" class="LineNr">244 </span>  Recipe_ordinal = Recipe_ordinal_snapshot<span class="Delimiter">;</span>
+<span id="L245" class="LineNr">245 </span>  restore_non_recipe_snapshots<span class="Delimiter">();</span>
+<span id="L246" class="LineNr">246 </span><span class="Delimiter">}</span>
+<span id="L247" class="LineNr">247 </span><span class="Comment">// when running sandboxes in the edit/ app we'll want to restore everything except recipes defined in the app</span>
+<span id="L248" class="LineNr">248 </span><span class="Normal">void</span> restore_non_recipe_snapshots<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L249" class="LineNr">249 </span>  Type_ordinal = Type_ordinal_snapshot<span class="Delimiter">;</span>
+<span id="L250" class="LineNr">250 </span>  Type = Type_snapshot<span class="Delimiter">;</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Comment">// End restore_snapshots</span>
+<span id="L252" class="LineNr">252 </span><span class="Delimiter">}</span>
+<span id="L253" class="LineNr">253 </span>
+<span id="L254" class="LineNr">254 </span><span class="SalientComment">//:: Helpers</span>
+<span id="L255" class="LineNr">255 </span>
+<span id="L256" class="LineNr">256 </span><span class="Delimiter">:(code)</span>
+<span id="L257" class="LineNr">257 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span>::<a href='010vm.cc.html#L19'>recipe</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L258" class="LineNr">258 </span>  <span class="Comment">// End recipe Constructor</span>
+<span id="L259" class="LineNr">259 </span><span class="Delimiter">}</span>
+<span id="L260" class="LineNr">260 </span>
+<span id="L261" class="LineNr">261 </span><a href='010vm.cc.html#L32'>instruction</a>::<a href='010vm.cc.html#L32'>instruction</a><span class="Delimiter">()</span> :is_label<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">),</span> operation<span class="Delimiter">(</span><a href='010vm.cc.html#L188'>IDLE</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Comment">// End instruction Constructor</span>
+<span id="L263" class="LineNr">263 </span><span class="Delimiter">}</span>
+<span id="L264" class="LineNr">264 </span><span class="Normal">void</span> <a href='010vm.cc.html#L32'>instruction</a>::<a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L265" class="LineNr">265 </span>  is_label=<span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L266" class="LineNr">266 </span>  label<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L267" class="LineNr">267 </span>  name<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L268" class="LineNr">268 </span>  operation=IDLE<span class="Delimiter">;</span>
+<span id="L269" class="LineNr">269 </span>  ingredients<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L270" class="LineNr">270 </span>  products<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L271" class="LineNr">271 </span>  original_string<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Comment">// End instruction Clear</span>
+<span id="L273" class="LineNr">273 </span><span class="Delimiter">}</span>
+<span id="L274" class="LineNr">274 </span><span class="Normal">bool</span> <a href='010vm.cc.html#L32'>instruction</a>::is_empty<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Identifier">return</span> !is_label &amp;&amp; name<span class="Delimiter">.</span>empty<span class="Delimiter">();</span> <span class="Delimiter">}</span>
+<span id="L275" class="LineNr">275 </span>
+<span id="L276" class="LineNr">276 </span><span class="Comment">// Reagents have the form &lt;name&gt;:&lt;type&gt;:&lt;type&gt;:.../&lt;property&gt;/&lt;property&gt;/...</span>
+<span id="L277" class="LineNr">277 </span>reagent::reagent<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> :original_string<span class="Delimiter">(</span>s<span class="Delimiter">),</span> type<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> value<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> initialized<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Comment">// Parsing reagent(string s)</span>
+<span id="L279" class="LineNr">279 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L280" class="LineNr">280 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Comment">// name and type</span>
+<span id="L282" class="LineNr">282 </span>  istringstream first_row<span class="Delimiter">(</span>slurp_until<span class="Delimiter">(</span>in<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">));</span>
+<span id="L283" class="LineNr">283 </span>  first_row &gt;&gt; std::noskipws<span class="Delimiter">;</span>
+<span id="L284" class="LineNr">284 </span>  name = slurp_until<span class="Delimiter">(</span>first_row<span class="Delimiter">,</span> <span class="Constant">':'</span><span class="Delimiter">);</span>
+<span id="L285" class="LineNr">285 </span>  string_tree* type_names = parse_property_list<span class="Delimiter">(</span>first_row<span class="Delimiter">);</span>
+<span id="L286" class="LineNr">286 </span>  <span class="Comment">// End Parsing Reagent Type Property(type_names)</span>
+<span id="L287" class="LineNr">287 </span>  type = <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>type_names<span class="Delimiter">);</span>
+<span id="L288" class="LineNr">288 </span>  <span class="Normal">delete</span> type_names<span class="Delimiter">;</span>
+<span id="L289" class="LineNr">289 </span>  <span class="Comment">// special cases</span>
+<span id="L290" class="LineNr">290 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L86'>is_integer</a><span class="Delimiter">(</span>name<span class="Delimiter">)</span> &amp;&amp; type == <span class="Constant">NULL</span><span class="Delimiter">)</span>
+<span id="L291" class="LineNr">291 </span>    type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;literal&quot;</span><span class="Delimiter">);</span>
+<span id="L292" class="LineNr">292 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>name == <span class="Constant">&quot;_&quot;</span> &amp;&amp; type == <span class="Constant">NULL</span><span class="Delimiter">)</span>
+<span id="L293" class="LineNr">293 </span>    type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;literal&quot;</span><span class="Delimiter">);</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Comment">// other properties</span>
+<span id="L295" class="LineNr">295 </span>  slurp_properties<span class="Delimiter">(</span>in<span class="Delimiter">,</span> properties<span class="Delimiter">);</span>
+<span id="L296" class="LineNr">296 </span>  <span class="Comment">// End Parsing reagent</span>
+<span id="L297" class="LineNr">297 </span><span class="Delimiter">}</span>
+<span id="L298" class="LineNr">298 </span>
+<span id="L299" class="LineNr">299 </span><span class="Normal">void</span> slurp_properties<span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">,</span> vector&lt;pair&lt;string<span class="Delimiter">,</span> string_tree*&gt; &gt;&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L301" class="LineNr">301 </span>    istringstream row<span class="Delimiter">(</span>slurp_until<span class="Delimiter">(</span>in<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">));</span>
+<span id="L302" class="LineNr">302 </span>    row &gt;&gt; std::noskipws<span class="Delimiter">;</span>
+<span id="L303" class="LineNr">303 </span>    string key = slurp_until<span class="Delimiter">(</span>row<span class="Delimiter">,</span> <span class="Constant">':'</span><span class="Delimiter">);</span>
+<span id="L304" class="LineNr">304 </span>    string_tree* value = parse_property_list<span class="Delimiter">(</span>row<span class="Delimiter">);</span>
+<span id="L305" class="LineNr">305 </span>    out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span>key<span class="Delimiter">,</span> value<span class="Delimiter">));</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Delimiter">}</span>
+<span id="L307" class="LineNr">307 </span><span class="Delimiter">}</span>
+<span id="L308" class="LineNr">308 </span>
+<span id="L309" class="LineNr">309 </span>string_tree* parse_property_list<span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L310" class="LineNr">310 </span>  skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L312" class="LineNr">312 </span>  string_tree* first = <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>slurp_until<span class="Delimiter">(</span>in<span class="Delimiter">,</span> <span class="Constant">':'</span><span class="Delimiter">));</span>
+<span id="L313" class="LineNr">313 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">return</span> first<span class="Delimiter">;</span>
+<span id="L314" class="LineNr">314 </span>  string_tree* rest = parse_property_list<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; rest<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
+<span id="L316" class="LineNr">316 </span>    <span class="Identifier">return</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>first<span class="Delimiter">,</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>rest<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
+<span id="L317" class="LineNr">317 </span>  <span class="Identifier">return</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>first<span class="Delimiter">,</span> rest<span class="Delimiter">);</span>
+<span id="L318" class="LineNr">318 </span><span class="Delimiter">}</span>
+<span id="L319" class="LineNr">319 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
+<span id="L320" class="LineNr">320 </span><span class="Normal">void</span> test_parse_property_list_atom<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L321" class="LineNr">321 </span>  istringstream in<span class="Delimiter">(</span><span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L322" class="LineNr">322 </span>  string_tree* x = parse_property_list<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L323" class="LineNr">323 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L324" class="LineNr">324 </span>  <span class="Normal">delete</span> x<span class="Delimiter">;</span>
+<span id="L325" class="LineNr">325 </span><span class="Delimiter">}</span>
+<span id="L326" class="LineNr">326 </span><span class="Normal">void</span> test_parse_property_list_list<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L327" class="LineNr">327 </span>  istringstream in<span class="Delimiter">(</span><span class="Constant">&quot;a:b&quot;</span><span class="Delimiter">);</span>
+<span id="L328" class="LineNr">328 </span>  string_tree* x = parse_property_list<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L329" class="LineNr">329 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L330" class="LineNr">330 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L331" class="LineNr">331 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value<span class="Delimiter">,</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L332" class="LineNr">332 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!x<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L333" class="LineNr">333 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L334" class="LineNr">334 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value<span class="Delimiter">,</span> <span class="Constant">&quot;b&quot;</span><span class="Delimiter">);</span>
+<span id="L335" class="LineNr">335 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right == <span class="Constant">NULL</span><span class="Delimiter">);</span>
+<span id="L336" class="LineNr">336 </span>  <span class="Normal">delete</span> x<span class="Delimiter">;</span>
+<span id="L337" class="LineNr">337 </span><span class="Delimiter">}</span>
+<span id="L338" class="LineNr">338 </span>
+<span id="L339" class="LineNr">339 </span><span class="Delimiter">:(code)</span>
+<span id="L340" class="LineNr">340 </span>type_tree* <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span><span class="Normal">const</span> string_tree* properties<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L341" class="LineNr">341 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!properties<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L342" class="LineNr">342 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L343" class="LineNr">343 </span>    <span class="Normal">const</span> string&amp; type_name = properties<span class="Delimiter">-&gt;</span>value<span class="Delimiter">;</span>
+<span id="L344" class="LineNr">344 </span>    <span class="Normal">int</span> value = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L345" class="LineNr">345 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type_name<span class="Delimiter">))</span>
+<span id="L346" class="LineNr">346 </span>      value = get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type_name<span class="Delimiter">);</span>
+<span id="L347" class="LineNr">347 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L86'>is_integer</a><span class="Delimiter">(</span>type_name<span class="Delimiter">))</span>  <span class="Comment">// sometimes types will contain non-type tags, like numbers for the size of an array</span>
+<span id="L348" class="LineNr">348 </span>      value = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L349" class="LineNr">349 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">-&gt;</span>value == <span class="Constant">&quot;-&gt;&quot;</span><span class="Delimiter">)</span>  <span class="Comment">// used in recipe types</span>
+<span id="L350" class="LineNr">350 </span>      value = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L351" class="LineNr">351 </span>    <span class="Normal">else</span>
+<span id="L352" class="LineNr">352 </span>      value = -<span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// should never happen; will trigger errors later</span>
+<span id="L353" class="LineNr">353 </span>    <span class="Identifier">return</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>type_name<span class="Delimiter">,</span> value<span class="Delimiter">);</span>
+<span id="L354" class="LineNr">354 </span>  <span class="Delimiter">}</span>
+<span id="L355" class="LineNr">355 </span>  <span class="Identifier">return</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>properties<span class="Delimiter">-&gt;</span>left<span class="Delimiter">),</span>
+<span id="L356" class="LineNr">356 </span>                       <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>properties<span class="Delimiter">-&gt;</span>right<span class="Delimiter">));</span>
+<span id="L357" class="LineNr">357 </span><span class="Delimiter">}</span>
+<span id="L358" class="LineNr">358 </span>
+<span id="L359" class="LineNr">359 </span><span class="Comment">//: avoid memory leaks for the type tree</span>
+<span id="L360" class="LineNr">360 </span>
+<span id="L361" class="LineNr">361 </span>reagent::reagent<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L362" class="LineNr">362 </span>  original_string = other<span class="Delimiter">.</span>original_string<span class="Delimiter">;</span>
+<span id="L363" class="LineNr">363 </span>  name = other<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
+<span id="L364" class="LineNr">364 </span>  value = other<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
+<span id="L365" class="LineNr">365 </span>  initialized = other<span class="Delimiter">.</span>initialized<span class="Delimiter">;</span>
+<span id="L366" class="LineNr">366 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L367" class="LineNr">367 </span>    properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first<span class="Delimiter">,</span> copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)));</span>
+<span id="L368" class="LineNr">368 </span>  <span class="Delimiter">}</span>
+<span id="L369" class="LineNr">369 </span>  type = copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L370" class="LineNr">370 </span>  <span class="Comment">// End reagent Copy Constructor</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>type_tree::type_tree<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; original<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L374" class="LineNr">374 </span>  atom = original<span class="Delimiter">.</span>atom<span class="Delimiter">;</span>
+<span id="L375" class="LineNr">375 </span>  name = original<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
+<span id="L376" class="LineNr">376 </span>  value = original<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
+<span id="L377" class="LineNr">377 </span>  left = copy<span class="Delimiter">(</span>original<span class="Delimiter">.</span>left<span class="Delimiter">);</span>
+<span id="L378" class="LineNr">378 </span>  right = copy<span class="Delimiter">(</span>original<span class="Delimiter">.</span>right<span class="Delimiter">);</span>
+<span id="L379" class="LineNr">379 </span><span class="Delimiter">}</span>
+<span id="L380" class="LineNr">380 </span>
+<span id="L381" class="LineNr">381 </span>type_tree&amp; type_tree::<span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; original<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L382" class="LineNr">382 </span>  atom = original<span class="Delimiter">.</span>atom<span class="Delimiter">;</span>
+<span id="L383" class="LineNr">383 </span>  name = original<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
+<span id="L384" class="LineNr">384 </span>  value = original<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
+<span id="L385" class="LineNr">385 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>left<span class="Delimiter">)</span> <span class="Normal">delete</span> left<span class="Delimiter">;</span>
+<span id="L386" class="LineNr">386 </span>  left = copy<span class="Delimiter">(</span>original<span class="Delimiter">.</span>left<span class="Delimiter">);</span>
+<span id="L387" class="LineNr">387 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>right<span class="Delimiter">)</span> <span class="Normal">delete</span> right<span class="Delimiter">;</span>
+<span id="L388" class="LineNr">388 </span>  right = copy<span class="Delimiter">(</span>original<span class="Delimiter">.</span>right<span class="Delimiter">);</span>
+<span id="L389" class="LineNr">389 </span>  <span class="Identifier">return</span> *<span class="Normal">this</span><span class="Delimiter">;</span>
+<span id="L390" class="LineNr">390 </span><span class="Delimiter">}</span>
+<span id="L391" class="LineNr">391 </span>
+<span id="L392" class="LineNr">392 </span><span class="Normal">bool</span> type_tree::<span class="Normal">operator</span>==<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
+<span id="L393" class="LineNr">393 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>atom != other<span class="Delimiter">.</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L394" class="LineNr">394 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>atom<span class="Delimiter">)</span>
+<span id="L395" class="LineNr">395 </span>    <span class="Identifier">return</span> name == other<span class="Delimiter">.</span>name &amp;&amp; value == other<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
+<span id="L396" class="LineNr">396 </span>  <span class="Identifier">return</span> <span class="Delimiter">(</span>left == other<span class="Delimiter">.</span>left || *left == *other<span class="Delimiter">.</span>left<span class="Delimiter">)</span>
+<span id="L397" class="LineNr">397 </span>      &amp;&amp; <span class="Delimiter">(</span>right == other<span class="Delimiter">.</span>right || *right == *other<span class="Delimiter">.</span>right<span class="Delimiter">);</span>
+<span id="L398" class="LineNr">398 </span><span class="Delimiter">}</span>
+<span id="L399" class="LineNr">399 </span>
+<span id="L400" class="LineNr">400 </span><span class="Comment">// only constraint we care about: if a &lt; b then !(b &lt; a)</span>
+<span id="L401" class="LineNr">401 </span><span class="Normal">bool</span> type_tree::<span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> type_tree&amp; other<span class="Delimiter">)</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
+<span id="L402" class="LineNr">402 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>atom != other<span class="Delimiter">.</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> atom &gt; other<span class="Delimiter">.</span>atom<span class="Delimiter">;</span>  <span class="Comment">// atoms before non-atoms</span>
+<span id="L403" class="LineNr">403 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> name &lt; other<span class="Delimiter">.</span>name<span class="Delimiter">;</span>  <span class="Comment">// sort atoms in lexical order</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Comment">// first location in one that's missing in the other makes that side 'smaller'</span>
+<span id="L405" class="LineNr">405 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>left &amp;&amp; !other<span class="Delimiter">.</span>left<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L406" class="LineNr">406 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!left &amp;&amp; other<span class="Delimiter">.</span>left<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L407" class="LineNr">407 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>right &amp;&amp; !other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!right &amp;&amp; other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L409" class="LineNr">409 </span>  <span class="Comment">// now if either pointer is unequal neither side can be null</span>
+<span id="L410" class="LineNr">410 </span>  <span class="Comment">// if one side is equal that's easy</span>
+<span id="L411" class="LineNr">411 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>left == other<span class="Delimiter">.</span>left || *left == *other<span class="Delimiter">.</span>left<span class="Delimiter">)</span> <span class="Identifier">return</span> right &amp;&amp; *right &lt; *other<span class="Delimiter">.</span>right<span class="Delimiter">;</span>
+<span id="L412" class="LineNr">412 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>right == other<span class="Delimiter">.</span>right || *right == *other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> <span class="Identifier">return</span> left &amp;&amp; *left &lt; *other<span class="Delimiter">.</span>left<span class="Delimiter">;</span>
+<span id="L413" class="LineNr">413 </span>  <span class="Comment">// if the two sides criss-cross, pick the side with the smaller lhs</span>
+<span id="L414" class="LineNr">414 </span>  <span class="Normal">if</span> <span class="Delimiter">((</span>left == other<span class="Delimiter">.</span>right || *left == *other<span class="Delimiter">.</span>right<span class="Delimiter">)</span>
+<span id="L415" class="LineNr">415 </span>      &amp;&amp; <span class="Delimiter">(</span>right == other<span class="Delimiter">.</span>left || *right == *other<span class="Delimiter">.</span>left<span class="Delimiter">))</span>
+<span id="L416" class="LineNr">416 </span>    <span class="Identifier">return</span> *left &lt; *other<span class="Delimiter">.</span>left<span class="Delimiter">;</span>
+<span id="L417" class="LineNr">417 </span>  <span class="Comment">// now the hard case: both sides are not equal</span>
+<span id="L418" class="LineNr">418 </span>  <span class="Comment">// make sure we stay consistent between (a &lt; b) and (b &lt; a)</span>
+<span id="L419" class="LineNr">419 </span>  <span class="Comment">// just return the side with the smallest of the 4 branches</span>
+<span id="L420" class="LineNr">420 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>*left &lt; *other<span class="Delimiter">.</span>left &amp;&amp; *left &lt; *other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L421" class="LineNr">421 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>*right &lt; *other<span class="Delimiter">.</span>left &amp;&amp; *right &lt; *other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L422" class="LineNr">422 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L423" class="LineNr">423 </span><span class="Delimiter">}</span>
-<span id="L424" class="LineNr">424 </span><span class="Normal">void</span> test_compare_equal_atom_types<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L425" class="LineNr">425 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:address&quot;</span><span class="Delimiter">);</span>
-<span id="L426" class="LineNr">426 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L427" class="LineNr">427 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L428" class="LineNr">428 </span><span class="Delimiter">}</span>
-<span id="L429" class="LineNr">429 </span><span class="Normal">void</span> test_compare_atom_with_non_atom<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L430" class="LineNr">430 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:number&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean&quot;</span><span class="Delimiter">);</span>
-<span id="L431" class="LineNr">431 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L432" class="LineNr">432 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L433" class="LineNr">433 </span><span class="Delimiter">}</span>
-<span id="L434" class="LineNr">434 </span><span class="Normal">void</span> test_compare_lists_with_identical_structure<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L435" class="LineNr">435 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L76'>address</a>:boolean&quot;</span><span class="Delimiter">);</span>
-<span id="L436" class="LineNr">436 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L437" class="LineNr">437 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L438" class="LineNr">438 </span><span class="Delimiter">}</span>
-<span id="L439" class="LineNr">439 </span><span class="Normal">void</span> test_compare_identical_lists<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L440" class="LineNr">440 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L76'>address</a>:boolean&quot;</span><span class="Delimiter">);</span>
-<span id="L441" class="LineNr">441 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L442" class="LineNr">442 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L443" class="LineNr">443 </span><span class="Delimiter">}</span>
-<span id="L444" class="LineNr">444 </span><span class="Normal">void</span> test_compare_list_with_extra_element<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L445" class="LineNr">445 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L76'>address</a>:<a href='043space.cc.html#L76'>address</a>:number&quot;</span><span class="Delimiter">);</span>
-<span id="L446" class="LineNr">446 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L447" class="LineNr">447 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L448" class="LineNr">448 </span><span class="Delimiter">}</span>
-<span id="L449" class="LineNr">449 </span><span class="Normal">void</span> test_compare_list_with_smaller_left_but_larger_right<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L450" class="LineNr">450 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:number&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:character:array&quot;</span><span class="Delimiter">);</span>
-<span id="L451" class="LineNr">451 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L452" class="LineNr">452 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L453" class="LineNr">453 </span><span class="Delimiter">}</span>
-<span id="L454" class="LineNr">454 </span><span class="Normal">void</span> test_compare_list_with_smaller_left_but_larger_right_identical_types<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L455" class="LineNr">455 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean:address&quot;</span><span class="Delimiter">);</span>
-<span id="L456" class="LineNr">456 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L457" class="LineNr">457 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L458" class="LineNr">458 </span><span class="Delimiter">}</span>
-<span id="L459" class="LineNr">459 </span>
-<span id="L460" class="LineNr">460 </span><span class="Delimiter">:(code)</span>
-<span id="L461" class="LineNr">461 </span>string_tree::string_tree<span class="Delimiter">(</span><span class="Normal">const</span> string_tree&amp; original<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L462" class="LineNr">462 </span>  atom = original<span class="Delimiter">.</span>atom<span class="Delimiter">;</span>
-<span id="L463" class="LineNr">463 </span>  value = original<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
-<span id="L464" class="LineNr">464 </span>  left = original<span class="Delimiter">.</span>left ? <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>*original<span class="Delimiter">.</span>left<span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L465" class="LineNr">465 </span>  right = original<span class="Delimiter">.</span>right ? <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>*original<span class="Delimiter">.</span>right<span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L466" class="LineNr">466 </span><span class="Delimiter">}</span>
-<span id="L467" class="LineNr">467 </span>
-<span id="L468" class="LineNr">468 </span>reagent&amp; reagent::<span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L469" class="LineNr">469 </span>  original_string = other<span class="Delimiter">.</span>original_string<span class="Delimiter">;</span>
-<span id="L470" class="LineNr">470 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L471" class="LineNr">471 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)</span> <span class="Normal">delete</span> properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">;</span>
-<span id="L472" class="LineNr">472 </span>  properties<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L473" class="LineNr">473 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L474" class="LineNr">474 </span>    properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first<span class="Delimiter">,</span> other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second ? <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>*other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L475" class="LineNr">475 </span>  name = other<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
-<span id="L476" class="LineNr">476 </span>  value = other<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
-<span id="L477" class="LineNr">477 </span>  initialized = other<span class="Delimiter">.</span>initialized<span class="Delimiter">;</span>
-<span id="L478" class="LineNr">478 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">)</span> <span class="Normal">delete</span> type<span class="Delimiter">;</span>
-<span id="L479" class="LineNr">479 </span>  type = other<span class="Delimiter">.</span>type ? <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*other<span class="Delimiter">.</span>type<span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L480" class="LineNr">480 </span>  <span class="Comment">// End reagent Copy Operator</span>
-<span id="L481" class="LineNr">481 </span>  <span class="Identifier">return</span> *<span class="Normal">this</span><span class="Delimiter">;</span>
-<span id="L482" class="LineNr">482 </span><span class="Delimiter">}</span>
-<span id="L483" class="LineNr">483 </span>
-<span id="L484" class="LineNr">484 </span>reagent::~reagent<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L485" class="LineNr">485 </span>  <a href='050scenario.cc.html#L60'>clear</a><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">void</span> reagent::<a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L489" class="LineNr">489 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L490" class="LineNr">490 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L491" class="LineNr">491 </span>      <span class="Normal">delete</span> properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">;</span>
-<span id="L492" class="LineNr">492 </span>      properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L493" class="LineNr">493 </span>    <span class="Delimiter">}</span>
-<span id="L494" class="LineNr">494 </span>  <span class="Delimiter">}</span>
-<span id="L495" class="LineNr">495 </span>  <span class="Normal">delete</span> type<span class="Delimiter">;</span>
-<span id="L496" class="LineNr">496 </span>  type = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L497" class="LineNr">497 </span><span class="Delimiter">}</span>
-<span id="L498" class="LineNr">498 </span>type_tree::~type_tree<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L499" class="LineNr">499 </span>  <span class="Normal">delete</span> left<span class="Delimiter">;</span>
-<span id="L500" class="LineNr">500 </span>  <span class="Normal">delete</span> right<span class="Delimiter">;</span>
-<span id="L501" class="LineNr">501 </span><span class="Delimiter">}</span>
-<span id="L502" class="LineNr">502 </span>string_tree::~string_tree<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L503" class="LineNr">503 </span>  <span class="Normal">delete</span> left<span class="Delimiter">;</span>
-<span id="L504" class="LineNr">504 </span>  <span class="Normal">delete</span> right<span class="Delimiter">;</span>
-<span id="L505" class="LineNr">505 </span><span class="Delimiter">}</span>
-<span id="L506" class="LineNr">506 </span>
-<span id="L507" class="LineNr">507 </span><span class="Normal">void</span> append<span class="Delimiter">(</span>type_tree*&amp; base<span class="Delimiter">,</span> type_tree* extra<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L508" class="LineNr">508 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L509" class="LineNr">509 </span>    base = extra<span class="Delimiter">;</span>
-<span id="L510" class="LineNr">510 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L511" class="LineNr">511 </span>  <span class="Delimiter">}</span>
-<span id="L512" class="LineNr">512 </span>  type_tree* curr = base<span class="Delimiter">;</span>
-<span id="L513" class="LineNr">513 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
-<span id="L514" class="LineNr">514 </span>  curr<span class="Delimiter">-&gt;</span>right = extra<span class="Delimiter">;</span>
-<span id="L515" class="LineNr">515 </span><span class="Delimiter">}</span>
-<span id="L516" class="LineNr">516 </span>
-<span id="L517" class="LineNr">517 </span><span class="Normal">void</span> append<span class="Delimiter">(</span>string_tree*&amp; base<span class="Delimiter">,</span> string_tree* extra<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L518" class="LineNr">518 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L519" class="LineNr">519 </span>    base = extra<span class="Delimiter">;</span>
-<span id="L520" class="LineNr">520 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L521" class="LineNr">521 </span>  <span class="Delimiter">}</span>
-<span id="L522" class="LineNr">522 </span>  string_tree* curr = base<span class="Delimiter">;</span>
-<span id="L523" class="LineNr">523 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
-<span id="L524" class="LineNr">524 </span>  curr<span class="Delimiter">-&gt;</span>right = extra<span class="Delimiter">;</span>
-<span id="L525" class="LineNr">525 </span><span class="Delimiter">}</span>
-<span id="L526" class="LineNr">526 </span>
-<span id="L527" class="LineNr">527 </span>string slurp_until<span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">,</span> <span class="Normal">char</span> delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L528" class="LineNr">528 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L529" class="LineNr">529 </span>  <span class="Normal">char</span> c<span class="Delimiter">;</span>
-<span id="L530" class="LineNr">530 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>in &gt;&gt; c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L531" class="LineNr">531 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L532" class="LineNr">532 </span>      <span class="Comment">// drop the delim</span>
-<span id="L533" class="LineNr">533 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L534" class="LineNr">534 </span>    <span class="Delimiter">}</span>
-<span id="L535" class="LineNr">535 </span>    out &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L536" class="LineNr">536 </span>  <span class="Delimiter">}</span>
-<span id="L537" class="LineNr">537 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L538" class="LineNr">538 </span><span class="Delimiter">}</span>
-<span id="L539" class="LineNr">539 </span>
-<span id="L540" class="LineNr">540 </span><span class="Normal">bool</span> has_property<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L541" class="LineNr">541 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L542" class="LineNr">542 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first == name<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L424" class="LineNr">424 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
+<span id="L425" class="LineNr">425 </span><span class="Comment">// These unit tests don't always use valid types.</span>
+<span id="L426" class="LineNr">426 </span><span class="Normal">void</span> test_compare_atom_types<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L427" class="LineNr">427 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean&quot;</span><span class="Delimiter">);</span>
+<span id="L428" class="LineNr">428 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L429" class="LineNr">429 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L430" class="LineNr">430 </span><span class="Delimiter">}</span>
+<span id="L431" class="LineNr">431 </span><span class="Normal">void</span> test_compare_equal_atom_types<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L432" class="LineNr">432 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:address&quot;</span><span class="Delimiter">);</span>
+<span id="L433" class="LineNr">433 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L434" class="LineNr">434 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L435" class="LineNr">435 </span><span class="Delimiter">}</span>
+<span id="L436" class="LineNr">436 </span><span class="Normal">void</span> test_compare_atom_with_non_atom<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L437" class="LineNr">437 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:number&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean&quot;</span><span class="Delimiter">);</span>
+<span id="L438" class="LineNr">438 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L439" class="LineNr">439 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L440" class="LineNr">440 </span><span class="Delimiter">}</span>
+<span id="L441" class="LineNr">441 </span><span class="Normal">void</span> test_compare_lists_with_identical_structure<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L442" class="LineNr">442 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L76'>address</a>:boolean&quot;</span><span class="Delimiter">);</span>
+<span id="L443" class="LineNr">443 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L444" class="LineNr">444 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L445" class="LineNr">445 </span><span class="Delimiter">}</span>
+<span id="L446" class="LineNr">446 </span><span class="Normal">void</span> test_compare_identical_lists<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L447" class="LineNr">447 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L76'>address</a>:boolean&quot;</span><span class="Delimiter">);</span>
+<span id="L448" class="LineNr">448 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L449" class="LineNr">449 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L450" class="LineNr">450 </span><span class="Delimiter">}</span>
+<span id="L451" class="LineNr">451 </span><span class="Normal">void</span> test_compare_list_with_extra_element<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L452" class="LineNr">452 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:address&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:<a href='043space.cc.html#L76'>address</a>:<a href='043space.cc.html#L76'>address</a>:number&quot;</span><span class="Delimiter">);</span>
+<span id="L453" class="LineNr">453 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L454" class="LineNr">454 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L455" class="LineNr">455 </span><span class="Delimiter">}</span>
+<span id="L456" class="LineNr">456 </span><span class="Normal">void</span> test_compare_list_with_smaller_left_but_larger_right<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L457" class="LineNr">457 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:number&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:character:array&quot;</span><span class="Delimiter">);</span>
+<span id="L458" class="LineNr">458 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L459" class="LineNr">459 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L460" class="LineNr">460 </span><span class="Delimiter">}</span>
+<span id="L461" class="LineNr">461 </span><span class="Normal">void</span> test_compare_list_with_smaller_left_but_larger_right_identical_types<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L462" class="LineNr">462 </span>  reagent a<span class="Delimiter">(</span><span class="Constant">&quot;a:<a href='043space.cc.html#L76'>address</a>:boolean&quot;</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">&quot;b:boolean:address&quot;</span><span class="Delimiter">);</span>
+<span id="L463" class="LineNr">463 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type &lt; *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L464" class="LineNr">464 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type &lt; *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L465" class="LineNr">465 </span><span class="Delimiter">}</span>
+<span id="L466" class="LineNr">466 </span>
+<span id="L467" class="LineNr">467 </span><span class="Delimiter">:(code)</span>
+<span id="L468" class="LineNr">468 </span>string_tree::string_tree<span class="Delimiter">(</span><span class="Normal">const</span> string_tree&amp; original<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L469" class="LineNr">469 </span>  atom = original<span class="Delimiter">.</span>atom<span class="Delimiter">;</span>
+<span id="L470" class="LineNr">470 </span>  value = original<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
+<span id="L471" class="LineNr">471 </span>  left = copy<span class="Delimiter">(</span>original<span class="Delimiter">.</span>left<span class="Delimiter">);</span>
+<span id="L472" class="LineNr">472 </span>  right = copy<span class="Delimiter">(</span>original<span class="Delimiter">.</span>right<span class="Delimiter">);</span>
+<span id="L473" class="LineNr">473 </span><span class="Delimiter">}</span>
+<span id="L474" class="LineNr">474 </span>
+<span id="L475" class="LineNr">475 </span>reagent&amp; reagent::<span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L476" class="LineNr">476 </span>  original_string = other<span class="Delimiter">.</span>original_string<span class="Delimiter">;</span>
+<span id="L477" class="LineNr">477 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L478" class="LineNr">478 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)</span> <span class="Normal">delete</span> properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">;</span>
+<span id="L479" class="LineNr">479 </span>  properties<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L480" class="LineNr">480 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L481" class="LineNr">481 </span>    properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first<span class="Delimiter">,</span> copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)));</span>
+<span id="L482" class="LineNr">482 </span>  name = other<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
+<span id="L483" class="LineNr">483 </span>  value = other<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
+<span id="L484" class="LineNr">484 </span>  initialized = other<span class="Delimiter">.</span>initialized<span class="Delimiter">;</span>
+<span id="L485" class="LineNr">485 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">)</span> <span class="Normal">delete</span> type<span class="Delimiter">;</span>
+<span id="L486" class="LineNr">486 </span>  type = copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L487" class="LineNr">487 </span>  <span class="Comment">// End reagent Copy Operator</span>
+<span id="L488" class="LineNr">488 </span>  <span class="Identifier">return</span> *<span class="Normal">this</span><span class="Delimiter">;</span>
+<span id="L489" class="LineNr">489 </span><span class="Delimiter">}</span>
+<span id="L490" class="LineNr">490 </span>
+<span id="L491" class="LineNr">491 </span>reagent::~reagent<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L492" class="LineNr">492 </span>  <a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L493" class="LineNr">493 </span><span class="Delimiter">}</span>
+<span id="L494" class="LineNr">494 </span>
+<span id="L495" class="LineNr">495 </span><span class="Normal">void</span> reagent::<a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L496" class="LineNr">496 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L497" class="LineNr">497 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L498" class="LineNr">498 </span>      <span class="Normal">delete</span> properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">;</span>
+<span id="L499" class="LineNr">499 </span>      properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L500" class="LineNr">500 </span>    <span class="Delimiter">}</span>
+<span id="L501" class="LineNr">501 </span>  <span class="Delimiter">}</span>
+<span id="L502" class="LineNr">502 </span>  <span class="Normal">delete</span> type<span class="Delimiter">;</span>
+<span id="L503" class="LineNr">503 </span>  type = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L504" class="LineNr">504 </span><span class="Delimiter">}</span>
+<span id="L505" class="LineNr">505 </span>type_tree::~type_tree<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L506" class="LineNr">506 </span>  <span class="Normal">delete</span> left<span class="Delimiter">;</span>
+<span id="L507" class="LineNr">507 </span>  <span class="Normal">delete</span> right<span class="Delimiter">;</span>
+<span id="L508" class="LineNr">508 </span><span class="Delimiter">}</span>
+<span id="L509" class="LineNr">509 </span>string_tree::~string_tree<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L510" class="LineNr">510 </span>  <span class="Normal">delete</span> left<span class="Delimiter">;</span>
+<span id="L511" class="LineNr">511 </span>  <span class="Normal">delete</span> right<span class="Delimiter">;</span>
+<span id="L512" class="LineNr">512 </span><span class="Delimiter">}</span>
+<span id="L513" class="LineNr">513 </span>
+<span id="L514" class="LineNr">514 </span><span class="Normal">void</span> append<span class="Delimiter">(</span>type_tree*&amp; base<span class="Delimiter">,</span> type_tree* extra<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L515" class="LineNr">515 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L516" class="LineNr">516 </span>    base = extra<span class="Delimiter">;</span>
+<span id="L517" class="LineNr">517 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L518" class="LineNr">518 </span>  <span class="Delimiter">}</span>
+<span id="L519" class="LineNr">519 </span>  type_tree* curr = base<span class="Delimiter">;</span>
+<span id="L520" class="LineNr">520 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
+<span id="L521" class="LineNr">521 </span>  curr<span class="Delimiter">-&gt;</span>right = extra<span class="Delimiter">;</span>
+<span id="L522" class="LineNr">522 </span><span class="Delimiter">}</span>
+<span id="L523" class="LineNr">523 </span>
+<span id="L524" class="LineNr">524 </span><span class="Normal">void</span> append<span class="Delimiter">(</span>string_tree*&amp; base<span class="Delimiter">,</span> string_tree* extra<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L525" class="LineNr">525 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L526" class="LineNr">526 </span>    base = extra<span class="Delimiter">;</span>
+<span id="L527" class="LineNr">527 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L528" class="LineNr">528 </span>  <span class="Delimiter">}</span>
+<span id="L529" class="LineNr">529 </span>  string_tree* curr = base<span class="Delimiter">;</span>
+<span id="L530" class="LineNr">530 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
+<span id="L531" class="LineNr">531 </span>  curr<span class="Delimiter">-&gt;</span>right = extra<span class="Delimiter">;</span>
+<span id="L532" class="LineNr">532 </span><span class="Delimiter">}</span>
+<span id="L533" class="LineNr">533 </span>
+<span id="L534" class="LineNr">534 </span>string slurp_until<span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">,</span> <span class="Normal">char</span> delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L535" class="LineNr">535 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L536" class="LineNr">536 </span>  <span class="Normal">char</span> c<span class="Delimiter">;</span>
+<span id="L537" class="LineNr">537 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>in &gt;&gt; c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L538" class="LineNr">538 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L539" class="LineNr">539 </span>      <span class="Comment">// drop the delim</span>
+<span id="L540" class="LineNr">540 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L541" class="LineNr">541 </span>    <span class="Delimiter">}</span>
+<span id="L542" class="LineNr">542 </span>    out &lt;&lt; c<span class="Delimiter">;</span>
 <span id="L543" class="LineNr">543 </span>  <span class="Delimiter">}</span>
-<span id="L544" class="LineNr">544 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L544" class="LineNr">544 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L545" class="LineNr">545 </span><span class="Delimiter">}</span>
 <span id="L546" class="LineNr">546 </span>
-<span id="L547" class="LineNr">547 </span>string_tree* property<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L548" class="LineNr">548 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> p = <span class="Constant">0</span><span class="Delimiter">;</span>  p != <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L549" class="LineNr">549 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">).</span>first == name<span class="Delimiter">)</span>
-<span id="L550" class="LineNr">550 </span>      <span class="Identifier">return</span> r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">).</span>second<span class="Delimiter">;</span>
-<span id="L551" class="LineNr">551 </span>  <span class="Delimiter">}</span>
-<span id="L552" class="LineNr">552 </span>  <span class="Identifier">return</span> <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L553" class="LineNr">553 </span><span class="Delimiter">}</span>
-<span id="L554" class="LineNr">554 </span>
-<span id="L555" class="LineNr">555 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L556" class="LineNr">556 </span><span class="Normal">extern</span> <span class="Normal">const</span> string Ignore<span class="Delimiter">(</span><span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// commas are ignored in Mu except within [] strings</span>
-<span id="L557" class="LineNr">557 </span><span class="Delimiter">:(code)</span>
-<span id="L558" class="LineNr">558 </span><span class="Normal">void</span> skip_whitespace_but_not_newline<span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L559" class="LineNr">559 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L560" class="LineNr">560 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L561" class="LineNr">561 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L562" class="LineNr">562 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L563" class="LineNr">563 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Ignore<span class="Delimiter">.</span>find<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> != string::npos<span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L564" class="LineNr">564 </span>    <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L565" class="LineNr">565 </span>  <span class="Delimiter">}</span>
-<span id="L566" class="LineNr">566 </span><span class="Delimiter">}</span>
-<span id="L567" class="LineNr">567 </span>
-<span id="L568" class="LineNr">568 </span><span class="Normal">void</span> dump_memory<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L569" class="LineNr">569 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">double</span>&gt;::iterator p = Memory<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Memory<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="L570" class="LineNr">570 </span>    cout &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L571" class="LineNr">571 </span>  <span class="Delimiter">}</span>
-<span id="L572" class="LineNr">572 </span><span class="Delimiter">}</span>
-<span id="L573" class="LineNr">573 </span>
-<span id="L574" class="LineNr">574 </span><span class="SalientComment">//:: Helpers for converting various values to string</span>
-<span id="L575" class="LineNr">575 </span><span class="Comment">//: Use to_string() in trace(), and try to keep it stable from run to run.</span>
-<span id="L576" class="LineNr">576 </span><span class="Comment">//: Use debug_string() while debugging, and throw everything into it.</span>
-<span id="L577" class="LineNr">577 </span><span class="Comment">//: Use inspect() only for emitting a canonical format that can be parsed back</span>
-<span id="L578" class="LineNr">578 </span><span class="Comment">//: into the value.</span>
-<span id="L579" class="LineNr">579 </span>
-<span id="L580" class="LineNr">580 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L581" class="LineNr">581 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L582" class="LineNr">582 </span>  out &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L583" class="LineNr">583 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L584" class="LineNr">584 </span>    out &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L585" class="LineNr">585 </span>  out &lt;&lt; <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L586" class="LineNr">586 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L587" class="LineNr">587 </span><span class="Delimiter">}</span>
-<span id="L588" class="LineNr">588 </span>
-<span id="L589" class="LineNr">589 </span>string debug_string<span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L590" class="LineNr">590 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L591" class="LineNr">591 </span>  out &lt;&lt; <span class="Constant">&quot;- <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L592" class="LineNr">592 </span>  <span class="Comment">// Begin debug_string(recipe x)</span>
-<span id="L593" class="LineNr">593 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> index = <span class="Constant">0</span><span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L594" class="LineNr">594 </span>    <span class="Normal">const</span> instruction&amp; inst = x<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
-<span id="L595" class="LineNr">595 </span>    out &lt;&lt; <span class="Constant">&quot;inst: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L596" class="LineNr">596 </span>    out &lt;&lt; <span class="Constant">&quot;  ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L597" class="LineNr">597 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L598" class="LineNr">598 </span>      out &lt;&lt; <span class="Constant">&quot;    &quot;</span> &lt;&lt; debug_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L599" class="LineNr">599 </span>    out &lt;&lt; <span class="Constant">&quot;  products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L600" class="LineNr">600 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L601" class="LineNr">601 </span>      out &lt;&lt; <span class="Constant">&quot;    &quot;</span> &lt;&lt; debug_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L602" class="LineNr">602 </span>  <span class="Delimiter">}</span>
+<span id="L547" class="LineNr">547 </span><span class="Normal">bool</span> has_property<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L548" class="LineNr">548 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L549" class="LineNr">549 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first == name<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</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="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L552" class="LineNr">552 </span><span class="Delimiter">}</span>
+<span id="L553" class="LineNr">553 </span>
+<span id="L554" class="LineNr">554 </span>string_tree* property<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L555" class="LineNr">555 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> p = <span class="Constant">0</span><span class="Delimiter">;</span>  p != <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L556" class="LineNr">556 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">).</span>first == name<span class="Delimiter">)</span>
+<span id="L557" class="LineNr">557 </span>      <span class="Identifier">return</span> r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">).</span>second<span class="Delimiter">;</span>
+<span id="L558" class="LineNr">558 </span>  <span class="Delimiter">}</span>
+<span id="L559" class="LineNr">559 </span>  <span class="Identifier">return</span> <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L560" class="LineNr">560 </span><span class="Delimiter">}</span>
+<span id="L561" class="LineNr">561 </span>
+<span id="L562" class="LineNr">562 </span>string_tree* copy<span class="Delimiter">(</span><span class="Normal">const</span> string_tree* x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L563" class="LineNr">563 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L564" class="LineNr">564 </span>  <span class="Identifier">return</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>*x<span class="Delimiter">);</span>
+<span id="L565" class="LineNr">565 </span><span class="Delimiter">}</span>
+<span id="L566" class="LineNr">566 </span>
+<span id="L567" class="LineNr">567 </span>type_tree* copy<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L568" class="LineNr">568 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L569" class="LineNr">569 </span>  <span class="Identifier">return</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*x<span class="Delimiter">);</span>
+<span id="L570" class="LineNr">570 </span><span class="Delimiter">}</span>
+<span id="L571" class="LineNr">571 </span>
+<span id="L572" class="LineNr">572 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L573" class="LineNr">573 </span><span class="Normal">extern</span> <span class="Normal">const</span> string Ignore<span class="Delimiter">(</span><span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// commas are ignored in Mu except within [] strings</span>
+<span id="L574" class="LineNr">574 </span><span class="Delimiter">:(code)</span>
+<span id="L575" class="LineNr">575 </span><span class="Normal">void</span> skip_whitespace_but_not_newline<span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L576" class="LineNr">576 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L577" class="LineNr">577 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L578" class="LineNr">578 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L579" class="LineNr">579 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L580" class="LineNr">580 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Ignore<span class="Delimiter">.</span>find<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> != string::npos<span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L581" class="LineNr">581 </span>    <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L582" class="LineNr">582 </span>  <span class="Delimiter">}</span>
+<span id="L583" class="LineNr">583 </span><span class="Delimiter">}</span>
+<span id="L584" class="LineNr">584 </span>
+<span id="L585" class="LineNr">585 </span><span class="Normal">void</span> dump_memory<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L586" class="LineNr">586 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">double</span>&gt;::iterator p = Memory<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Memory<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="L587" class="LineNr">587 </span>    cout &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L588" class="LineNr">588 </span>  <span class="Delimiter">}</span>
+<span id="L589" class="LineNr">589 </span><span class="Delimiter">}</span>
+<span id="L590" class="LineNr">590 </span>
+<span id="L591" class="LineNr">591 </span><span class="SalientComment">//:: Helpers for converting various values to string</span>
+<span id="L592" class="LineNr">592 </span><span class="Comment">//: Use to_string() in trace(), and try to keep it stable from run to run.</span>
+<span id="L593" class="LineNr">593 </span><span class="Comment">//: Use debug_string() while debugging, and throw everything into it.</span>
+<span id="L594" class="LineNr">594 </span><span class="Comment">//: Use inspect() only for emitting a canonical format that can be parsed back</span>
+<span id="L595" class="LineNr">595 </span><span class="Comment">//: into the value.</span>
+<span id="L596" class="LineNr">596 </span>
+<span id="L597" class="LineNr">597 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L598" class="LineNr">598 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L599" class="LineNr">599 </span>  out &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L600" class="LineNr">600 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L601" class="LineNr">601 </span>    out &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L602" class="LineNr">602 </span>  out &lt;&lt; <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L603" class="LineNr">603 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L604" class="LineNr">604 </span><span class="Delimiter">}</span>
 <span id="L605" class="LineNr">605 </span>
-<span id="L606" class="LineNr">606 </span>string to_original_string<span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L607" class="LineNr">607 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">return</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">;</span>
-<span id="L608" class="LineNr">608 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L609" class="LineNr">609 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L610" class="LineNr">610 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
-<span id="L611" class="LineNr">611 </span>    out &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span>
-<span id="L612" class="LineNr">612 </span>  <span class="Delimiter">}</span>
-<span id="L613" class="LineNr">613 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out &lt;&lt; <span class="Constant">&quot; &lt;- &quot;</span><span class="Delimiter">;</span>
-<span id="L614" class="LineNr">614 </span>  out &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L615" class="LineNr">615 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L616" class="LineNr">616 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
-<span id="L617" class="LineNr">617 </span>    out &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span>
-<span id="L618" class="LineNr">618 </span>  <span class="Delimiter">}</span>
-<span id="L619" class="LineNr">619 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L620" class="LineNr">620 </span><span class="Delimiter">}</span>
-<span id="L621" class="LineNr">621 </span>
-<span id="L622" class="LineNr">622 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L623" class="LineNr">623 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">return</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">;</span>
-<span id="L624" class="LineNr">624 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L625" class="LineNr">625 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L626" class="LineNr">626 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
-<span id="L627" class="LineNr">627 </span>    out &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L628" class="LineNr">628 </span>  <span class="Delimiter">}</span>
-<span id="L629" class="LineNr">629 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out &lt;&lt; <span class="Constant">&quot; &lt;- &quot;</span><span class="Delimiter">;</span>
-<span id="L630" class="LineNr">630 </span>  out &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L631" class="LineNr">631 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L632" class="LineNr">632 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
-<span id="L633" class="LineNr">633 </span>    out &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L634" class="LineNr">634 </span>  <span class="Delimiter">}</span>
-<span id="L635" class="LineNr">635 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L636" class="LineNr">636 </span><span class="Delimiter">}</span>
-<span id="L637" class="LineNr">637 </span>
-<span id="L638" class="LineNr">638 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L639" class="LineNr">639 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;_&quot;</span><span class="Delimiter">;</span>
-<span id="L640" class="LineNr">640 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L641" class="LineNr">641 </span>  out &lt;&lt; <span class="Constant">&quot;{&quot;</span><span class="Delimiter">;</span>
-<span id="L642" class="LineNr">642 </span>  out &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L643" class="LineNr">643 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L644" class="LineNr">644 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L645" class="LineNr">645 </span>      out &lt;&lt; <span class="Constant">&quot;, </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">);</span>
-<span id="L646" class="LineNr">646 </span>  <span class="Delimiter">}</span>
-<span id="L647" class="LineNr">647 </span>  out &lt;&lt; <span class="Constant">&quot;}&quot;</span><span class="Delimiter">;</span>
-<span id="L648" class="LineNr">648 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L649" class="LineNr">649 </span><span class="Delimiter">}</span>
-<span id="L650" class="LineNr">650 </span>
-<span id="L651" class="LineNr">651 </span><span class="Comment">// special name for ignoring some products</span>
-<span id="L652" class="LineNr">652 </span><span class="Normal">bool</span> is_dummy<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L653" class="LineNr">653 </span>  <span class="Identifier">return</span> x<span class="Delimiter">.</span>name == <span class="Constant">&quot;_&quot;</span><span class="Delimiter">;</span>
-<span id="L654" class="LineNr">654 </span><span class="Delimiter">}</span>
-<span id="L655" class="LineNr">655 </span>
-<span id="L656" class="LineNr">656 </span>string debug_string<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L606" class="LineNr">606 </span>string debug_string<span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L607" class="LineNr">607 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L608" class="LineNr">608 </span>  out &lt;&lt; <span class="Constant">&quot;- <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L609" class="LineNr">609 </span>  <span class="Comment">// Begin debug_string(recipe x)</span>
+<span id="L610" class="LineNr">610 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> index = <span class="Constant">0</span><span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L611" class="LineNr">611 </span>    <span class="Normal">const</span> instruction&amp; inst = x<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
+<span id="L612" class="LineNr">612 </span>    out &lt;&lt; <span class="Constant">&quot;inst: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L613" class="LineNr">613 </span>    out &lt;&lt; <span class="Constant">&quot;  ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L614" class="LineNr">614 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L615" class="LineNr">615 </span>      out &lt;&lt; <span class="Constant">&quot;    &quot;</span> &lt;&lt; debug_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L616" class="LineNr">616 </span>    out &lt;&lt; <span class="Constant">&quot;  products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L617" class="LineNr">617 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L618" class="LineNr">618 </span>      out &lt;&lt; <span class="Constant">&quot;    &quot;</span> &lt;&lt; debug_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L619" class="LineNr">619 </span>  <span class="Delimiter">}</span>
+<span id="L620" class="LineNr">620 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L621" class="LineNr">621 </span><span class="Delimiter">}</span>
+<span id="L622" class="LineNr">622 </span>
+<span id="L623" class="LineNr">623 </span>string to_original_string<span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L624" class="LineNr">624 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">return</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">;</span>
+<span id="L625" class="LineNr">625 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L626" class="LineNr">626 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L627" class="LineNr">627 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
+<span id="L628" class="LineNr">628 </span>    out &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span>
+<span id="L629" class="LineNr">629 </span>  <span class="Delimiter">}</span>
+<span id="L630" class="LineNr">630 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out &lt;&lt; <span class="Constant">&quot; &lt;- &quot;</span><span class="Delimiter">;</span>
+<span id="L631" class="LineNr">631 </span>  out &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L632" class="LineNr">632 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L633" class="LineNr">633 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
+<span id="L634" class="LineNr">634 </span>    out &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span>
+<span id="L635" class="LineNr">635 </span>  <span class="Delimiter">}</span>
+<span id="L636" class="LineNr">636 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L637" class="LineNr">637 </span><span class="Delimiter">}</span>
+<span id="L638" class="LineNr">638 </span>
+<span id="L639" class="LineNr">639 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L640" class="LineNr">640 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">return</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">;</span>
+<span id="L641" class="LineNr">641 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L642" class="LineNr">642 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L643" class="LineNr">643 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
+<span id="L644" class="LineNr">644 </span>    out &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L645" class="LineNr">645 </span>  <span class="Delimiter">}</span>
+<span id="L646" class="LineNr">646 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out &lt;&lt; <span class="Constant">&quot; &lt;- &quot;</span><span class="Delimiter">;</span>
+<span id="L647" class="LineNr">647 </span>  out &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L648" class="LineNr">648 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L649" class="LineNr">649 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">&quot;, &quot;</span><span class="Delimiter">;</span>
+<span id="L650" class="LineNr">650 </span>    out &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L651" class="LineNr">651 </span>  <span class="Delimiter">}</span>
+<span id="L652" class="LineNr">652 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L653" class="LineNr">653 </span><span class="Delimiter">}</span>
+<span id="L654" class="LineNr">654 </span>
+<span id="L655" class="LineNr">655 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L656" class="LineNr">656 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;_&quot;</span><span class="Delimiter">;</span>
 <span id="L657" class="LineNr">657 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L658" class="LineNr">658 </span>  out &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; -- &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
-<span id="L659" class="LineNr">659 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L660" class="LineNr">660 </span><span class="Delimiter">}</span>
-<span id="L661" class="LineNr">661 </span>
-<span id="L662" class="LineNr">662 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> string_tree* property<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L663" class="LineNr">663 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!property<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;()&quot;</span><span class="Delimiter">;</span>
-<span id="L664" class="LineNr">664 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L665" class="LineNr">665 </span>  dump<span class="Delimiter">(</span>property<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L666" class="LineNr">666 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L667" class="LineNr">667 </span><span class="Delimiter">}</span>
-<span id="L668" class="LineNr">668 </span>
-<span id="L669" class="LineNr">669 </span><span class="Normal">void</span> dump<span class="Delimiter">(</span><span class="Normal">const</span> string_tree* x<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L670" class="LineNr">670 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L671" class="LineNr">671 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L672" class="LineNr">672 </span>    out &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; x<span class="Delimiter">-&gt;</span>value &lt;&lt; <span class="Constant">'&quot;'</span><span class="Delimiter">;</span>
-<span id="L673" class="LineNr">673 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L674" class="LineNr">674 </span>  <span class="Delimiter">}</span>
-<span id="L675" class="LineNr">675 </span>  out &lt;&lt; <span class="Constant">'('</span><span class="Delimiter">;</span>
-<span id="L676" class="LineNr">676 </span>  <span class="Normal">const</span> string_tree* curr = x<span class="Delimiter">;</span>
-<span id="L677" class="LineNr">677 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L678" class="LineNr">678 </span>    dump<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L679" class="LineNr">679 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L680" class="LineNr">680 </span>    curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
-<span id="L681" class="LineNr">681 </span>  <span class="Delimiter">}</span>
-<span id="L682" class="LineNr">682 </span>  <span class="Comment">// check for dotted list; should never happen</span>
-<span id="L683" class="LineNr">683 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L684" class="LineNr">684 </span>    out &lt;&lt; <span class="Constant">&quot;. &quot;</span><span class="Delimiter">;</span>
-<span id="L685" class="LineNr">685 </span>    dump<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L686" class="LineNr">686 </span>  <span class="Delimiter">}</span>
-<span id="L687" class="LineNr">687 </span>  out &lt;&lt; <span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L688" class="LineNr">688 </span><span class="Delimiter">}</span>
-<span id="L689" class="LineNr">689 </span>
-<span id="L690" class="LineNr">690 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L691" class="LineNr">691 </span>  <span class="Comment">// abbreviate a single-node tree to just its contents</span>
-<span id="L692" class="LineNr">692 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;NULLNULLNULL&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// should never happen</span>
-<span id="L693" class="LineNr">693 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L694" class="LineNr">694 </span>  dump<span class="Delimiter">(</span>type<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L695" class="LineNr">695 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L696" class="LineNr">696 </span><span class="Delimiter">}</span>
-<span id="L697" class="LineNr">697 </span>
-<span id="L698" class="LineNr">698 </span><span class="Normal">void</span> dump<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L699" class="LineNr">699 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L700" class="LineNr">700 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L701" class="LineNr">701 </span>    dump<span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>value<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L702" class="LineNr">702 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L658" class="LineNr">658 </span>  out &lt;&lt; <span class="Constant">&quot;{&quot;</span><span class="Delimiter">;</span>
+<span id="L659" class="LineNr">659 </span>  out &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L660" class="LineNr">660 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L661" class="LineNr">661 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L662" class="LineNr">662 </span>      out &lt;&lt; <span class="Constant">&quot;, </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">);</span>
+<span id="L663" class="LineNr">663 </span>  <span class="Delimiter">}</span>
+<span id="L664" class="LineNr">664 </span>  out &lt;&lt; <span class="Constant">&quot;}&quot;</span><span class="Delimiter">;</span>
+<span id="L665" class="LineNr">665 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L666" class="LineNr">666 </span><span class="Delimiter">}</span>
+<span id="L667" class="LineNr">667 </span>
+<span id="L668" class="LineNr">668 </span><span class="Comment">// special name for ignoring some products</span>
+<span id="L669" class="LineNr">669 </span><span class="Normal">bool</span> is_dummy<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L670" class="LineNr">670 </span>  <span class="Identifier">return</span> x<span class="Delimiter">.</span>name == <span class="Constant">&quot;_&quot;</span><span class="Delimiter">;</span>
+<span id="L671" class="LineNr">671 </span><span class="Delimiter">}</span>
+<span id="L672" class="LineNr">672 </span>
+<span id="L673" class="LineNr">673 </span>string debug_string<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L674" class="LineNr">674 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L675" class="LineNr">675 </span>  out &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; -- &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L676" class="LineNr">676 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L677" class="LineNr">677 </span><span class="Delimiter">}</span>
+<span id="L678" class="LineNr">678 </span>
+<span id="L679" class="LineNr">679 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> string_tree* property<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L680" class="LineNr">680 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!property<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;()&quot;</span><span class="Delimiter">;</span>
+<span id="L681" class="LineNr">681 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L682" class="LineNr">682 </span>  dump<span class="Delimiter">(</span>property<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L683" class="LineNr">683 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L684" class="LineNr">684 </span><span class="Delimiter">}</span>
+<span id="L685" class="LineNr">685 </span>
+<span id="L686" class="LineNr">686 </span><span class="Normal">void</span> dump<span class="Delimiter">(</span><span class="Normal">const</span> string_tree* x<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L687" class="LineNr">687 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L688" class="LineNr">688 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L689" class="LineNr">689 </span>    out &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; x<span class="Delimiter">-&gt;</span>value &lt;&lt; <span class="Constant">'&quot;'</span><span class="Delimiter">;</span>
+<span id="L690" class="LineNr">690 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L691" class="LineNr">691 </span>  <span class="Delimiter">}</span>
+<span id="L692" class="LineNr">692 </span>  out &lt;&lt; <span class="Constant">'('</span><span class="Delimiter">;</span>
+<span id="L693" class="LineNr">693 </span>  <span class="Normal">const</span> string_tree* curr = x<span class="Delimiter">;</span>
+<span id="L694" class="LineNr">694 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L695" class="LineNr">695 </span>    dump<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L696" class="LineNr">696 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L697" class="LineNr">697 </span>    curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
+<span id="L698" class="LineNr">698 </span>  <span class="Delimiter">}</span>
+<span id="L699" class="LineNr">699 </span>  <span class="Comment">// check for dotted list; should never happen</span>
+<span id="L700" class="LineNr">700 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L701" class="LineNr">701 </span>    out &lt;&lt; <span class="Constant">&quot;. &quot;</span><span class="Delimiter">;</span>
+<span id="L702" class="LineNr">702 </span>    dump<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
 <span id="L703" class="LineNr">703 </span>  <span class="Delimiter">}</span>
-<span id="L704" class="LineNr">704 </span>  out &lt;&lt; <span class="Constant">'('</span><span class="Delimiter">;</span>
-<span id="L705" class="LineNr">705 </span>  <span class="Normal">const</span> type_tree* curr = x<span class="Delimiter">;</span>
-<span id="L706" class="LineNr">706 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L707" class="LineNr">707 </span>    dump<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L708" class="LineNr">708 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L709" class="LineNr">709 </span>    curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
-<span id="L710" class="LineNr">710 </span>  <span class="Delimiter">}</span>
-<span id="L711" class="LineNr">711 </span>  <span class="Comment">// check for dotted list; should never happen</span>
-<span id="L712" class="LineNr">712 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L713" class="LineNr">713 </span>    out &lt;&lt; <span class="Constant">&quot;. &quot;</span><span class="Delimiter">;</span>
-<span id="L714" class="LineNr">714 </span>    dump<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L715" class="LineNr">715 </span>  <span class="Delimiter">}</span>
-<span id="L716" class="LineNr">716 </span>  out &lt;&lt; <span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L717" class="LineNr">717 </span><span class="Delimiter">}</span>
-<span id="L718" class="LineNr">718 </span>
-<span id="L719" class="LineNr">719 </span><span class="Normal">void</span> dump<span class="Delimiter">(</span><a href='010vm.cc.html#L124'>type_ordinal</a> type<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L720" class="LineNr">720 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L721" class="LineNr">721 </span>    out &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
-<span id="L722" class="LineNr">722 </span>  <span class="Normal">else</span>
-<span id="L723" class="LineNr">723 </span>    out &lt;&lt; <span class="Constant">&quot;?&quot;</span> &lt;&lt; type<span class="Delimiter">;</span>
-<span id="L724" class="LineNr">724 </span><span class="Delimiter">}</span>
-<span id="L725" class="LineNr">725 </span>
-<span id="L726" class="LineNr">726 </span>string names_to_string<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L727" class="LineNr">727 </span>  <span class="Comment">// abbreviate a single-node tree to just its contents</span>
-<span id="L728" class="LineNr">728 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;()&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// should never happen</span>
-<span id="L729" class="LineNr">729 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L730" class="LineNr">730 </span>  dump_names<span class="Delimiter">(</span>type<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L731" class="LineNr">731 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L732" class="LineNr">732 </span><span class="Delimiter">}</span>
-<span id="L733" class="LineNr">733 </span>
-<span id="L734" class="LineNr">734 </span><span class="Normal">void</span> dump_names<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L735" class="LineNr">735 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L736" class="LineNr">736 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L737" class="LineNr">737 </span>    out &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; x<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">'&quot;'</span><span class="Delimiter">;</span>
-<span id="L738" class="LineNr">738 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L739" class="LineNr">739 </span>  <span class="Delimiter">}</span>
-<span id="L740" class="LineNr">740 </span>  out &lt;&lt; <span class="Constant">'('</span><span class="Delimiter">;</span>
-<span id="L741" class="LineNr">741 </span>  <span class="Normal">const</span> type_tree* curr = x<span class="Delimiter">;</span>
-<span id="L742" class="LineNr">742 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L743" class="LineNr">743 </span>    dump_names<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L744" class="LineNr">744 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L745" class="LineNr">745 </span>    curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
-<span id="L746" class="LineNr">746 </span>  <span class="Delimiter">}</span>
-<span id="L747" class="LineNr">747 </span>  <span class="Comment">// check for dotted list; should never happen</span>
-<span id="L748" class="LineNr">748 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L749" class="LineNr">749 </span>    out &lt;&lt; <span class="Constant">&quot;. &quot;</span><span class="Delimiter">;</span>
-<span id="L750" class="LineNr">750 </span>    dump_names<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L751" class="LineNr">751 </span>  <span class="Delimiter">}</span>
-<span id="L752" class="LineNr">752 </span>  out &lt;&lt; <span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L753" class="LineNr">753 </span><span class="Delimiter">}</span>
-<span id="L754" class="LineNr">754 </span>
-<span id="L755" class="LineNr">755 </span>string names_to_string_without_quotes<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L756" class="LineNr">756 </span>  <span class="Comment">// abbreviate a single-node tree to just its contents</span>
-<span id="L757" class="LineNr">757 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;NULLNULLNULL&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// should never happen</span>
-<span id="L758" class="LineNr">758 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L759" class="LineNr">759 </span>  dump_names_without_quotes<span class="Delimiter">(</span>type<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L760" class="LineNr">760 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L761" class="LineNr">761 </span><span class="Delimiter">}</span>
-<span id="L762" class="LineNr">762 </span>
-<span id="L763" class="LineNr">763 </span><span class="Normal">void</span> dump_names_without_quotes<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L764" class="LineNr">764 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L765" class="LineNr">765 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L766" class="LineNr">766 </span>    out &lt;&lt; x<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
-<span id="L767" class="LineNr">767 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L704" class="LineNr">704 </span>  out &lt;&lt; <span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L705" class="LineNr">705 </span><span class="Delimiter">}</span>
+<span id="L706" class="LineNr">706 </span>
+<span id="L707" class="LineNr">707 </span>string <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L708" class="LineNr">708 </span>  <span class="Comment">// abbreviate a single-node tree to just its contents</span>
+<span id="L709" class="LineNr">709 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;NULLNULLNULL&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// should never happen</span>
+<span id="L710" class="LineNr">710 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L711" class="LineNr">711 </span>  dump<span class="Delimiter">(</span>type<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L712" class="LineNr">712 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L713" class="LineNr">713 </span><span class="Delimiter">}</span>
+<span id="L714" class="LineNr">714 </span>
+<span id="L715" class="LineNr">715 </span><span class="Normal">void</span> dump<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L716" class="LineNr">716 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L717" class="LineNr">717 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L718" class="LineNr">718 </span>    dump<span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>value<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L719" class="LineNr">719 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L720" class="LineNr">720 </span>  <span class="Delimiter">}</span>
+<span id="L721" class="LineNr">721 </span>  out &lt;&lt; <span class="Constant">'('</span><span class="Delimiter">;</span>
+<span id="L722" class="LineNr">722 </span>  <span class="Normal">const</span> type_tree* curr = x<span class="Delimiter">;</span>
+<span id="L723" class="LineNr">723 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L724" class="LineNr">724 </span>    dump<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L725" class="LineNr">725 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L726" class="LineNr">726 </span>    curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
+<span id="L727" class="LineNr">727 </span>  <span class="Delimiter">}</span>
+<span id="L728" class="LineNr">728 </span>  <span class="Comment">// check for dotted list; should never happen</span>
+<span id="L729" class="LineNr">729 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L730" class="LineNr">730 </span>    out &lt;&lt; <span class="Constant">&quot;. &quot;</span><span class="Delimiter">;</span>
+<span id="L731" class="LineNr">731 </span>    dump<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L732" class="LineNr">732 </span>  <span class="Delimiter">}</span>
+<span id="L733" class="LineNr">733 </span>  out &lt;&lt; <span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L734" class="LineNr">734 </span><span class="Delimiter">}</span>
+<span id="L735" class="LineNr">735 </span>
+<span id="L736" class="LineNr">736 </span><span class="Normal">void</span> dump<span class="Delimiter">(</span><a href='010vm.cc.html#L123'>type_ordinal</a> type<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L737" class="LineNr">737 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L738" class="LineNr">738 </span>    out &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
+<span id="L739" class="LineNr">739 </span>  <span class="Normal">else</span>
+<span id="L740" class="LineNr">740 </span>    out &lt;&lt; <span class="Constant">&quot;?&quot;</span> &lt;&lt; type<span class="Delimiter">;</span>
+<span id="L741" class="LineNr">741 </span><span class="Delimiter">}</span>
+<span id="L742" class="LineNr">742 </span>
+<span id="L743" class="LineNr">743 </span>string names_to_string<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L744" class="LineNr">744 </span>  <span class="Comment">// abbreviate a single-node tree to just its contents</span>
+<span id="L745" class="LineNr">745 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;()&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// should never happen</span>
+<span id="L746" class="LineNr">746 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L747" class="LineNr">747 </span>  dump_names<span class="Delimiter">(</span>type<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L748" class="LineNr">748 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L749" class="LineNr">749 </span><span class="Delimiter">}</span>
+<span id="L750" class="LineNr">750 </span>
+<span id="L751" class="LineNr">751 </span><span class="Normal">void</span> dump_names<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L752" class="LineNr">752 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L753" class="LineNr">753 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L754" class="LineNr">754 </span>    out &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; x<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">'&quot;'</span><span class="Delimiter">;</span>
+<span id="L755" class="LineNr">755 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L756" class="LineNr">756 </span>  <span class="Delimiter">}</span>
+<span id="L757" class="LineNr">757 </span>  out &lt;&lt; <span class="Constant">'('</span><span class="Delimiter">;</span>
+<span id="L758" class="LineNr">758 </span>  <span class="Normal">const</span> type_tree* curr = x<span class="Delimiter">;</span>
+<span id="L759" class="LineNr">759 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L760" class="LineNr">760 </span>    dump_names<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L761" class="LineNr">761 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L762" class="LineNr">762 </span>    curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
+<span id="L763" class="LineNr">763 </span>  <span class="Delimiter">}</span>
+<span id="L764" class="LineNr">764 </span>  <span class="Comment">// check for dotted list; should never happen</span>
+<span id="L765" class="LineNr">765 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L766" class="LineNr">766 </span>    out &lt;&lt; <span class="Constant">&quot;. &quot;</span><span class="Delimiter">;</span>
+<span id="L767" class="LineNr">767 </span>    dump_names<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
 <span id="L768" class="LineNr">768 </span>  <span class="Delimiter">}</span>
-<span id="L769" class="LineNr">769 </span>  out &lt;&lt; <span class="Constant">'('</span><span class="Delimiter">;</span>
-<span id="L770" class="LineNr">770 </span>  <span class="Normal">const</span> type_tree* curr = x<span class="Delimiter">;</span>
-<span id="L771" class="LineNr">771 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L772" class="LineNr">772 </span>    dump_names_without_quotes<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L773" class="LineNr">773 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L774" class="LineNr">774 </span>    curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
-<span id="L775" class="LineNr">775 </span>  <span class="Delimiter">}</span>
-<span id="L776" class="LineNr">776 </span>  <span class="Comment">// check for dotted list; should never happen</span>
-<span id="L777" class="LineNr">777 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L778" class="LineNr">778 </span>    out &lt;&lt; <span class="Constant">&quot;. &quot;</span><span class="Delimiter">;</span>
-<span id="L779" class="LineNr">779 </span>    dump_names_without_quotes<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L780" class="LineNr">780 </span>  <span class="Delimiter">}</span>
-<span id="L781" class="LineNr">781 </span>  out &lt;&lt; <span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L782" class="LineNr">782 </span><span class="Delimiter">}</span>
-<span id="L783" class="LineNr">783 </span>
-<span id="L784" class="LineNr">784 </span><span class="Comment">//: helper to print numbers without excessive precision</span>
-<span id="L785" class="LineNr">785 </span>
-<span id="L786" class="LineNr">786 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L787" class="LineNr">787 </span><span class="Normal">struct</span> no_scientific <span class="Delimiter">{</span>
-<span id="L788" class="LineNr">788 </span>  <span class="Normal">double</span> x<span class="Delimiter">;</span>
-<span id="L789" class="LineNr">789 </span>  <span class="Normal">explicit</span> no_scientific<span class="Delimiter">(</span><span class="Normal">double</span> y<span class="Delimiter">)</span> :x<span class="Delimiter">(</span>y<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L790" class="LineNr">790 </span><span class="Delimiter">};</span>
-<span id="L791" class="LineNr">791 </span>
-<span id="L792" class="LineNr">792 </span><span class="Delimiter">:(code)</span>
-<span id="L793" class="LineNr">793 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> no_scientific x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L794" class="LineNr">794 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!isfinite<span class="Delimiter">(</span>x<span class="Delimiter">.</span>x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L795" class="LineNr">795 </span>    <span class="Comment">// Infinity or NaN</span>
-<span id="L796" class="LineNr">796 </span>    os &lt;&lt; x<span class="Delimiter">.</span>x<span class="Delimiter">;</span>
-<span id="L797" class="LineNr">797 </span>    <span class="Identifier">return</span> os<span class="Delimiter">;</span>
-<span id="L798" class="LineNr">798 </span>  <span class="Delimiter">}</span>
-<span id="L799" class="LineNr">799 </span>  ostringstream tmp<span class="Delimiter">;</span>
-<span id="L800" class="LineNr">800 </span>  <span class="Comment">// more accurate, but too slow</span>
-<span id="L801" class="LineNr">801 </span><span class="CommentedCode">//?   tmp.precision(308);  // for 64-bit numbers</span>
-<span id="L802" class="LineNr">802 </span>  tmp &lt;&lt; std::fixed &lt;&lt; x<span class="Delimiter">.</span>x<span class="Delimiter">;</span>
-<span id="L803" class="LineNr">803 </span>  os &lt;&lt; trim_floating_point<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
-<span id="L804" class="LineNr">804 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
-<span id="L805" class="LineNr">805 </span><span class="Delimiter">}</span>
-<span id="L806" class="LineNr">806 </span>
-<span id="L807" class="LineNr">807 </span>string trim_floating_point<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L808" class="LineNr">808 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L809" class="LineNr">809 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'.'</span><span class="Delimiter">)</span> == string::npos<span class="Delimiter">)</span> <span class="Identifier">return</span> in<span class="Delimiter">;</span>
-<span id="L810" class="LineNr">810 </span>  <span class="Normal">int</span> length = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L811" class="LineNr">811 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>length &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L812" class="LineNr">812 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>length-<span class="Constant">1</span><span class="Delimiter">)</span> != <span class="Constant">'0'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L813" class="LineNr">813 </span>    --length<span class="Delimiter">;</span>
-<span id="L814" class="LineNr">814 </span>  <span class="Delimiter">}</span>
-<span id="L815" class="LineNr">815 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>length-<span class="Constant">1</span><span class="Delimiter">)</span> == <span class="Constant">'.'</span><span class="Delimiter">)</span> --length<span class="Delimiter">;</span>
-<span id="L816" class="LineNr">816 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>length == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;0&quot;</span><span class="Delimiter">;</span>
-<span id="L817" class="LineNr">817 </span>  <span class="Identifier">return</span> in<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> length<span class="Delimiter">);</span>
-<span id="L818" class="LineNr">818 </span><span class="Delimiter">}</span>
-<span id="L819" class="LineNr">819 </span>
-<span id="L820" class="LineNr">820 </span><span class="Normal">void</span> test_trim_floating_point<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L821" class="LineNr">821 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L822" class="LineNr">822 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;.0&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;0&quot;</span><span class="Delimiter">);</span>
-<span id="L823" class="LineNr">823 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;1.5000&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;1.5&quot;</span><span class="Delimiter">);</span>
-<span id="L824" class="LineNr">824 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;1.000001&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;1.000001&quot;</span><span class="Delimiter">);</span>
-<span id="L825" class="LineNr">825 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;23.000000&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">);</span>
-<span id="L826" class="LineNr">826 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;23.0&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">);</span>
-<span id="L827" class="LineNr">827 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;23.&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">);</span>
-<span id="L828" class="LineNr">828 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;23&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">);</span>
-<span id="L829" class="LineNr">829 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;230&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;230&quot;</span><span class="Delimiter">);</span>
-<span id="L830" class="LineNr">830 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;3.000000&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;3&quot;</span><span class="Delimiter">);</span>
-<span id="L831" class="LineNr">831 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;3.0&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;3&quot;</span><span class="Delimiter">);</span>
-<span id="L832" class="LineNr">832 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;3.&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;3&quot;</span><span class="Delimiter">);</span>
-<span id="L833" class="LineNr">833 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;3&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;3&quot;</span><span class="Delimiter">);</span>
-<span id="L834" class="LineNr">834 </span><span class="Delimiter">}</span>
-<span id="L835" class="LineNr">835 </span>
-<span id="L836" class="LineNr">836 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L837" class="LineNr">837 </span><span class="PreProc">#include </span><span class="Constant">&lt;utility&gt;</span>
-<span id="L838" class="LineNr">838 </span><span class="Normal">using</span> std::pair<span class="Delimiter">;</span>
-<span id="L839" class="LineNr">839 </span><span class="PreProc">#include </span><span class="Constant">&lt;math.h&gt;</span>
+<span id="L769" class="LineNr">769 </span>  out &lt;&lt; <span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L770" class="LineNr">770 </span><span class="Delimiter">}</span>
+<span id="L771" class="LineNr">771 </span>
+<span id="L772" class="LineNr">772 </span>string names_to_string_without_quotes<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L773" class="LineNr">773 </span>  <span class="Comment">// abbreviate a single-node tree to just its contents</span>
+<span id="L774" class="LineNr">774 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;NULLNULLNULL&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// should never happen</span>
+<span id="L775" class="LineNr">775 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L776" class="LineNr">776 </span>  dump_names_without_quotes<span class="Delimiter">(</span>type<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L777" class="LineNr">777 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L778" class="LineNr">778 </span><span class="Delimiter">}</span>
+<span id="L779" class="LineNr">779 </span>
+<span id="L780" class="LineNr">780 </span><span class="Normal">void</span> dump_names_without_quotes<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L781" class="LineNr">781 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L782" class="LineNr">782 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L783" class="LineNr">783 </span>    out &lt;&lt; x<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
+<span id="L784" class="LineNr">784 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L785" class="LineNr">785 </span>  <span class="Delimiter">}</span>
+<span id="L786" class="LineNr">786 </span>  out &lt;&lt; <span class="Constant">'('</span><span class="Delimiter">;</span>
+<span id="L787" class="LineNr">787 </span>  <span class="Normal">const</span> type_tree* curr = x<span class="Delimiter">;</span>
+<span id="L788" class="LineNr">788 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr &amp;&amp; !curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L789" class="LineNr">789 </span>    dump_names_without_quotes<span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L790" class="LineNr">790 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L791" class="LineNr">791 </span>    curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
+<span id="L792" class="LineNr">792 </span>  <span class="Delimiter">}</span>
+<span id="L793" class="LineNr">793 </span>  <span class="Comment">// check for dotted list; should never happen</span>
+<span id="L794" class="LineNr">794 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L795" class="LineNr">795 </span>    out &lt;&lt; <span class="Constant">&quot;. &quot;</span><span class="Delimiter">;</span>
+<span id="L796" class="LineNr">796 </span>    dump_names_without_quotes<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L797" class="LineNr">797 </span>  <span class="Delimiter">}</span>
+<span id="L798" class="LineNr">798 </span>  out &lt;&lt; <span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L799" class="LineNr">799 </span><span class="Delimiter">}</span>
+<span id="L800" class="LineNr">800 </span>
+<span id="L801" class="LineNr">801 </span><span class="Comment">//: helper to print numbers without excessive precision</span>
+<span id="L802" class="LineNr">802 </span>
+<span id="L803" class="LineNr">803 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L804" class="LineNr">804 </span><span class="Normal">struct</span> no_scientific <span class="Delimiter">{</span>
+<span id="L805" class="LineNr">805 </span>  <span class="Normal">double</span> x<span class="Delimiter">;</span>
+<span id="L806" class="LineNr">806 </span>  <span class="Normal">explicit</span> no_scientific<span class="Delimiter">(</span><span class="Normal">double</span> y<span class="Delimiter">)</span> :x<span class="Delimiter">(</span>y<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L807" class="LineNr">807 </span><span class="Delimiter">};</span>
+<span id="L808" class="LineNr">808 </span>
+<span id="L809" class="LineNr">809 </span><span class="Delimiter">:(code)</span>
+<span id="L810" class="LineNr">810 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> no_scientific x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L811" class="LineNr">811 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!isfinite<span class="Delimiter">(</span>x<span class="Delimiter">.</span>x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L812" class="LineNr">812 </span>    <span class="Comment">// Infinity or NaN</span>
+<span id="L813" class="LineNr">813 </span>    os &lt;&lt; x<span class="Delimiter">.</span>x<span class="Delimiter">;</span>
+<span id="L814" class="LineNr">814 </span>    <span class="Identifier">return</span> os<span class="Delimiter">;</span>
+<span id="L815" class="LineNr">815 </span>  <span class="Delimiter">}</span>
+<span id="L816" class="LineNr">816 </span>  ostringstream tmp<span class="Delimiter">;</span>
+<span id="L817" class="LineNr">817 </span>  <span class="Comment">// more accurate, but too slow</span>
+<span id="L818" class="LineNr">818 </span><span class="CommentedCode">//?   tmp.precision(308);  // for 64-bit numbers</span>
+<span id="L819" class="LineNr">819 </span>  tmp &lt;&lt; std::fixed &lt;&lt; x<span class="Delimiter">.</span>x<span class="Delimiter">;</span>
+<span id="L820" class="LineNr">820 </span>  os &lt;&lt; trim_floating_point<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
+<span id="L821" class="LineNr">821 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
+<span id="L822" class="LineNr">822 </span><span class="Delimiter">}</span>
+<span id="L823" class="LineNr">823 </span>
+<span id="L824" class="LineNr">824 </span>string trim_floating_point<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L825" class="LineNr">825 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L826" class="LineNr">826 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'.'</span><span class="Delimiter">)</span> == string::npos<span class="Delimiter">)</span> <span class="Identifier">return</span> in<span class="Delimiter">;</span>
+<span id="L827" class="LineNr">827 </span>  <span class="Normal">int</span> length = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L828" class="LineNr">828 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>length &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L829" class="LineNr">829 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>length-<span class="Constant">1</span><span class="Delimiter">)</span> != <span class="Constant">'0'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L830" class="LineNr">830 </span>    --length<span class="Delimiter">;</span>
+<span id="L831" class="LineNr">831 </span>  <span class="Delimiter">}</span>
+<span id="L832" class="LineNr">832 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>length-<span class="Constant">1</span><span class="Delimiter">)</span> == <span class="Constant">'.'</span><span class="Delimiter">)</span> --length<span class="Delimiter">;</span>
+<span id="L833" class="LineNr">833 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>length == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;0&quot;</span><span class="Delimiter">;</span>
+<span id="L834" class="LineNr">834 </span>  <span class="Identifier">return</span> in<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> length<span class="Delimiter">);</span>
+<span id="L835" class="LineNr">835 </span><span class="Delimiter">}</span>
+<span id="L836" class="LineNr">836 </span>
+<span id="L837" class="LineNr">837 </span><span class="Normal">void</span> test_trim_floating_point<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L838" class="LineNr">838 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L839" class="LineNr">839 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;.0&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;0&quot;</span><span class="Delimiter">);</span>
+<span id="L840" class="LineNr">840 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;1.5000&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;1.5&quot;</span><span class="Delimiter">);</span>
+<span id="L841" class="LineNr">841 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;1.000001&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;1.000001&quot;</span><span class="Delimiter">);</span>
+<span id="L842" class="LineNr">842 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;23.000000&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">);</span>
+<span id="L843" class="LineNr">843 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;23.0&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">);</span>
+<span id="L844" class="LineNr">844 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;23.&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">);</span>
+<span id="L845" class="LineNr">845 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;23&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">);</span>
+<span id="L846" class="LineNr">846 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;230&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;230&quot;</span><span class="Delimiter">);</span>
+<span id="L847" class="LineNr">847 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;3.000000&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;3&quot;</span><span class="Delimiter">);</span>
+<span id="L848" class="LineNr">848 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;3.0&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;3&quot;</span><span class="Delimiter">);</span>
+<span id="L849" class="LineNr">849 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;3.&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;3&quot;</span><span class="Delimiter">);</span>
+<span id="L850" class="LineNr">850 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>trim_floating_point<span class="Delimiter">(</span><span class="Constant">&quot;3&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;3&quot;</span><span class="Delimiter">);</span>
+<span id="L851" class="LineNr">851 </span><span class="Delimiter">}</span>
+<span id="L852" class="LineNr">852 </span>
+<span id="L853" class="LineNr">853 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L854" class="LineNr">854 </span><span class="PreProc">#include </span><span class="Constant">&lt;utility&gt;</span>
+<span id="L855" class="LineNr">855 </span><span class="Normal">using</span> std::pair<span class="Delimiter">;</span>
+<span id="L856" class="LineNr">856 </span><span class="PreProc">#include </span><span class="Constant">&lt;math.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/011load.cc.html b/html/011load.cc.html
index 886a30c7..53ccec7a 100644
--- a/html/011load.cc.html
+++ b/html/011load.cc.html
@@ -85,9 +85,9 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr"> 23 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
 <span id="L24" class="LineNr"> 24 </span>  vector&lt;recipe_ordinal&gt; result<span class="Delimiter">;</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L26" class="LineNr"> 26 </span>    <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L26" class="LineNr"> 26 </span>    <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L27" class="LineNr"> 27 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L28" class="LineNr"> 28 </span>    string command = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L28" class="LineNr"> 28 </span>    string command = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L29" class="LineNr"> 29 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>command<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L30" class="LineNr"> 30 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L31" class="LineNr"> 31 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -114,7 +114,7 @@ if ('onhashchange' in window) {
 <span id="L52" class="LineNr"> 52 </span><span class="Comment">// return the recipe ordinal slurped, or -1 if it failed</span>
 <span id="L53" class="LineNr"> 53 </span><span class="Normal">int</span> <a href='011load.cc.html#L53'>slurp_recipe</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L54" class="LineNr"> 54 </span>  <a href='010vm.cc.html#L19'>recipe</a> result<span class="Delimiter">;</span>
-<span id="L55" class="LineNr"> 55 </span>  result<span class="Delimiter">.</span>name = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  result<span class="Delimiter">.</span>name = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L57" class="LineNr"> 57 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L58" class="LineNr"> 58 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;file ended with 'recipe'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -130,7 +130,7 @@ if ('onhashchange' in window) {
 <span id="L68" class="LineNr"> 68 </span>    <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">,</span> Next_recipe_ordinal++<span class="Delimiter">);</span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Recipe<span class="Delimiter">.</span>find<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">))</span> != Recipe<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;already exists&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L71" class="LineNr"> 71 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011load.cc.html#L377'>should_check_for_redefine</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">))</span>
+<span id="L71" class="LineNr"> 71 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011load.cc.html#L378'>should_check_for_redefine</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">))</span>
 <span id="L72" class="LineNr"> 72 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;redefining <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L73" class="LineNr"> 73 </span>    Recipe<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
 <span id="L74" class="LineNr"> 74 </span>  <span class="Delimiter">}</span>
@@ -145,7 +145,7 @@ if ('onhashchange' in window) {
 <span id="L83" class="LineNr"> 83 </span>  skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>get<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span>
 <span id="L85" class="LineNr"> 85 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: <a href='010vm.cc.html#L19'>recipe</a> body must begin with '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L86" class="LineNr"> 86 </span>  <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>  <span class="Comment">// permit trailing comment after '['</span>
+<span id="L86" class="LineNr"> 86 </span>  <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>  <span class="Comment">// permit trailing comment after '['</span>
 <span id="L87" class="LineNr"> 87 </span>  <a href='010vm.cc.html#L32'>instruction</a> curr<span class="Delimiter">;</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='011load.cc.html#L96'>next_instruction</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> &amp;curr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L89" class="LineNr"> 89 </span>    curr<span class="Delimiter">.</span>original_string = to_original_string<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
@@ -157,7 +157,7 @@ if ('onhashchange' in window) {
 <span id="L95" class="LineNr"> 95 </span>
 <span id="L96" class="LineNr"> 96 </span><span class="Normal">bool</span> <a href='011load.cc.html#L96'>next_instruction</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">,</span> instruction* curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L97" class="LineNr"> 97 </span>  curr<span class="Delimiter">-&gt;</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L98" class="LineNr"> 98 </span>  <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L98" class="LineNr"> 98 </span>  <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L99" class="LineNr"> 99 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L100" class="LineNr">100 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> at <a href='003trace.cc.html#L195'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L101" class="LineNr">101 </span>    <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
@@ -170,7 +170,7 @@ if ('onhashchange' in window) {
 <span id="L108" class="LineNr">108 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> at <a href='003trace.cc.html#L195'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L109" class="LineNr">109 </span>      <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L110" class="LineNr">110 </span>    <span class="Delimiter">}</span>
-<span id="L111" class="LineNr">111 </span>    string word = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>    string word = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L112" class="LineNr">112 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>word<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L113" class="LineNr">113 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L114" class="LineNr">114 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> at <a href='003trace.cc.html#L195'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -179,11 +179,11 @@ if ('onhashchange' in window) {
 <span id="L117" class="LineNr">117 </span>    words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>word<span class="Delimiter">);</span>
 <span id="L118" class="LineNr">118 </span>    skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L119" class="LineNr">119 </span>  <span class="Delimiter">}</span>
-<span id="L120" class="LineNr">120 </span>  <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>  <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L121" class="LineNr">121 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>words<span class="Delimiter">)</span> == <span class="Constant">1</span> &amp;&amp; words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">&quot;]&quot;</span><span class="Delimiter">)</span>
 <span id="L122" class="LineNr">122 </span>    <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// end of recipe</span>
 <span id="L123" class="LineNr">123 </span>
-<span id="L124" class="LineNr">124 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>words<span class="Delimiter">)</span> == <span class="Constant">1</span> &amp;&amp; <a href='011load.cc.html#L178'>is_label_word</a><span class="Delimiter">(</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>words<span class="Delimiter">)</span> == <span class="Constant">1</span> &amp;&amp; <a href='011load.cc.html#L179'>is_label_word</a><span class="Delimiter">(</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
 <span id="L125" class="LineNr">125 </span>    curr<span class="Delimiter">-&gt;</span>is_label = <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L126" class="LineNr">126 </span>    curr<span class="Delimiter">-&gt;</span>label = words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L127" class="LineNr">127 </span>    <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;label: &quot;</span> &lt;&lt; curr<span class="Delimiter">-&gt;</span>label &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -205,7 +205,7 @@ if ('onhashchange' in window) {
 <span id="L143" class="LineNr">143 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;instruction prematurely ended with '&lt;-'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L144" class="LineNr">144 </span>    <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Delimiter">}</span>
-<span id="L146" class="LineNr">146 </span>  curr<span class="Delimiter">-&gt;</span>old_name = curr<span class="Delimiter">-&gt;</span>name = *p<span class="Delimiter">;</span>  ++p<span class="Delimiter">;</span>
+<span id="L146" class="LineNr">146 </span>  curr<span class="Delimiter">-&gt;</span>name = *p<span class="Delimiter">;</span>  ++p<span class="Delimiter">;</span>
 <span id="L147" class="LineNr">147 </span>  <span class="Comment">// curr-&gt;operation will be set at transform time</span>
 <span id="L148" class="LineNr">148 </span>
 <span id="L149" class="LineNr">149 </span>  <span class="Normal">for</span> <span class="Delimiter">(;</span>  p != words<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
@@ -221,256 +221,257 @@ if ('onhashchange' in window) {
 <span id="L159" class="LineNr">159 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;9: unbalanced '[' for <a href='010vm.cc.html#L19'>recipe</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L160" class="LineNr">160 </span>    <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L161" class="LineNr">161 </span>  <span class="Delimiter">}</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L163" class="LineNr">163 </span><span class="Delimiter">}</span>
-<span id="L164" class="LineNr">164 </span>
-<span id="L165" class="LineNr">165 </span><span class="Comment">// can return empty string -- only if `in` has no more data</span>
-<span id="L166" class="LineNr">166 </span>string <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L167" class="LineNr">167 </span>  skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Comment">// End next_word Special-cases</span>
-<span id="L169" class="LineNr">169 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L170" class="LineNr">170 </span>  <a href='011load.cc.html#L192'>slurp_word</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L171" class="LineNr">171 </span>  <a href='011load.cc.html#L219'>skip_whitespace_and_comments_but_not_newline</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L172" class="LineNr">172 </span>  string result = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L173" class="LineNr">173 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result != <span class="Constant">&quot;[&quot;</span> &amp;&amp; <a href='011load.cc.html#L183'>ends_with</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> <span class="Constant">'['</span><span class="Delimiter">))</span>
-<span id="L174" class="LineNr">174 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;insert a space before '[' in '&quot;</span> &lt;&lt; result &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L175" class="LineNr">175 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L176" class="LineNr">176 </span><span class="Delimiter">}</span>
-<span id="L177" class="LineNr">177 </span>
-<span id="L178" class="LineNr">178 </span><span class="Normal">bool</span> <a href='011load.cc.html#L178'>is_label_word</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; word<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L179" class="LineNr">179 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>word<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Identifier">return</span> !isalnum<span class="Delimiter">(</span>word<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; string<span class="Delimiter">(</span><span class="Constant">&quot;$_*@&amp;,=-[]()&quot;</span><span class="Delimiter">).</span>find<span class="Delimiter">(</span>word<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> == string::npos<span class="Delimiter">;</span>
-<span id="L181" class="LineNr">181 </span><span class="Delimiter">}</span>
-<span id="L182" class="LineNr">182 </span>
-<span id="L183" class="LineNr">183 </span><span class="Normal">bool</span> <a href='011load.cc.html#L183'>ends_with</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> <span class="Normal">const</span> <span class="Normal">char</span> c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L184" class="LineNr">184 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<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="L185" class="LineNr">185 </span>  <span class="Identifier">return</span> *s<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == c<span class="Delimiter">;</span>
-<span id="L186" class="LineNr">186 </span><span class="Delimiter">}</span>
-<span id="L187" class="LineNr">187 </span>
-<span id="L188" class="LineNr">188 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L189" class="LineNr">189 </span><span class="Comment">// word boundaries</span>
-<span id="L190" class="LineNr">190 </span><span class="Normal">extern</span> <span class="Normal">const</span> string Terminators<span class="Delimiter">(</span><span class="Constant">&quot;(){}&quot;</span><span class="Delimiter">);</span>
-<span id="L191" class="LineNr">191 </span><span class="Delimiter">:(code)</span>
-<span id="L192" class="LineNr">192 </span><span class="Normal">void</span> <a href='011load.cc.html#L192'>slurp_word</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Normal">char</span> c<span class="Delimiter">;</span>
-<span id="L194" class="LineNr">194 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; Terminators<span class="Delimiter">.</span>find<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L195" class="LineNr">195 </span>    in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L196" class="LineNr">196 </span>    out &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L197" class="LineNr">197 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L198" class="LineNr">198 </span>  <span class="Delimiter">}</span>
-<span id="L199" class="LineNr">199 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>in &gt;&gt; c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L200" class="LineNr">200 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>c<span class="Delimiter">)</span> || Terminators<span class="Delimiter">.</span>find<span class="Delimiter">(</span>c<span class="Delimiter">)</span> != string::npos || Ignore<span class="Delimiter">.</span>find<span class="Delimiter">(</span>c<span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L201" class="LineNr">201 </span>      in<span class="Delimiter">.</span>putback<span class="Delimiter">(</span>c<span class="Delimiter">);</span>
-<span id="L202" class="LineNr">202 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L203" class="LineNr">203 </span>    <span class="Delimiter">}</span>
-<span id="L204" class="LineNr">204 </span>    out &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Delimiter">}</span>
-<span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
-<span id="L207" class="LineNr">207 </span>
-<span id="L208" class="LineNr">208 </span><span class="Normal">void</span> <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L210" class="LineNr">210 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L211" class="LineNr">211 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L212" class="LineNr">212 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Ignore<span class="Delimiter">.</span>find<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> != string::npos<span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L213" class="LineNr">213 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <a href='011load.cc.html#L230'>skip_comment</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L214" class="LineNr">214 </span>    <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Delimiter">}</span>
-<span id="L216" class="LineNr">216 </span><span class="Delimiter">}</span>
-<span id="L217" class="LineNr">217 </span>
-<span id="L218" class="LineNr">218 </span><span class="Comment">// confusing; move to the next line only to skip a comment, but never otherwise</span>
-<span id="L219" class="LineNr">219 </span><span class="Normal">void</span> <a href='011load.cc.html#L219'>skip_whitespace_and_comments_but_not_newline</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L220" class="LineNr">220 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L221" class="LineNr">221 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L222" class="LineNr">222 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L223" class="LineNr">223 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L224" class="LineNr">224 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Ignore<span class="Delimiter">.</span>find<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> != string::npos<span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L225" class="LineNr">225 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <a href='011load.cc.html#L230'>skip_comment</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L226" class="LineNr">226 </span>    <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Delimiter">}</span>
-<span id="L228" class="LineNr">228 </span><span class="Delimiter">}</span>
-<span id="L229" class="LineNr">229 </span>
-<span id="L230" class="LineNr">230 </span><span class="Normal">void</span> <a href='011load.cc.html#L230'>skip_comment</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L232" class="LineNr">232 </span>    in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L233" class="LineNr">233 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Delimiter">}</span>
-<span id="L235" class="LineNr">235 </span><span class="Delimiter">}</span>
-<span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(scenario recipe_instead_of_def)</span>
-<span id="L238" class="LineNr">238 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L239" class="LineNr">239 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L240" class="LineNr">240 </span>]
-<span id="L241" class="LineNr">241 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
-<span id="L242" class="LineNr">242 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
-<span id="L243" class="LineNr">243 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
-<span id="L244" class="LineNr">244 </span>
-<span id="L245" class="LineNr">245 </span><span class="Delimiter">:(scenario parse_comment_outside_recipe)</span>
-<span id="L246" class="LineNr">246 </span><span class="Comment"># this comment will be dropped by the tangler, so we need a dummy recipe to stop that</span>
-<span id="L247" class="LineNr">247 </span><span class="muRecipe">def</span> f1 [
-<span id="L248" class="LineNr">248 </span>]
-<span id="L249" class="LineNr">249 </span><span class="Comment"># this comment will go through to 'load'</span>
-<span id="L250" class="LineNr">250 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L251" class="LineNr">251 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L252" class="LineNr">252 </span>]
-<span id="L253" class="LineNr">253 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
-<span id="L254" class="LineNr">254 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
-<span id="L255" class="LineNr">255 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
-<span id="L256" class="LineNr">256 </span>
-<span id="L257" class="LineNr">257 </span><span class="Delimiter">:(scenario parse_comment_amongst_instruction)</span>
-<span id="L258" class="LineNr">258 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L259" class="LineNr">259 </span>  <span class="Comment"># comment</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L261" class="LineNr">261 </span>]
-<span id="L262" class="LineNr">262 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
-<span id="L263" class="LineNr">263 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
-<span id="L264" class="LineNr">264 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
-<span id="L265" class="LineNr">265 </span>
-<span id="L266" class="LineNr">266 </span><span class="Delimiter">:(scenario parse_comment_amongst_instruction_2)</span>
-<span id="L267" class="LineNr">267 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L268" class="LineNr">268 </span>  <span class="Comment"># comment</span>
-<span id="L269" class="LineNr">269 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L270" class="LineNr">270 </span>  <span class="Comment"># comment</span>
-<span id="L271" class="LineNr">271 </span>]
-<span id="L272" class="LineNr">272 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
-<span id="L273" class="LineNr">273 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
-<span id="L274" class="LineNr">274 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
-<span id="L275" class="LineNr">275 </span>
-<span id="L276" class="LineNr">276 </span><span class="Delimiter">:(scenario parse_comment_amongst_instruction_3)</span>
-<span id="L277" class="LineNr">277 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L278" class="LineNr">278 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Comment"># comment</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L281" class="LineNr">281 </span>]
-<span id="L282" class="LineNr">282 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
-<span id="L283" class="LineNr">283 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
-<span id="L284" class="LineNr">284 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
-<span id="L285" class="LineNr">285 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
-<span id="L286" class="LineNr">286 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
-<span id="L287" class="LineNr">287 </span><span class="traceContains">+parse:   product: {2: &quot;number&quot;}</span>
-<span id="L288" class="LineNr">288 </span>
-<span id="L289" class="LineNr">289 </span><span class="Delimiter">:(scenario parse_comment_after_instruction)</span>
-<span id="L290" class="LineNr">290 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L291" class="LineNr">291 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>  <span class="Comment"># comment</span>
-<span id="L292" class="LineNr">292 </span>]
-<span id="L293" class="LineNr">293 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
-<span id="L294" class="LineNr">294 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
-<span id="L295" class="LineNr">295 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
-<span id="L296" class="LineNr">296 </span>
-<span id="L297" class="LineNr">297 </span><span class="Delimiter">:(scenario parse_label)</span>
-<span id="L298" class="LineNr">298 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L299" class="LineNr">299 </span>  +foo
-<span id="L300" class="LineNr">300 </span>]
-<span id="L301" class="LineNr">301 </span><span class="traceContains">+parse: label: +foo</span>
-<span id="L302" class="LineNr">302 </span>
-<span id="L303" class="LineNr">303 </span><span class="Delimiter">:(scenario parse_dollar_as_recipe_name)</span>
-<span id="L304" class="LineNr">304 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L305" class="LineNr">305 </span>  $foo
-<span id="L306" class="LineNr">306 </span>]
-<span id="L307" class="LineNr">307 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: $foo</span>
-<span id="L308" class="LineNr">308 </span>
-<span id="L309" class="LineNr">309 </span><span class="Delimiter">:(scenario parse_multiple_properties)</span>
-<span id="L310" class="LineNr">310 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L311" class="LineNr">311 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>/foo:bar:baz
-<span id="L312" class="LineNr">312 </span>]
-<span id="L313" class="LineNr">313 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
-<span id="L314" class="LineNr">314 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;, &quot;foo&quot;: (&quot;bar&quot; &quot;baz&quot;)}</span>
-<span id="L315" class="LineNr">315 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
-<span id="L316" class="LineNr">316 </span>
-<span id="L317" class="LineNr">317 </span><span class="Delimiter">:(scenario parse_multiple_products)</span>
-<span id="L318" class="LineNr">318 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L319" class="LineNr">319 </span>  <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L320" class="LineNr">320 </span>]
-<span id="L321" class="LineNr">321 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
-<span id="L322" class="LineNr">322 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
-<span id="L323" class="LineNr">323 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
-<span id="L324" class="LineNr">324 </span><span class="traceContains">+parse:   product: {2: &quot;number&quot;}</span>
-<span id="L325" class="LineNr">325 </span>
-<span id="L326" class="LineNr">326 </span><span class="Delimiter">:(scenario parse_multiple_ingredients)</span>
-<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="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">4</span>:number
-<span id="L329" class="LineNr">329 </span>]
-<span id="L330" class="LineNr">330 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
-<span id="L331" class="LineNr">331 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
-<span id="L332" class="LineNr">332 </span><span class="traceContains">+parse:   ingredient: {4: &quot;number&quot;}</span>
-<span id="L333" class="LineNr">333 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
-<span id="L334" class="LineNr">334 </span><span class="traceContains">+parse:   product: {2: &quot;number&quot;}</span>
-<span id="L335" class="LineNr">335 </span>
-<span id="L336" class="LineNr">336 </span><span class="Delimiter">:(scenario parse_multiple_types)</span>
-<span id="L337" class="LineNr">337 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L338" class="LineNr">338 </span>  <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">4</span>:number
-<span id="L339" class="LineNr">339 </span>]
-<span id="L340" class="LineNr">340 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
-<span id="L341" class="LineNr">341 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
-<span id="L342" class="LineNr">342 </span><span class="traceContains">+parse:   ingredient: {4: &quot;number&quot;}</span>
-<span id="L343" class="LineNr">343 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
-<span id="L344" class="LineNr">344 </span><span class="traceContains">+parse:   product: {2: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L345" class="LineNr">345 </span>
-<span id="L346" class="LineNr">346 </span><span class="Delimiter">:(scenario parse_properties)</span>
-<span id="L347" class="LineNr">347 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L348" class="LineNr">348 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:number/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L349" class="LineNr">349 </span>]
-<span id="L350" class="LineNr">350 </span><span class="traceContains">+parse:   product: {1: (&quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()}</span>
-<span id="L351" class="LineNr">351 </span>
-<span id="L352" class="LineNr">352 </span><span class="Comment">//: this test we can't represent with a scenario</span>
-<span id="L353" class="LineNr">353 </span><span class="Delimiter">:(code)</span>
-<span id="L354" class="LineNr">354 </span><span class="Normal">void</span> <a href='011load.cc.html#L354'>test_parse_comment_terminated_by_eof</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L355" class="LineNr">355 </span>  load<span class="Delimiter">(</span><span class="Constant">&quot;recipe <a href='000organization.cc.html#L113'>main</a> [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L356" class="LineNr">356 </span>       <span class="Constant">&quot;  a:number &lt;- copy 34</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L357" class="LineNr">357 </span>       <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L358" class="LineNr">358 </span>       <span class="Constant">&quot;# abc&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// no newline after comment</span>
-<span id="L359" class="LineNr">359 </span>  cerr &lt;&lt; <span class="Constant">&quot;.&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// termination = success</span>
-<span id="L360" class="LineNr">360 </span><span class="Delimiter">}</span>
-<span id="L361" class="LineNr">361 </span>
-<span id="L362" class="LineNr">362 </span><span class="Delimiter">:(scenario warn_on_missing_space_before_bracket)</span>
-<span id="L363" class="LineNr">363 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L364" class="LineNr">364 </span><span class="muRecipe">def</span> main[
-<span id="L365" class="LineNr">365 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L366" class="LineNr">366 </span>]
-<span id="L367" class="LineNr">367 </span><span class="traceContains">+error: insert a space before '[' in 'main['</span>
-<span id="L368" class="LineNr">368 </span>
-<span id="L369" class="LineNr">369 </span><span class="Comment">//: Warn if a recipe gets redefined, because large codebases can accidentally</span>
-<span id="L370" class="LineNr">370 </span><span class="Comment">//: step on their own toes. But there'll be many occasions later where</span>
-<span id="L371" class="LineNr">371 </span><span class="Comment">//: we'll want to disable the errors.</span>
-<span id="L372" class="LineNr">372 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L373" class="LineNr">373 </span><span class="Normal">bool</span> Disable_redefine_checks = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L374" class="LineNr">374 </span><span class="Delimiter">:(before &quot;End Setup&quot;)</span>
-<span id="L375" class="LineNr">375 </span>Disable_redefine_checks = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L376" class="LineNr">376 </span><span class="Delimiter">:(code)</span>
-<span id="L377" class="LineNr">377 </span><span class="Normal">bool</span> <a href='011load.cc.html#L377'>should_check_for_redefine</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; recipe_name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L378" class="LineNr">378 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Disable_redefine_checks<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L379" class="LineNr">379 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L380" class="LineNr">380 </span><span class="Delimiter">}</span>
-<span id="L381" class="LineNr">381 </span>
-<span id="L382" class="LineNr">382 </span><span class="Delimiter">:(scenario forbid_redefining_recipes)</span>
-<span id="L383" class="LineNr">383 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L384" class="LineNr">384 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L385" class="LineNr">385 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L386" class="LineNr">386 </span>]
-<span id="L387" class="LineNr">387 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L388" class="LineNr">388 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">24</span>
-<span id="L389" class="LineNr">389 </span>]
-<span id="L390" class="LineNr">390 </span><span class="traceContains">+error: redefining <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
-<span id="L391" class="LineNr">391 </span>
-<span id="L392" class="LineNr">392 </span><span class="Delimiter">:(scenario permit_forcibly_redefining_recipes)</span>
-<span id="L393" class="LineNr">393 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L394" class="LineNr">394 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
-<span id="L395" class="LineNr">395 </span>]
-<span id="L396" class="LineNr">396 </span><span class="muRecipe">def</span>! <a href='000organization.cc.html#L113'>main</a> [
-<span id="L397" class="LineNr">397 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">24</span>
-<span id="L398" class="LineNr">398 </span>]
-<span id="L399" class="LineNr">399 </span><span class="traceAbsent">-error: redefining <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
-<span id="L400" class="LineNr">400 </span>$error: <span class="Constant">0</span>
-<span id="L401" class="LineNr">401 </span>
-<span id="L402" class="LineNr">402 </span><span class="Delimiter">:(code)</span>
-<span id="L403" class="LineNr">403 </span><span class="Comment">// for debugging</span>
-<span id="L404" class="LineNr">404 </span><span class="Normal">void</span> <a href='011load.cc.html#L404'>show_rest_of_stream</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L405" class="LineNr">405 </span>  cerr &lt;&lt; <span class="Constant">'^'</span><span class="Delimiter">;</span>
-<span id="L406" class="LineNr">406 </span>  <span class="Normal">char</span> c<span class="Delimiter">;</span>
-<span id="L407" class="LineNr">407 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>in &gt;&gt; c<span class="Delimiter">)</span>
-<span id="L408" class="LineNr">408 </span>    cerr &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L409" class="LineNr">409 </span>  cerr &lt;&lt; <span class="Constant">&quot;$</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L410" class="LineNr">410 </span>  exit<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L411" class="LineNr">411 </span><span class="Delimiter">}</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Comment">// End next_instruction(curr)</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><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">// can return empty string -- only if `in` has no more data</span>
+<span id="L167" class="LineNr">167 </span>string <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L168" class="LineNr">168 </span>  skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L169" class="LineNr">169 </span>  <span class="Comment">// End next_word Special-cases</span>
+<span id="L170" class="LineNr">170 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L171" class="LineNr">171 </span>  <a href='011load.cc.html#L193'>slurp_word</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L172" class="LineNr">172 </span>  <a href='011load.cc.html#L220'>skip_whitespace_and_comments_but_not_newline</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L173" class="LineNr">173 </span>  string result = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result != <span class="Constant">&quot;[&quot;</span> &amp;&amp; <a href='011load.cc.html#L184'>ends_with</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> <span class="Constant">'['</span><span class="Delimiter">))</span>
+<span id="L175" class="LineNr">175 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;insert a space before '[' in '&quot;</span> &lt;&lt; result &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L176" class="LineNr">176 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L177" class="LineNr">177 </span><span class="Delimiter">}</span>
+<span id="L178" class="LineNr">178 </span>
+<span id="L179" class="LineNr">179 </span><span class="Normal">bool</span> <a href='011load.cc.html#L179'>is_label_word</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; word<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L180" class="LineNr">180 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>word<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Identifier">return</span> !isalnum<span class="Delimiter">(</span>word<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; string<span class="Delimiter">(</span><span class="Constant">&quot;$_*@&amp;,=-[]()&quot;</span><span class="Delimiter">).</span>find<span class="Delimiter">(</span>word<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> == string::npos<span class="Delimiter">;</span>
+<span id="L182" class="LineNr">182 </span><span class="Delimiter">}</span>
+<span id="L183" class="LineNr">183 </span>
+<span id="L184" class="LineNr">184 </span><span class="Normal">bool</span> <a href='011load.cc.html#L184'>ends_with</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> <span class="Normal">const</span> <span class="Normal">char</span> c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L185" class="LineNr">185 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<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="L186" class="LineNr">186 </span>  <span class="Identifier">return</span> *s<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == c<span class="Delimiter">;</span>
+<span id="L187" class="LineNr">187 </span><span class="Delimiter">}</span>
+<span id="L188" class="LineNr">188 </span>
+<span id="L189" class="LineNr">189 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L190" class="LineNr">190 </span><span class="Comment">// word boundaries</span>
+<span id="L191" class="LineNr">191 </span><span class="Normal">extern</span> <span class="Normal">const</span> string Terminators<span class="Delimiter">(</span><span class="Constant">&quot;(){}&quot;</span><span class="Delimiter">);</span>
+<span id="L192" class="LineNr">192 </span><span class="Delimiter">:(code)</span>
+<span id="L193" class="LineNr">193 </span><span class="Normal">void</span> <a href='011load.cc.html#L193'>slurp_word</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L194" class="LineNr">194 </span>  <span class="Normal">char</span> c<span class="Delimiter">;</span>
+<span id="L195" class="LineNr">195 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; Terminators<span class="Delimiter">.</span>find<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L196" class="LineNr">196 </span>    in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L197" class="LineNr">197 </span>    out &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L198" class="LineNr">198 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L199" class="LineNr">199 </span>  <span class="Delimiter">}</span>
+<span id="L200" class="LineNr">200 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>in &gt;&gt; c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L201" class="LineNr">201 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>c<span class="Delimiter">)</span> || Terminators<span class="Delimiter">.</span>find<span class="Delimiter">(</span>c<span class="Delimiter">)</span> != string::npos || Ignore<span class="Delimiter">.</span>find<span class="Delimiter">(</span>c<span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L202" class="LineNr">202 </span>      in<span class="Delimiter">.</span>putback<span class="Delimiter">(</span>c<span class="Delimiter">);</span>
+<span id="L203" class="LineNr">203 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L204" class="LineNr">204 </span>    <span class="Delimiter">}</span>
+<span id="L205" class="LineNr">205 </span>    out &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Delimiter">}</span>
+<span id="L207" class="LineNr">207 </span><span class="Delimiter">}</span>
+<span id="L208" class="LineNr">208 </span>
+<span id="L209" class="LineNr">209 </span><span class="Normal">void</span> <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L211" class="LineNr">211 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L212" class="LineNr">212 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L213" class="LineNr">213 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Ignore<span class="Delimiter">.</span>find<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> != string::npos<span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L214" class="LineNr">214 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <a href='011load.cc.html#L231'>skip_comment</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L215" class="LineNr">215 </span>    <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L216" class="LineNr">216 </span>  <span class="Delimiter">}</span>
+<span id="L217" class="LineNr">217 </span><span class="Delimiter">}</span>
+<span id="L218" class="LineNr">218 </span>
+<span id="L219" class="LineNr">219 </span><span class="Comment">// confusing; move to the next line only to skip a comment, but never otherwise</span>
+<span id="L220" class="LineNr">220 </span><span class="Normal">void</span> <a href='011load.cc.html#L220'>skip_whitespace_and_comments_but_not_newline</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L221" class="LineNr">221 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L222" class="LineNr">222 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L223" class="LineNr">223 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L224" class="LineNr">224 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L225" class="LineNr">225 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Ignore<span class="Delimiter">.</span>find<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> != string::npos<span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L226" class="LineNr">226 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <a href='011load.cc.html#L231'>skip_comment</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L227" class="LineNr">227 </span>    <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L228" class="LineNr">228 </span>  <span class="Delimiter">}</span>
+<span id="L229" class="LineNr">229 </span><span class="Delimiter">}</span>
+<span id="L230" class="LineNr">230 </span>
+<span id="L231" class="LineNr">231 </span><span class="Normal">void</span> <a href='011load.cc.html#L231'>skip_comment</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L232" class="LineNr">232 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L233" class="LineNr">233 </span>    in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L234" class="LineNr">234 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Delimiter">}</span>
+<span id="L236" class="LineNr">236 </span><span class="Delimiter">}</span>
+<span id="L237" class="LineNr">237 </span>
+<span id="L238" class="LineNr">238 </span><span class="Delimiter">:(scenario recipe_instead_of_def)</span>
+<span id="L239" class="LineNr">239 </span><span class="muRecipe"><a href='010vm.cc.html#L19'>recipe</a></span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L240" class="LineNr">240 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L241" class="LineNr">241 </span>]
+<span id="L242" class="LineNr">242 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
+<span id="L243" class="LineNr">243 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
+<span id="L244" class="LineNr">244 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
+<span id="L245" class="LineNr">245 </span>
+<span id="L246" class="LineNr">246 </span><span class="Delimiter">:(scenario parse_comment_outside_recipe)</span>
+<span id="L247" class="LineNr">247 </span><span class="Comment"># this comment will be dropped by the tangler, so we need a dummy recipe to stop that</span>
+<span id="L248" class="LineNr">248 </span><span class="muRecipe">def</span> f1 [
+<span id="L249" class="LineNr">249 </span>]
+<span id="L250" class="LineNr">250 </span><span class="Comment"># this comment will go through to 'load'</span>
+<span id="L251" class="LineNr">251 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L252" class="LineNr">252 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L253" class="LineNr">253 </span>]
+<span id="L254" class="LineNr">254 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
+<span id="L255" class="LineNr">255 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
+<span id="L256" class="LineNr">256 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
+<span id="L257" class="LineNr">257 </span>
+<span id="L258" class="LineNr">258 </span><span class="Delimiter">:(scenario parse_comment_amongst_instruction)</span>
+<span id="L259" class="LineNr">259 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L260" class="LineNr">260 </span>  <span class="Comment"># comment</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L262" class="LineNr">262 </span>]
+<span id="L263" class="LineNr">263 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
+<span id="L264" class="LineNr">264 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
+<span id="L265" class="LineNr">265 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
+<span id="L266" class="LineNr">266 </span>
+<span id="L267" class="LineNr">267 </span><span class="Delimiter">:(scenario parse_comment_amongst_instruction_2)</span>
+<span id="L268" class="LineNr">268 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L269" class="LineNr">269 </span>  <span class="Comment"># comment</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L271" class="LineNr">271 </span>  <span class="Comment"># comment</span>
+<span id="L272" class="LineNr">272 </span>]
+<span id="L273" class="LineNr">273 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
+<span id="L274" class="LineNr">274 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
+<span id="L275" class="LineNr">275 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
+<span id="L276" class="LineNr">276 </span>
+<span id="L277" class="LineNr">277 </span><span class="Delimiter">:(scenario parse_comment_amongst_instruction_3)</span>
+<span id="L278" class="LineNr">278 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L279" class="LineNr">279 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Comment"># comment</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L282" class="LineNr">282 </span>]
+<span id="L283" class="LineNr">283 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
+<span id="L284" class="LineNr">284 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
+<span id="L285" class="LineNr">285 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
+<span id="L286" class="LineNr">286 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
+<span id="L287" class="LineNr">287 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
+<span id="L288" class="LineNr">288 </span><span class="traceContains">+parse:   product: {2: &quot;number&quot;}</span>
+<span id="L289" class="LineNr">289 </span>
+<span id="L290" class="LineNr">290 </span><span class="Delimiter">:(scenario parse_comment_after_instruction)</span>
+<span id="L291" class="LineNr">291 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L292" class="LineNr">292 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>  <span class="Comment"># comment</span>
+<span id="L293" class="LineNr">293 </span>]
+<span id="L294" class="LineNr">294 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
+<span id="L295" class="LineNr">295 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
+<span id="L296" class="LineNr">296 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
+<span id="L297" class="LineNr">297 </span>
+<span id="L298" class="LineNr">298 </span><span class="Delimiter">:(scenario parse_label)</span>
+<span id="L299" class="LineNr">299 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L300" class="LineNr">300 </span>  +foo
+<span id="L301" class="LineNr">301 </span>]
+<span id="L302" class="LineNr">302 </span><span class="traceContains">+parse: label: +foo</span>
+<span id="L303" class="LineNr">303 </span>
+<span id="L304" class="LineNr">304 </span><span class="Delimiter">:(scenario parse_dollar_as_recipe_name)</span>
+<span id="L305" class="LineNr">305 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L306" class="LineNr">306 </span>  $foo
+<span id="L307" class="LineNr">307 </span>]
+<span id="L308" class="LineNr">308 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: $foo</span>
+<span id="L309" class="LineNr">309 </span>
+<span id="L310" class="LineNr">310 </span><span class="Delimiter">:(scenario parse_multiple_properties)</span>
+<span id="L311" class="LineNr">311 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L312" class="LineNr">312 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>/foo:bar:baz
+<span id="L313" class="LineNr">313 </span>]
+<span id="L314" class="LineNr">314 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
+<span id="L315" class="LineNr">315 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;, &quot;foo&quot;: (&quot;bar&quot; &quot;baz&quot;)}</span>
+<span id="L316" class="LineNr">316 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
+<span id="L317" class="LineNr">317 </span>
+<span id="L318" class="LineNr">318 </span><span class="Delimiter">:(scenario parse_multiple_products)</span>
+<span id="L319" class="LineNr">319 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L320" class="LineNr">320 </span>  <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L321" class="LineNr">321 </span>]
+<span id="L322" class="LineNr">322 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
+<span id="L323" class="LineNr">323 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
+<span id="L324" class="LineNr">324 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
+<span id="L325" class="LineNr">325 </span><span class="traceContains">+parse:   product: {2: &quot;number&quot;}</span>
+<span id="L326" class="LineNr">326 </span>
+<span id="L327" class="LineNr">327 </span><span class="Delimiter">:(scenario parse_multiple_ingredients)</span>
+<span id="L328" class="LineNr">328 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L329" class="LineNr">329 </span>  <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">4</span>:number
+<span id="L330" class="LineNr">330 </span>]
+<span id="L331" class="LineNr">331 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
+<span id="L332" class="LineNr">332 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
+<span id="L333" class="LineNr">333 </span><span class="traceContains">+parse:   ingredient: {4: &quot;number&quot;}</span>
+<span id="L334" class="LineNr">334 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
+<span id="L335" class="LineNr">335 </span><span class="traceContains">+parse:   product: {2: &quot;number&quot;}</span>
+<span id="L336" class="LineNr">336 </span>
+<span id="L337" class="LineNr">337 </span><span class="Delimiter">:(scenario parse_multiple_types)</span>
+<span id="L338" class="LineNr">338 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L339" class="LineNr">339 </span>  <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">4</span>:number
+<span id="L340" class="LineNr">340 </span>]
+<span id="L341" class="LineNr">341 </span><span class="traceContains">+parse: <a href='010vm.cc.html#L32'>instruction</a>: copy</span>
+<span id="L342" class="LineNr">342 </span><span class="traceContains">+parse:   ingredient: {23: &quot;literal&quot;}</span>
+<span id="L343" class="LineNr">343 </span><span class="traceContains">+parse:   ingredient: {4: &quot;number&quot;}</span>
+<span id="L344" class="LineNr">344 </span><span class="traceContains">+parse:   product: {1: &quot;number&quot;}</span>
+<span id="L345" class="LineNr">345 </span><span class="traceContains">+parse:   product: {2: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L346" class="LineNr">346 </span>
+<span id="L347" class="LineNr">347 </span><span class="Delimiter">:(scenario parse_properties)</span>
+<span id="L348" class="LineNr">348 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L349" class="LineNr">349 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:number/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L350" class="LineNr">350 </span>]
+<span id="L351" class="LineNr">351 </span><span class="traceContains">+parse:   product: {1: (&quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()}</span>
+<span id="L352" class="LineNr">352 </span>
+<span id="L353" class="LineNr">353 </span><span class="Comment">//: this test we can't represent with a scenario</span>
+<span id="L354" class="LineNr">354 </span><span class="Delimiter">:(code)</span>
+<span id="L355" class="LineNr">355 </span><span class="Normal">void</span> <a href='011load.cc.html#L355'>test_parse_comment_terminated_by_eof</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L356" class="LineNr">356 </span>  load<span class="Delimiter">(</span><span class="Constant">&quot;recipe <a href='000organization.cc.html#L113'>main</a> [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L357" class="LineNr">357 </span>       <span class="Constant">&quot;  a:number &lt;- copy 34</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L358" class="LineNr">358 </span>       <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L359" class="LineNr">359 </span>       <span class="Constant">&quot;# abc&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// no newline after comment</span>
+<span id="L360" class="LineNr">360 </span>  cerr &lt;&lt; <span class="Constant">&quot;.&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// termination = success</span>
+<span id="L361" class="LineNr">361 </span><span class="Delimiter">}</span>
+<span id="L362" class="LineNr">362 </span>
+<span id="L363" class="LineNr">363 </span><span class="Delimiter">:(scenario warn_on_missing_space_before_bracket)</span>
+<span id="L364" class="LineNr">364 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L365" class="LineNr">365 </span><span class="muRecipe">def</span> main[
+<span id="L366" class="LineNr">366 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L367" class="LineNr">367 </span>]
+<span id="L368" class="LineNr">368 </span><span class="traceContains">+error: insert a space before '[' in 'main['</span>
+<span id="L369" class="LineNr">369 </span>
+<span id="L370" class="LineNr">370 </span><span class="Comment">//: Warn if a recipe gets redefined, because large codebases can accidentally</span>
+<span id="L371" class="LineNr">371 </span><span class="Comment">//: step on their own toes. But there'll be many occasions later where</span>
+<span id="L372" class="LineNr">372 </span><span class="Comment">//: we'll want to disable the errors.</span>
+<span id="L373" class="LineNr">373 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L374" class="LineNr">374 </span><span class="Normal">bool</span> Disable_redefine_checks = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L375" class="LineNr">375 </span><span class="Delimiter">:(before &quot;End Setup&quot;)</span>
+<span id="L376" class="LineNr">376 </span>Disable_redefine_checks = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L377" class="LineNr">377 </span><span class="Delimiter">:(code)</span>
+<span id="L378" class="LineNr">378 </span><span class="Normal">bool</span> <a href='011load.cc.html#L378'>should_check_for_redefine</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; recipe_name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L379" class="LineNr">379 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Disable_redefine_checks<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L380" class="LineNr">380 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L381" class="LineNr">381 </span><span class="Delimiter">}</span>
+<span id="L382" class="LineNr">382 </span>
+<span id="L383" class="LineNr">383 </span><span class="Delimiter">:(scenario forbid_redefining_recipes)</span>
+<span id="L384" class="LineNr">384 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L385" class="LineNr">385 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L386" class="LineNr">386 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L387" class="LineNr">387 </span>]
+<span id="L388" class="LineNr">388 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L389" class="LineNr">389 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">24</span>
+<span id="L390" class="LineNr">390 </span>]
+<span id="L391" class="LineNr">391 </span><span class="traceContains">+error: redefining <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
+<span id="L392" class="LineNr">392 </span>
+<span id="L393" class="LineNr">393 </span><span class="Delimiter">:(scenario permit_forcibly_redefining_recipes)</span>
+<span id="L394" class="LineNr">394 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L395" class="LineNr">395 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">23</span>
+<span id="L396" class="LineNr">396 </span>]
+<span id="L397" class="LineNr">397 </span><span class="muRecipe">def</span>! <a href='000organization.cc.html#L113'>main</a> [
+<span id="L398" class="LineNr">398 </span>  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>copy <span class="Constant">24</span>
+<span id="L399" class="LineNr">399 </span>]
+<span id="L400" class="LineNr">400 </span><span class="traceAbsent">-error: redefining <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
+<span id="L401" class="LineNr">401 </span>$error: <span class="Constant">0</span>
+<span id="L402" class="LineNr">402 </span>
+<span id="L403" class="LineNr">403 </span><span class="Delimiter">:(code)</span>
+<span id="L404" class="LineNr">404 </span><span class="Comment">// for debugging</span>
+<span id="L405" class="LineNr">405 </span><span class="Normal">void</span> <a href='011load.cc.html#L405'>show_rest_of_stream</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L406" class="LineNr">406 </span>  cerr &lt;&lt; <span class="Constant">'^'</span><span class="Delimiter">;</span>
+<span id="L407" class="LineNr">407 </span>  <span class="Normal">char</span> c<span class="Delimiter">;</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>in &gt;&gt; c<span class="Delimiter">)</span>
+<span id="L409" class="LineNr">409 </span>    cerr &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L410" class="LineNr">410 </span>  cerr &lt;&lt; <span class="Constant">&quot;$</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L411" class="LineNr">411 </span>  exit<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L412" class="LineNr">412 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/012transform.cc.html b/html/012transform.cc.html
index ae1c212f..c7aa2a27 100644
--- a/html/012transform.cc.html
+++ b/html/012transform.cc.html
@@ -148,7 +148,7 @@ if ('onhashchange' in window) {
 <span id="L91" class="LineNr"> 91 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Comment">// End Reagent-parsing Exceptions</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span>r<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L94" class="LineNr"> 94 </span>  r<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='002test.cc.html#L92'>to_integer</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
+<span id="L94" class="LineNr"> 94 </span>  r<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='002test.cc.html#L92'>to_integer</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
 <span id="L95" class="LineNr"> 95 </span><span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span>
 <span id="L97" class="LineNr"> 97 </span><span class="Comment">// helper for tests -- temporarily suppress run</span>
diff --git a/html/014literal_string.cc.html b/html/014literal_string.cc.html
index fbc0aa4d..070e3951 100644
--- a/html/014literal_string.cc.html
+++ b/html/014literal_string.cc.html
@@ -83,10 +83,10 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
 <span id="L23" class="LineNr"> 23 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;literal-string&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L24" class="LineNr"> 24 </span>
-<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(before &quot;End <a href='011load.cc.html#L166'>next_word</a> Special-cases&quot;)</span>
+<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(before &quot;End <a href='011load.cc.html#L167'>next_word</a> Special-cases&quot;)</span>
 <span id="L26" class="LineNr"> 26 </span><span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L27" class="LineNr"> 27 </span>  string result = <a href='014literal_string.cc.html#L33'>slurp_quoted</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L28" class="LineNr"> 28 </span>  <a href='011load.cc.html#L219'>skip_whitespace_and_comments_but_not_newline</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L28" class="LineNr"> 28 </span>  <a href='011load.cc.html#L220'>skip_whitespace_and_comments_but_not_newline</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L30" class="LineNr"> 30 </span><span class="Delimiter">}</span>
 <span id="L31" class="LineNr"> 31 </span>
diff --git a/html/015literal_noninteger.cc.html b/html/015literal_noninteger.cc.html
index 16e2bbf5..f09dba94 100644
--- a/html/015literal_noninteger.cc.html
+++ b/html/015literal_noninteger.cc.html
@@ -72,7 +72,7 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr">11 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='015literal_noninteger.cc.html#L19'>is_noninteger</a><span class="Delimiter">(</span>s<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L12" class="LineNr">12 </span>  name = s<span class="Delimiter">;</span>
 <span id="L13" class="LineNr">13 </span>  type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;literal-fractional-number&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L14" class="LineNr">14 </span>  <a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='015literal_noninteger.cc.html#L26'>to_double</a><span class="Delimiter">(</span>s<span class="Delimiter">));</span>
+<span id="L14" class="LineNr">14 </span>  <a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='015literal_noninteger.cc.html#L26'>to_double</a><span class="Delimiter">(</span>s<span class="Delimiter">));</span>
 <span id="L15" class="LineNr">15 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L16" class="LineNr">16 </span><span class="Delimiter">}</span>
 <span id="L17" class="LineNr">17 </span>
diff --git a/html/016dilated_reagent.cc.html b/html/016dilated_reagent.cc.html
index 1f550782..38f950e7 100644
--- a/html/016dilated_reagent.cc.html
+++ b/html/016dilated_reagent.cc.html
@@ -94,7 +94,7 @@ if ('onhashchange' in window) {
 <span id="L31" class="LineNr"> 31 </span>
 <span id="L32" class="LineNr"> 32 </span><span class="Comment">//: First augment next_word to group balanced brackets together.</span>
 <span id="L33" class="LineNr"> 33 </span>
-<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before &quot;End <a href='011load.cc.html#L166'>next_word</a> Special-cases&quot;)</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before &quot;End <a href='011load.cc.html#L167'>next_word</a> Special-cases&quot;)</span>
 <span id="L35" class="LineNr"> 35 </span><span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'('</span><span class="Delimiter">)</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Identifier">return</span> <a href='016dilated_reagent.cc.html#L57'>slurp_balanced_bracket</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Comment">// treat curlies mostly like parens, but don't mess up labels</span>
@@ -150,7 +150,7 @@ if ('onhashchange' in window) {
 <span id="L87" class="LineNr"> 87 </span>    result &lt;&lt; c<span class="Delimiter">;</span>
 <span id="L88" class="LineNr"> 88 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>open_brackets<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Delimiter">}</span>
-<span id="L90" class="LineNr"> 90 </span>  <a href='011load.cc.html#L219'>skip_whitespace_and_comments_but_not_newline</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L90" class="LineNr"> 90 </span>  <a href='011load.cc.html#L220'>skip_whitespace_and_comments_but_not_newline</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Identifier">return</span> result<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L92" class="LineNr"> 92 </span><span class="Delimiter">}</span>
 <span id="L93" class="LineNr"> 93 </span>
@@ -170,7 +170,7 @@ if ('onhashchange' in window) {
 <span id="L107" class="LineNr">107 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Delimiter">{</span>
-<span id="L110" class="LineNr">110 </span>    string s = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>    string s = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L111" class="LineNr">111 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L112" class="LineNr">112 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L113" class="LineNr">113 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete dilated reagent at <a href='003trace.cc.html#L195'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -185,7 +185,7 @@ if ('onhashchange' in window) {
 <span id="L122" class="LineNr">122 </span>    string key = <a href='016dilated_reagent.cc.html#L139'>slurp_key</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L123" class="LineNr">123 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>key<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L124" class="LineNr">124 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>key == <span class="Constant">&quot;}&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L125" class="LineNr">125 </span>    string s = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L125" class="LineNr">125 </span>    string s = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L126" class="LineNr">126 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L127" class="LineNr">127 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L128" class="LineNr">128 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete dilated reagent at <a href='003trace.cc.html#L195'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -200,7 +200,7 @@ if ('onhashchange' in window) {
 <span id="L137" class="LineNr">137 </span>
 <span id="L138" class="LineNr">138 </span><span class="Delimiter">:(code)</span>
 <span id="L139" class="LineNr">139 </span>string <a href='016dilated_reagent.cc.html#L139'>slurp_key</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L140" class="LineNr">140 </span>  string result = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L140" class="LineNr">140 </span>  string result = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L141" class="LineNr">141 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L142" class="LineNr">142 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L143" class="LineNr">143 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete dilated reagent at <a href='003trace.cc.html#L195'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
diff --git a/html/017parse_tree.cc.html b/html/017parse_tree.cc.html
index 3224e48a..27457430 100644
--- a/html/017parse_tree.cc.html
+++ b/html/017parse_tree.cc.html
@@ -107,7 +107,7 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr"> 45 </span>    <span class="Identifier">return</span> <span class="Constant">NULL</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>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'('</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L48" class="LineNr"> 48 </span>    string s = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>    string s = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L49" class="LineNr"> 49 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L50" class="LineNr"> 50 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L51" class="LineNr"> 51 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete string tree at <a href='003trace.cc.html#L195'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -128,7 +128,7 @@ if ('onhashchange' in window) {
 <span id="L66" class="LineNr"> 66 </span>      <span class="Delimiter">(</span>*curr<span class="Delimiter">)-&gt;</span>left = parse_string_tree<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L67" class="LineNr"> 67 </span>    <span class="Delimiter">}</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L69" class="LineNr"> 69 </span>      string s = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L69" class="LineNr"> 69 </span>      string s = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L70" class="LineNr"> 70 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L71" class="LineNr"> 71 </span>        assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L72" class="LineNr"> 72 </span>        <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete string tree at <a href='003trace.cc.html#L195'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
diff --git a/html/018type_abbreviations.cc.html b/html/018type_abbreviations.cc.html
index 495f9aed..51375fe5 100644
--- a/html/018type_abbreviations.cc.html
+++ b/html/018type_abbreviations.cc.html
@@ -83,13 +83,13 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr"> 20 </span>
 <span id="L21" class="LineNr"> 21 </span><span class="Delimiter">:(code)</span>
 <span id="L22" class="LineNr"> 22 </span><span class="Normal">void</span> <a href='018type_abbreviations.cc.html#L22'>load_type_abbreviations</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L23" class="LineNr"> 23 </span>  string new_type_name = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L23" class="LineNr"> 23 </span>  string new_type_name = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L24" class="LineNr"> 24 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> || !new_type_name<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">)</span> || new_type_name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement; must be of the form 'type &lt;new type name&gt; = &lt;type expression&gt;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L27" class="LineNr"> 27 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Delimiter">}</span>
-<span id="L29" class="LineNr"> 29 </span>  string arrow = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L29" class="LineNr"> 29 </span>  string arrow = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L30" class="LineNr"> 30 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> || !arrow<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>arrow<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L32" class="LineNr"> 32 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -103,7 +103,7 @@ if ('onhashchange' in window) {
 <span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot; ='</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L41" class="LineNr"> 41 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Delimiter">}</span>
-<span id="L43" class="LineNr"> 43 </span>  string old = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L43" class="LineNr"> 43 </span>  string old = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>old<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot; ='</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;'type' statements must be of the form 'type &lt;new type name&gt; = &lt;type expression&gt;' but got 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; arrow &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
diff --git a/html/020run.cc.html b/html/020run.cc.html
index 3e78d263..d8b62d00 100644
--- a/html/020run.cc.html
+++ b/html/020run.cc.html
@@ -146,7 +146,7 @@ if ('onhashchange' in window) {
 <span id="L81" class="LineNr"> 81 </span>    vector&lt;vector&lt;<span class="Normal">double</span>&gt; &gt; products<span class="Delimiter">;</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="Normal">switch</span> <span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>operation<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L83" class="LineNr"> 83 </span>      <span class="Comment">// Primitive Recipe Implementations</span>
-<span id="L84" class="LineNr"> 84 </span>      <span class="Normal">case</span> <a href='010vm.cc.html#L190'>COPY</a>: <span class="Delimiter">{</span>
+<span id="L84" class="LineNr"> 84 </span>      <span class="Normal">case</span> <a href='010vm.cc.html#L189'>COPY</a>: <span class="Delimiter">{</span>
 <span id="L85" class="LineNr"> 85 </span>        copy<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span>begin<span class="Delimiter">()));</span>
 <span id="L86" class="LineNr"> 86 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L87" class="LineNr"> 87 </span>      <span class="Delimiter">}</span>
diff --git a/html/021check_instruction.cc.html b/html/021check_instruction.cc.html
index 34214dfc..9e8d0d1f 100644
--- a/html/021check_instruction.cc.html
+++ b/html/021check_instruction.cc.html
@@ -81,7 +81,7 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr"> 20 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L21" class="LineNr"> 21 </span>    <span class="Normal">switch</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L22" class="LineNr"> 22 </span>      <span class="Comment">// Primitive Recipe Checks</span>
-<span id="L23" class="LineNr"> 23 </span>      <span class="Normal">case</span> <a href='010vm.cc.html#L190'>COPY</a>: <span class="Delimiter">{</span>
+<span id="L23" class="LineNr"> 23 </span>      <span class="Normal">case</span> <a href='010vm.cc.html#L189'>COPY</a>: <span class="Delimiter">{</span>
 <span id="L24" class="LineNr"> 24 </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>products<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="Delimiter">{</span>
 <span id="L25" class="LineNr"> 25 </span>          <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <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> &lt;&lt; <span class="Constant">&quot;ingredients and products should match in '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L26" class="LineNr"> 26 </span>          <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/028call_return.cc.html b/html/028call_return.cc.html
index c6847dd7..a65a25ba 100644
--- a/html/028call_return.cc.html
+++ b/html/028call_return.cc.html
@@ -128,7 +128,7 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span>    <span class="Normal">const</span> instruction&amp; caller_instruction = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L70" class="LineNr"> 70 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>operation &lt; <a href='010vm.cc.html#L192'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L70" class="LineNr"> 70 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>operation &lt; <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L71" class="LineNr"> 71 </span>    <span class="Normal">const</span> recipe&amp; callee = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> caller_instruction<span class="Delimiter">.</span>operation<span class="Delimiter">);</span>
 <span id="L72" class="LineNr"> 72 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>callee<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L73" class="LineNr"> 73 </span>      <span class="Normal">const</span> instruction&amp; return_inst = callee<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
diff --git a/html/030container.cc.html b/html/030container.cc.html
index b7fea808..1f89f15b 100644
--- a/html/030container.cc.html
+++ b/html/030container.cc.html
@@ -67,9 +67,9 @@ if ('onhashchange' in window) {
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
 <span id="L4" class="LineNr">  4 </span><span class="Comment">//: We'll use this container as a running example in scenarios below.</span>
-<span id="L5" class="LineNr">  5 </span><a href='010vm.cc.html#L124'>type_ordinal</a> point = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;point&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
+<span id="L5" class="LineNr">  5 </span><a href='010vm.cc.html#L123'>type_ordinal</a> point = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;point&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
 <span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point<span class="Delimiter">);</span>  <span class="Comment">// initialize</span>
-<span id="L7" class="LineNr">  7 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point<span class="Delimiter">).</span>kind = <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">;</span>
+<span id="L7" class="LineNr">  7 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point<span class="Delimiter">).</span>kind = <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">;</span>
 <span id="L8" class="LineNr">  8 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point<span class="Delimiter">).</span>name = <span class="Constant">&quot;point&quot;</span><span class="Delimiter">;</span>
 <span id="L9" class="LineNr">  9 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point<span class="Delimiter">).</span>elements<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;x:number&quot;</span><span class="Delimiter">));</span>
 <span id="L10" class="LineNr"> 10 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point<span class="Delimiter">).</span>elements<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;y:number&quot;</span><span class="Delimiter">));</span>
@@ -100,9 +100,9 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
 <span id="L36" class="LineNr"> 36 </span><span class="Comment">// A more complex example container, containing another container as one of</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Comment">// its elements.</span>
-<span id="L38" class="LineNr"> 38 </span><a href='010vm.cc.html#L124'>type_ordinal</a> point_number = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;point-number&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
+<span id="L38" class="LineNr"> 38 </span><a href='010vm.cc.html#L123'>type_ordinal</a> point_number = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;point-number&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span><a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point_number<span class="Delimiter">);</span>  <span class="Comment">// initialize</span>
-<span id="L40" class="LineNr"> 40 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point_number<span class="Delimiter">).</span>kind = <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">;</span>
+<span id="L40" class="LineNr"> 40 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point_number<span class="Delimiter">).</span>kind = <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">;</span>
 <span id="L41" class="LineNr"> 41 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point_number<span class="Delimiter">).</span>name = <span class="Constant">&quot;point-number&quot;</span><span class="Delimiter">;</span>
 <span id="L42" class="LineNr"> 42 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point_number<span class="Delimiter">).</span>elements<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;xy:point&quot;</span><span class="Delimiter">));</span>
 <span id="L43" class="LineNr"> 43 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point_number<span class="Delimiter">).</span>elements<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;z:number&quot;</span><span class="Delimiter">));</span>
@@ -220,7 +220,7 @@ if ('onhashchange' in window) {
 <span id="L155" class="LineNr">155 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L156" class="LineNr">156 </span><span class="Delimiter">}</span>
 <span id="L157" class="LineNr">157 </span>type_info t = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L158" class="LineNr">158 </span><span class="Normal">if</span> <span class="Delimiter">(</span>t<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L158" class="LineNr">158 </span><span class="Normal">if</span> <span class="Delimiter">(</span>t<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L159" class="LineNr">159 </span>  <span class="Comment">// Compute size_of Container</span>
 <span id="L160" class="LineNr">160 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L161" class="LineNr">161 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown size for container type '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -279,13 +279,13 @@ if ('onhashchange' in window) {
 <span id="L214" class="LineNr">214 </span>  assert<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
 <span id="L215" class="LineNr">215 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
 <span id="L216" class="LineNr">216 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">)</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span>
 <span id="L218" class="LineNr">218 </span>    compute_container_sizes<span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> pending_metadata<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L219" class="LineNr">219 </span>  <span class="Comment">// End compute_container_sizes Atom Special-cases</span>
 <span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
 <span id="L221" class="LineNr">221 </span>
 <span id="L222" class="LineNr">222 </span><span class="Normal">void</span> compute_container_sizes<span class="Delimiter">(</span><span class="Normal">const</span> type_info&amp; container_info<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* full_type<span class="Delimiter">,</span> set&lt;type_tree&gt;&amp; pending_metadata<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L223" class="LineNr">223 </span>  assert<span class="Delimiter">(</span>container_info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">);</span>
+<span id="L223" class="LineNr">223 </span>  assert<span class="Delimiter">(</span>container_info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">);</span>
 <span id="L224" class="LineNr">224 </span>  <span class="Comment">// size of a container is the sum of the sizes of its element</span>
 <span id="L225" class="LineNr">225 </span>  <span class="Comment">// (So it can only contain arrays if they're static and include their</span>
 <span id="L226" class="LineNr">226 </span>  <span class="Comment">// length in the type.)</span>
@@ -437,7 +437,7 @@ if ('onhashchange' in window) {
 <span id="L372" class="LineNr">372 </span>  <span class="Delimiter">}</span>
 <span id="L373" class="LineNr">373 </span>  <span class="Normal">const</span> type_tree* base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
 <span id="L374" class="LineNr">374 </span>  <span class="Comment">// Update GET base_type in Check</span>
-<span id="L375" class="LineNr">375 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_type<span class="Delimiter">-&gt;</span>atom || base_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L375" class="LineNr">375 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_type<span class="Delimiter">-&gt;</span>atom || base_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L376" class="LineNr">376 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <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> &lt;&lt; <span class="Constant">&quot;first ingredient of 'get' should be a container, but got '&quot;</span> &lt;&lt; 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 &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L377" class="LineNr">377 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L378" class="LineNr">378 </span>  <span class="Delimiter">}</span>
@@ -484,7 +484,7 @@ if ('onhashchange' in window) {
 <span id="L419" class="LineNr">419 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy is &quot;</span> &lt;&lt; src &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L420" class="LineNr">420 </span>  <span class="Comment">//: use base.type rather than base_type because later layers will introduce compound types</span>
 <span id="L421" class="LineNr">421 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L430'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> offset<span class="Delimiter">);</span>
-<span id="L422" class="LineNr">422 </span>  element<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>src<span class="Delimiter">);</span>
+<span id="L422" class="LineNr">422 </span>  element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>src<span class="Delimiter">);</span>
 <span id="L423" class="LineNr">423 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;its type is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L424" class="LineNr">424 </span>  <span class="Comment">// Read element</span>
 <span id="L425" class="LineNr">425 </span>  products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>read_memory<span class="Delimiter">(</span>element<span class="Delimiter">));</span>
@@ -499,7 +499,7 @@ if ('onhashchange' in window) {
 <span id="L434" class="LineNr">434 </span>  assert<span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">));</span>
 <span id="L435" class="LineNr">435 </span>  assert<span class="Delimiter">(</span>!get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L436" class="LineNr">436 </span>  <span class="Normal">const</span> type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L437" class="LineNr">437 </span>  assert<span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">);</span>
+<span id="L437" class="LineNr">437 </span>  assert<span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">);</span>
 <span id="L438" class="LineNr">438 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>offset_value &gt;= <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">))</span> <span class="Identifier">return</span> reagent<span class="Delimiter">();</span>  <span class="Comment">// error handled elsewhere</span>
 <span id="L439" class="LineNr">439 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>at<span class="Delimiter">(</span>offset_value<span class="Delimiter">);</span>
 <span id="L440" class="LineNr">440 </span>  <span class="Comment">// End element_type Special-cases</span>
@@ -585,7 +585,7 @@ if ('onhashchange' in window) {
 <span id="L520" class="LineNr">520 </span>  <span class="Delimiter">}</span>
 <span id="L521" class="LineNr">521 </span>  <span class="Normal">const</span> type_tree* base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
 <span id="L522" class="LineNr">522 </span>  <span class="Comment">// Update PUT base_type in Check</span>
-<span id="L523" class="LineNr">523 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_type<span class="Delimiter">-&gt;</span>atom || base_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L523" class="LineNr">523 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_type<span class="Delimiter">-&gt;</span>atom || base_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L524" class="LineNr">524 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <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> &lt;&lt; <span class="Constant">&quot;first ingredient of 'put' should be a container, but got '&quot;</span> &lt;&lt; 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 &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L525" class="LineNr">525 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L526" class="LineNr">526 </span>  <span class="Delimiter">}</span>
@@ -711,7 +711,7 @@ if ('onhashchange' in window) {
 <span id="L646" class="LineNr">646 </span>
 <span id="L647" class="LineNr">647 </span><span class="Delimiter">:(before &quot;End Command Handlers&quot;)</span>
 <span id="L648" class="LineNr">648 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>command == <span class="Constant">&quot;container&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L649" class="LineNr">649 </span>  <a href='030container.cc.html#L661'>insert_container</a><span class="Delimiter">(</span>command<span class="Delimiter">,</span> <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">,</span> in<span class="Delimiter">);</span>
+<span id="L649" class="LineNr">649 </span>  <a href='030container.cc.html#L661'>insert_container</a><span class="Delimiter">(</span>command<span class="Delimiter">,</span> <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">,</span> in<span class="Delimiter">);</span>
 <span id="L650" class="LineNr">650 </span><span class="Delimiter">}</span>
 <span id="L651" class="LineNr">651 </span>
 <span id="L652" class="LineNr">652 </span><span class="Comment">//: Even though we allow containers to be extended, we don't allow this after</span>
@@ -723,9 +723,9 @@ if ('onhashchange' in window) {
 <span id="L658" class="LineNr">658 </span>Num_calls_to_transform_all_at_first_definition = -<span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L659" class="LineNr">659 </span>
 <span id="L660" class="LineNr">660 </span><span class="Delimiter">:(code)</span>
-<span id="L661" class="LineNr">661 </span><span class="Normal">void</span> <a href='030container.cc.html#L661'>insert_container</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; command<span class="Delimiter">,</span> <a href='010vm.cc.html#L172'>kind_of_type</a> kind<span class="Delimiter">,</span> istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L661" class="LineNr">661 </span><span class="Normal">void</span> <a href='030container.cc.html#L661'>insert_container</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; command<span class="Delimiter">,</span> <a href='010vm.cc.html#L171'>kind_of_type</a> kind<span class="Delimiter">,</span> istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L662" class="LineNr">662 </span>  skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L663" class="LineNr">663 </span>  string name = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L663" class="LineNr">663 </span>  string name = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L664" class="LineNr">664 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L665" class="LineNr">665 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L666" class="LineNr">666 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete container definition at <a href='003trace.cc.html#L195'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -752,8 +752,8 @@ if ('onhashchange' in window) {
 <span id="L687" class="LineNr">687 </span>  info<span class="Delimiter">.</span>name = name<span class="Delimiter">;</span>
 <span id="L688" class="LineNr">688 </span>  info<span class="Delimiter">.</span>kind = kind<span class="Delimiter">;</span>
 <span id="L689" class="LineNr">689 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L690" class="LineNr">690 </span>    <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L691" class="LineNr">691 </span>    string element = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L690" class="LineNr">690 </span>    <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L691" class="LineNr">691 </span>    string element = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L692" class="LineNr">692 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>element<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L693" class="LineNr">693 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L694" class="LineNr">694 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete container definition at <a href='003trace.cc.html#L195'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -764,8 +764,8 @@ if ('onhashchange' in window) {
 <span id="L699" class="LineNr">699 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; command &lt;&lt; <span class="Constant">&quot; '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' contains multiple elements on a single line. Containers and exclusive containers must only contain elements, one to a line, no code.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L700" class="LineNr">700 </span>      <span class="Comment">// skip rest of container declaration</span>
 <span id="L701" class="LineNr">701 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L702" class="LineNr">702 </span>        <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L703" class="LineNr">703 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> == <span class="Constant">&quot;]&quot;</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L702" class="LineNr">702 </span>        <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L703" class="LineNr">703 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> == <span class="Constant">&quot;]&quot;</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L704" class="LineNr">704 </span>      <span class="Delimiter">}</span>
 <span id="L705" class="LineNr">705 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L706" class="LineNr">706 </span>    <span class="Delimiter">}</span>
@@ -796,7 +796,7 @@ if ('onhashchange' in window) {
 <span id="L731" class="LineNr">731 </span><span class="Delimiter">}</span>
 <span id="L732" class="LineNr">732 </span>
 <span id="L733" class="LineNr">733 </span><span class="Normal">void</span> <a href='030container.cc.html#L733'>skip_bracket</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">,</span> string message<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L734" class="LineNr">734 </span>  <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L734" class="LineNr">734 </span>  <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L735" class="LineNr">735 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>get<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span>
 <span id="L736" class="LineNr">736 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; message &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L737" class="LineNr">737 </span><span class="Delimiter">}</span>
diff --git a/html/031merge.cc.html b/html/031merge.cc.html
index 158f4f93..056a7c7a 100644
--- a/html/031merge.cc.html
+++ b/html/031merge.cc.html
@@ -194,7 +194,7 @@ if ('onhashchange' in window) {
 <span id="L131" class="LineNr">131 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L132" class="LineNr">132 </span>    <span class="Delimiter">}</span>
 <span id="L133" class="LineNr">133 </span>    <span class="Normal">const</span> type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> product_base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L134" class="LineNr">134 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind != <a href='010vm.cc.html#L174'>CONTAINER</a> &amp;&amp; info<span class="Delimiter">.</span>kind != <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L134" class="LineNr">134 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind != <a href='010vm.cc.html#L173'>CONTAINER</a> &amp;&amp; info<span class="Delimiter">.</span>kind != <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L135" class="LineNr">135 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'merge' should yield a container in '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L136" class="LineNr">136 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L137" class="LineNr">137 </span>    <span class="Delimiter">}</span>
@@ -219,7 +219,7 @@ if ('onhashchange' in window) {
 <span id="L156" class="LineNr">156 </span>    assert<span class="Delimiter">(</span>top_root_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
 <span id="L157" class="LineNr">157 </span>    type_info&amp; container_info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> top_root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
 <span id="L158" class="LineNr">158 </span>    <span class="Normal">switch</span> <span class="Delimiter">(</span>container_info<span class="Delimiter">.</span>kind<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L159" class="LineNr">159 </span>      <span class="Normal">case</span> <a href='010vm.cc.html#L174'>CONTAINER</a>: <span class="Delimiter">{</span>
+<span id="L159" class="LineNr">159 </span>      <span class="Normal">case</span> <a href='010vm.cc.html#L173'>CONTAINER</a>: <span class="Delimiter">{</span>
 <span id="L160" class="LineNr">160 </span>        <span class="Comment">// degenerate case: merge with the same type always succeeds</span>
 <span id="L161" class="LineNr">161 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index == <span class="Constant">0</span> &amp;&amp; <a href='021check_instruction.cc.html#L100'>types_coercible</a><span class="Delimiter">(</span>container<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">)))</span>
 <span id="L162" class="LineNr">162 </span>          <span class="Identifier">return</span><span class="Delimiter">;</span>
diff --git a/html/032array.cc.html b/html/032array.cc.html
index c3019efb..048f3dde 100644
--- a/html/032array.cc.html
+++ b/html/032array.cc.html
@@ -417,7 +417,7 @@ if ('onhashchange' in window) {
 <span id="L354" class="LineNr">354 </span>  <span class="Delimiter">}</span>
 <span id="L355" class="LineNr">355 </span>  reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">;</span>
 <span id="L356" class="LineNr">356 </span>  element<span class="Delimiter">.</span>type = <a href='032array.cc.html#L366'>copy_array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L357" class="LineNr">357 </span>  element<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>base_address + <span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span> + index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>*size_of<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L357" class="LineNr">357 </span>  element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>base_address + <span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span> + index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>*size_of<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L358" class="LineNr">358 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy is &quot;</span> &lt;&lt; element<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L359" class="LineNr">359 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;its type is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L360" class="LineNr">360 </span>  <span class="Comment">// Read element</span>
diff --git a/html/033exclusive_container.cc.html b/html/033exclusive_container.cc.html
index 9148aa53..f830b617 100644
--- a/html/033exclusive_container.cc.html
+++ b/html/033exclusive_container.cc.html
@@ -70,9 +70,9 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr">  7 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
 <span id="L8" class="LineNr">  8 </span><span class="Comment">//: We'll use this container as a running example, with two number elements.</span>
 <span id="L9" class="LineNr">  9 </span><span class="Delimiter">{</span>
-<span id="L10" class="LineNr"> 10 </span><a href='010vm.cc.html#L124'>type_ordinal</a> tmp = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;number-or-point&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
+<span id="L10" class="LineNr"> 10 </span><a href='010vm.cc.html#L123'>type_ordinal</a> tmp = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;number-or-point&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
 <span id="L11" class="LineNr"> 11 </span><a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>  <span class="Comment">// initialize</span>
-<span id="L12" class="LineNr"> 12 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> tmp<span class="Delimiter">).</span>kind = <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">;</span>
+<span id="L12" class="LineNr"> 12 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> tmp<span class="Delimiter">).</span>kind = <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">;</span>
 <span id="L13" class="LineNr"> 13 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> tmp<span class="Delimiter">).</span>name = <span class="Constant">&quot;number-or-point&quot;</span><span class="Delimiter">;</span>
 <span id="L14" class="LineNr"> 14 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> tmp<span class="Delimiter">).</span>elements<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;i:number&quot;</span><span class="Delimiter">));</span>
 <span id="L15" class="LineNr"> 15 </span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> tmp<span class="Delimiter">).</span>elements<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;p:point&quot;</span><span class="Delimiter">));</span>
@@ -94,12 +94,12 @@ if ('onhashchange' in window) {
 <span id="L31" class="LineNr"> 31 </span><span class="traceContains">+mem: storing 35 in location 6</span>
 <span id="L32" class="LineNr"> 32 </span>
 <span id="L33" class="LineNr"> 33 </span><span class="Delimiter">:(before &quot;End size_of(type) Special-cases&quot;)</span>
-<span id="L34" class="LineNr"> 34 </span><span class="Normal">if</span> <span class="Delimiter">(</span>t<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Normal">if</span> <span class="Delimiter">(</span>t<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Comment">// Compute size_of Exclusive Container</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Identifier">return</span> get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> type<span class="Delimiter">).</span>size<span class="Delimiter">;</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Delimiter">}</span>
 <span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(before &quot;End compute_container_sizes Atom Special-cases&quot;)</span>
-<span id="L39" class="LineNr"> 39 </span><span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L40" class="LineNr"> 40 </span>  <a href='033exclusive_container.cc.html#L44'>compute_exclusive_container_sizes</a><span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> pending_metadata<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L41" class="LineNr"> 41 </span><span class="Delimiter">}</span>
 <span id="L42" class="LineNr"> 42 </span>
@@ -174,7 +174,7 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span>  <span class="Delimiter">}</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Normal">const</span> type_tree* base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Comment">// Update MAYBE_CONVERT base_type in Check</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_type<span class="Delimiter">-&gt;</span>atom || base_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_type<span class="Delimiter">-&gt;</span>atom || base_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L115" class="LineNr">115 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'maybe-convert' should be an exclusive-container, but got '&quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L116" class="LineNr">116 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L117" class="LineNr">117 </span>  <span class="Delimiter">}</span>
@@ -254,7 +254,7 @@ if ('onhashchange' in window) {
 <span id="L191" class="LineNr">191 </span>  assert<span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">));</span>
 <span id="L192" class="LineNr">192 </span>  assert<span class="Delimiter">(</span>!get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L193" class="LineNr">193 </span>  <span class="Normal">const</span> type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L194" class="LineNr">194 </span>  assert<span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">);</span>
+<span id="L194" class="LineNr">194 </span>  assert<span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">);</span>
 <span id="L195" class="LineNr">195 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>at<span class="Delimiter">(</span>tag<span class="Delimiter">);</span>
 <span id="L196" class="LineNr">196 </span>  <span class="Comment">// End variant_type Special-cases</span>
 <span id="L197" class="LineNr">197 </span>  <span class="Identifier">return</span> element<span class="Delimiter">;</span>
@@ -292,7 +292,7 @@ if ('onhashchange' in window) {
 <span id="L229" class="LineNr">229 </span>
 <span id="L230" class="LineNr">230 </span><span class="Delimiter">:(before &quot;End Command Handlers&quot;)</span>
 <span id="L231" class="LineNr">231 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>command == <span class="Constant">&quot;exclusive-container&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L232" class="LineNr">232 </span>  <a href='030container.cc.html#L661'>insert_container</a><span class="Delimiter">(</span>command<span class="Delimiter">,</span> <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">,</span> in<span class="Delimiter">);</span>
+<span id="L232" class="LineNr">232 </span>  <a href='030container.cc.html#L661'>insert_container</a><span class="Delimiter">(</span>command<span class="Delimiter">,</span> <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">,</span> in<span class="Delimiter">);</span>
 <span id="L233" class="LineNr">233 </span><span class="Delimiter">}</span>
 <span id="L234" class="LineNr">234 </span>
 <span id="L235" class="LineNr">235 </span><span class="Comment">//: arrays are disallowed inside exclusive containers unless their length is</span>
@@ -378,7 +378,7 @@ if ('onhashchange' in window) {
 <span id="L315" class="LineNr">315 </span>$error: <span class="Constant">0</span>
 <span id="L316" class="LineNr">316 </span>
 <span id="L317" class="LineNr">317 </span><span class="Delimiter">:(before &quot;End <a href='031merge.cc.html#L142'>check_merge_call</a> Special-cases&quot;)</span>
-<span id="L318" class="LineNr">318 </span><span class="Normal">case</span> <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a>: <span class="Delimiter">{</span>
+<span id="L318" class="LineNr">318 </span><span class="Normal">case</span> <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a>: <span class="Delimiter">{</span>
 <span id="L319" class="LineNr">319 </span>  assert<span class="Delimiter">(</span>state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L320" class="LineNr">320 </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">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking exclusive container &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>container<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L321" class="LineNr">321 </span>  <span class="Comment">// easy case: exact match</span>
@@ -507,7 +507,7 @@ if ('onhashchange' in window) {
 <span id="L444" class="LineNr">444 </span>  <span class="Comment">// Update size_mismatch Check for MERGE(x)</span>
 <span id="L445" class="LineNr">445 </span>  <span class="Normal">const</span> type_tree* root_type = x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom ? x<span class="Delimiter">.</span>type : x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
 <span id="L446" class="LineNr">446 </span>  assert<span class="Delimiter">(</span>root_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L447" class="LineNr">447 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind == <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span>
+<span id="L447" class="LineNr">447 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span>
 <span id="L448" class="LineNr">448 </span>    <span class="Identifier">return</span> size_of<span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">);</span>
 <span id="L449" class="LineNr">449 </span><span class="Delimiter">}</span>
 <span id="L450" class="LineNr">450 </span>
diff --git a/html/034address.cc.html b/html/034address.cc.html
index 7ebf5662..b014ca8b 100644
--- a/html/034address.cc.html
+++ b/html/034address.cc.html
@@ -341,7 +341,7 @@ if ('onhashchange' in window) {
 <span id="L279" class="LineNr">279 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;new&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L280" class="LineNr">280 </span>      inst<span class="Delimiter">.</span>operation = ALLOCATE<span class="Delimiter">;</span>
 <span id="L281" class="LineNr">281 </span>      type_tree* type = <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><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>name<span class="Delimiter">);</span>
-<span id="L282" class="LineNr">282 </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><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>size_of<span class="Delimiter">(</span>type<span class="Delimiter">));</span>
+<span id="L282" class="LineNr">282 </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><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>size_of<span class="Delimiter">(</span>type<span class="Delimiter">));</span>
 <span id="L283" class="LineNr">283 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;new&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;size of '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' is &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>value &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L284" class="LineNr">284 </span>      <span class="Normal">delete</span> type<span class="Delimiter">;</span>
 <span id="L285" class="LineNr">285 </span>    <span class="Delimiter">}</span>
diff --git a/html/035lookup.cc.html b/html/035lookup.cc.html
index ce6d0ed6..c52b00d4 100644
--- a/html/035lookup.cc.html
+++ b/html/035lookup.cc.html
@@ -163,11 +163,11 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span><span class="Normal">void</span> lookup_memory_core<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">bool</span> check_for_null<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L102" class="LineNr">102 </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">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; 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> x<span class="Delimiter">.</span>value<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L103" class="LineNr">103 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> x<span class="Delimiter">.</span>value<span class="Delimiter">));</span>
+<span id="L103" class="LineNr">103 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> x<span class="Delimiter">.</span>value<span class="Delimiter">));</span>
 <span id="L104" class="LineNr">104 </span>  drop_from_type<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">);</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L106" class="LineNr">106 </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">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;skipping refcount at &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L107" class="LineNr">107 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>value+<span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">// skip refcount</span>
+<span id="L107" class="LineNr">107 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>value+<span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">// skip refcount</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>check_for_null<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L110" class="LineNr">110 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">)</span>
@@ -180,7 +180,7 @@ if ('onhashchange' in window) {
 <span id="L117" class="LineNr">117 </span>
 <span id="L118" class="LineNr">118 </span><span class="Normal">void</span> test_lookup_address_skips_refcount<span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L119" class="LineNr">119 </span>  reagent x<span class="Delimiter">(</span><span class="Constant">&quot;*x:<a href='043space.cc.html#L76'>address</a>:num&quot;</span><span class="Delimiter">);</span>
-<span id="L120" class="LineNr">120 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><span class="Constant">34</span><span class="Delimiter">);</span>  <span class="Comment">// unsafe</span>
+<span id="L120" class="LineNr">120 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><span class="Constant">34</span><span class="Delimiter">);</span>  <span class="Comment">// unsafe</span>
 <span id="L121" class="LineNr">121 </span>  <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1000</span><span class="Delimiter">);</span>
 <span id="L122" class="LineNr">122 </span>  lookup_memory<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L123" class="LineNr">123 </span>  <a href='003trace.cc.html#L228'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;mem: skipping refcount at 1000&quot;</span><span class="Delimiter">);</span>
@@ -190,7 +190,7 @@ if ('onhashchange' in window) {
 <span id="L127" class="LineNr">127 </span><span class="Normal">void</span> test_lookup_zero_address_does_not_skip_refcount<span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L128" class="LineNr">128 </span>  Hide_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L129" class="LineNr">129 </span>  reagent x<span class="Delimiter">(</span><span class="Constant">&quot;*x:<a href='043space.cc.html#L76'>address</a>:num&quot;</span><span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><span class="Constant">34</span><span class="Delimiter">);</span>  <span class="Comment">// unsafe</span>
+<span id="L130" class="LineNr">130 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><span class="Constant">34</span><span class="Delimiter">);</span>  <span class="Comment">// unsafe</span>
 <span id="L131" class="LineNr">131 </span>  <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L132" class="LineNr">132 </span>  lookup_memory<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L133" class="LineNr">133 </span>  <a href='003trace.cc.html#L248'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;mem: skipping refcount at 0&quot;</span><span class="Delimiter">);</span>
diff --git a/html/036refcount.cc.html b/html/036refcount.cc.html
index 714ef77b..f06ca44f 100644
--- a/html/036refcount.cc.html
+++ b/html/036refcount.cc.html
@@ -202,7 +202,7 @@ if ('onhashchange' in window) {
 <span id="L139" class="LineNr"> 139 </span><span class="Delimiter">:(after &quot;Write Memory in PUT in Run&quot;)</span>
 <span id="L140" class="LineNr"> 140 </span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L430'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> offset<span class="Delimiter">);</span>
 <span id="L141" class="LineNr"> 141 </span>assert<span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span>element<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">));</span>
-<span id="L142" class="LineNr"> 142 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">);</span>
+<span id="L142" class="LineNr"> 142 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">);</span>
 <span id="L143" class="LineNr"> 143 </span><a href='036refcount.cc.html#L29'>update_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
 <span id="L144" class="LineNr"> 144 </span>
 <span id="L145" class="LineNr"> 145 </span><span class="Delimiter">:(scenario refcounts_put_index)</span>
@@ -221,7 +221,7 @@ if ('onhashchange' in window) {
 <span id="L158" class="LineNr"> 158 </span>
 <span id="L159" class="LineNr"> 159 </span><span class="Delimiter">:(after &quot;Write Memory in PUT_INDEX in Run&quot;)</span>
 <span id="L160" class="LineNr"> 160 </span>reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">;</span>
-<span id="L161" class="LineNr"> 161 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">);</span>
+<span id="L161" class="LineNr"> 161 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">);</span>
 <span id="L162" class="LineNr"> 162 </span>element<span class="Delimiter">.</span>type = <a href='032array.cc.html#L366'>copy_array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L163" class="LineNr"> 163 </span><a href='036refcount.cc.html#L29'>update_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">,</span> value<span class="Delimiter">);</span>
 <span id="L164" class="LineNr"> 164 </span>
@@ -274,807 +274,813 @@ if ('onhashchange' in window) {
 <span id="L211" class="LineNr"> 211 </span><span class="traceContains">+run: {3: &quot;foo&quot;} &lt;- copy {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}</span>
 <span id="L212" class="LineNr"> 212 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
 <span id="L213" class="LineNr"> 213 </span>
-<span id="L214" class="LineNr"> 214 </span><span class="Delimiter">:(after &quot;End type_tree Definition&quot;)</span>
+<span id="L214" class="LineNr"> 214 </span><span class="Delimiter">:(before &quot;End type_tree Definition&quot;)</span>
 <span id="L215" class="LineNr"> 215 </span><span class="Normal">struct</span> address_element_info <span class="Delimiter">{</span>
 <span id="L216" class="LineNr"> 216 </span>  <span class="Normal">int</span> offset<span class="Delimiter">;</span>  <span class="Comment">// where inside a container type (after flattening nested containers!) the address lies</span>
 <span id="L217" class="LineNr"> 217 </span>  <span class="Normal">const</span> type_tree* <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">;</span>  <span class="Comment">// all the information we need to compute sizes of items inside an address inside a container. Doesn't need to be a full-scale reagent, since an address inside a container can never be an array, and arrays are the only type that need to know their location to compute their size.</span>
-<span id="L218" class="LineNr"> 218 </span>  address_element_info<span class="Delimiter">(</span><span class="Normal">int</span> o<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L219" class="LineNr"> 219 </span>    offset = o<span class="Delimiter">;</span>
-<span id="L220" class="LineNr"> 220 </span>    <a href='030container.cc.html#L238'>payload_type</a> = p<span class="Delimiter">;</span>
-<span id="L221" class="LineNr"> 221 </span>  <span class="Delimiter">}</span>
-<span id="L222" class="LineNr"> 222 </span>  address_element_info<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L223" class="LineNr"> 223 </span>    offset = other<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
-<span id="L224" class="LineNr"> 224 </span>    <a href='030container.cc.html#L238'>payload_type</a> = other<span class="Delimiter">.</span><a href='030container.cc.html#L238'>payload_type</a> ? <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*other<span class="Delimiter">.</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L225" class="LineNr"> 225 </span>  <span class="Delimiter">}</span>
-<span id="L226" class="LineNr"> 226 </span>  <a href='036refcount.cc.html#L226'>~address_element_info</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L227" class="LineNr"> 227 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L228" class="LineNr"> 228 </span>      <span class="Normal">delete</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">;</span>
-<span id="L229" class="LineNr"> 229 </span>      <a href='030container.cc.html#L238'>payload_type</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L230" class="LineNr"> 230 </span>    <span class="Delimiter">}</span>
-<span id="L231" class="LineNr"> 231 </span>  <span class="Delimiter">}</span>
-<span id="L232" class="LineNr"> 232 </span>  address_element_info&amp; <span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L233" class="LineNr"> 233 </span>    offset = other<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
-<span id="L234" class="LineNr"> 234 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">;</span>
-<span id="L235" class="LineNr"> 235 </span>    <a href='030container.cc.html#L238'>payload_type</a> = other<span class="Delimiter">.</span><a href='030container.cc.html#L238'>payload_type</a> ? <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*other<span class="Delimiter">.</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> : <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L236" class="LineNr"> 236 </span>    <span class="Identifier">return</span> *<span class="Normal">this</span><span class="Delimiter">;</span>
-<span id="L237" class="LineNr"> 237 </span>  <span class="Delimiter">}</span>
-<span id="L238" class="LineNr"> 238 </span><span class="Delimiter">};</span>
-<span id="L239" class="LineNr"> 239 </span>
-<span id="L240" class="LineNr"> 240 </span><span class="Comment">// For exclusive containers we might sometimes have an address at some offset</span>
-<span id="L241" class="LineNr"> 241 </span><span class="Comment">// if some other offset has a specific tag. This struct encapsulates such</span>
-<span id="L242" class="LineNr"> 242 </span><span class="Comment">// guards.</span>
-<span id="L243" class="LineNr"> 243 </span><span class="Normal">struct</span> tag_condition_info <span class="Delimiter">{</span>
-<span id="L244" class="LineNr"> 244 </span>  <span class="Normal">int</span> offset<span class="Delimiter">;</span>
-<span id="L245" class="LineNr"> 245 </span>  <span class="Normal">int</span> tag<span class="Delimiter">;</span>
-<span id="L246" class="LineNr"> 246 </span>  tag_condition_info<span class="Delimiter">(</span><span class="Normal">int</span> o<span class="Delimiter">,</span> <span class="Normal">int</span> t<span class="Delimiter">)</span> :offset<span class="Delimiter">(</span>o<span class="Delimiter">),</span> tag<span class="Delimiter">(</span>t<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L247" class="LineNr"> 247 </span><span class="Delimiter">};</span>
-<span id="L248" class="LineNr"> 248 </span>
-<span id="L249" class="LineNr"> 249 </span><span class="Delimiter">:(before &quot;End container_metadata Fields&quot;)</span>
-<span id="L250" class="LineNr"> 250 </span><span class="Comment">// a list of facts of the form:</span>
-<span id="L251" class="LineNr"> 251 </span><span class="Comment">//</span>
-<span id="L252" class="LineNr"> 252 </span><span class="Comment">//  IF offset o1 has tag t2 AND offset o2 has tag t2 AND .., THEN</span>
-<span id="L253" class="LineNr"> 253 </span><span class="Comment">//    for all address_element_infos:</span>
-<span id="L254" class="LineNr"> 254 </span><span class="Comment">//      you need to update refcounts for the address at offset pointing to a payload of type payload_type (just in case we need to abandon something in the process)</span>
-<span id="L255" class="LineNr"> 255 </span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt; <a href='043space.cc.html#L76'>address</a><span class="Delimiter">;</span>
-<span id="L256" class="LineNr"> 256 </span><span class="Delimiter">:(code)</span>
-<span id="L257" class="LineNr"> 257 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L258" class="LineNr"> 258 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> != b<span class="Delimiter">.</span>size<span class="Delimiter">())</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; b<span class="Delimiter">.</span>size<span class="Delimiter">();</span>
-<span id="L259" class="LineNr"> 259 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;tag_condition_info&gt;::const_iterator pa = a<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> pb = b<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  pa != a<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>  ++pa<span class="Delimiter">,</span> ++pb<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L260" class="LineNr"> 260 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>offset != pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>offset &lt; pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">;</span>
-<span id="L261" class="LineNr"> 261 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>tag != pb<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>tag &lt; pb<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">;</span>
-<span id="L262" class="LineNr"> 262 </span>  <span class="Delimiter">}</span>
-<span id="L263" class="LineNr"> 263 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
-<span id="L264" class="LineNr"> 264 </span><span class="Delimiter">}</span>
-<span id="L265" class="LineNr"> 265 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> tag_condition_info&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> tag_condition_info&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L266" class="LineNr"> 266 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>offset != b<span class="Delimiter">.</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>offset &lt; b<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
-<span id="L267" class="LineNr"> 267 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>tag != b<span class="Delimiter">.</span>tag<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>tag &lt; b<span class="Delimiter">.</span>tag<span class="Delimiter">;</span>
-<span id="L268" class="LineNr"> 268 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
-<span id="L269" class="LineNr"> 269 </span><span class="Delimiter">}</span>
-<span id="L270" class="LineNr"> 270 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> set&lt;address_element_info&gt;&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L271" class="LineNr"> 271 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> != b<span class="Delimiter">.</span>size<span class="Delimiter">())</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; b<span class="Delimiter">.</span>size<span class="Delimiter">();</span>
-<span id="L272" class="LineNr"> 272 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator pa = a<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> pb = b<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  pa != a<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>  ++pa<span class="Delimiter">,</span> ++pb<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L273" class="LineNr"> 273 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>offset != pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>offset &lt; pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">;</span>
-<span id="L274" class="LineNr"> 274 </span>  <span class="Delimiter">}</span>
-<span id="L275" class="LineNr"> 275 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
-<span id="L276" class="LineNr"> 276 </span><span class="Delimiter">}</span>
-<span id="L277" class="LineNr"> 277 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> address_element_info&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L278" class="LineNr"> 278 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>offset != b<span class="Delimiter">.</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>offset &lt; b<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
-<span id="L279" class="LineNr"> 279 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
-<span id="L280" class="LineNr"> 280 </span><span class="Delimiter">}</span>
-<span id="L281" class="LineNr"> 281 </span>
-<span id="L282" class="LineNr"> 282 </span><span class="Comment">//: populate metadata.address in a separate transform, because it requires</span>
-<span id="L283" class="LineNr"> 283 </span><span class="Comment">//: already knowing the sizes of all types</span>
-<span id="L284" class="LineNr"> 284 </span>
-<span id="L285" class="LineNr"> 285 </span><span class="Delimiter">:(after &quot;Transform.push_back(compute_container_sizes)&quot;)</span>
-<span id="L286" class="LineNr"> 286 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>compute_container_address_offsets<span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
-<span id="L287" class="LineNr"> 287 </span><span class="Delimiter">:(code)</span>
-<span id="L288" class="LineNr"> 288 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L289" class="LineNr"> 289 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L290" class="LineNr"> 290 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- compute <a href='043space.cc.html#L76'>address</a> offsets for &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L291" class="LineNr"> 291 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L292" class="LineNr"> 292 </span>    instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L293" class="LineNr"> 293 </span>    <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;- compute <a href='043space.cc.html#L76'>address</a> offsets for &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L294" class="LineNr"> 294 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L295" class="LineNr"> 295 </span>      compute_container_address_offsets<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> <span class="Constant">&quot; in '&quot;</span>+to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span>+<span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
-<span id="L296" class="LineNr"> 296 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L297" class="LineNr"> 297 </span>      compute_container_address_offsets<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> <span class="Constant">&quot; in '&quot;</span>+to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span>+<span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
-<span id="L298" class="LineNr"> 298 </span>  <span class="Delimiter">}</span>
-<span id="L299" class="LineNr"> 299 </span><span class="Delimiter">}</span>
-<span id="L300" class="LineNr"> 300 </span>
-<span id="L301" class="LineNr"> 301 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span>reagent&amp; r<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L302" class="LineNr"> 302 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>r<span class="Delimiter">)</span> || is_dummy<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L303" class="LineNr"> 303 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L304" class="LineNr"> 304 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">))</span>
-<span id="L305" class="LineNr"> 305 </span>    r<span class="Delimiter">.</span>metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L306" class="LineNr"> 306 </span><span class="Delimiter">}</span>
-<span id="L307" class="LineNr"> 307 </span>
-<span id="L308" class="LineNr"> 308 </span><span class="Comment">// the recursive structure of this function needs to exactly match</span>
-<span id="L309" class="LineNr"> 309 </span><span class="Comment">// compute_container_sizes</span>
-<span id="L310" class="LineNr"> 310 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L311" class="LineNr"> 311 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L312" class="LineNr"> 312 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L313" class="LineNr"> 313 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L314" class="LineNr"> 314 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; location_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L315" class="LineNr"> 315 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L316" class="LineNr"> 316 </span>    <span class="Delimiter">}</span>
-<span id="L317" class="LineNr"> 317 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;address&quot;</span><span class="Delimiter">)</span>
-<span id="L318" class="LineNr"> 318 </span>      compute_container_address_offsets<span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">(</span>type<span class="Delimiter">),</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L319" class="LineNr"> 319 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;array&quot;</span><span class="Delimiter">)</span>
-<span id="L320" class="LineNr"> 320 </span>      compute_container_address_offsets<span class="Delimiter">(</span><a href='032array.cc.html#L370'>array_element</a><span class="Delimiter">(</span>type<span class="Delimiter">),</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L321" class="LineNr"> 321 </span>    <span class="Comment">// End compute_container_address_offsets Non-atom Special-cases</span>
-<span id="L322" class="LineNr"> 322 </span>  <span class="Delimiter">}</span>
-<span id="L323" class="LineNr"> 323 </span>  <span class="Normal">const</span> type_tree* base_type = type<span class="Delimiter">;</span>
-<span id="L324" class="LineNr"> 324 </span>  <span class="Comment">// Update base_type in compute_container_address_offsets</span>
-<span id="L325" class="LineNr"> 325 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
-<span id="L326" class="LineNr"> 326 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L327" class="LineNr"> 327 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L328" class="LineNr"> 328 </span>    compute_container_address_offsets<span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L329" class="LineNr"> 329 </span>  <span class="Delimiter">}</span>
-<span id="L330" class="LineNr"> 330 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L331" class="LineNr"> 331 </span>    <a href='036refcount.cc.html#L342'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L332" class="LineNr"> 332 </span>  <span class="Delimiter">}</span>
-<span id="L333" class="LineNr"> 333 </span><span class="Delimiter">}</span>
-<span id="L334" class="LineNr"> 334 </span>
-<span id="L335" class="LineNr"> 335 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> type_info&amp; container_info<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* full_type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L336" class="LineNr"> 336 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
-<span id="L337" class="LineNr"> 337 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L338" class="LineNr"> 338 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute <a href='043space.cc.html#L76'>address</a> offsets for container &quot;</span> &lt;&lt; container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L339" class="LineNr"> 339 </span>  <a href='036refcount.cc.html#L352'>append_addresses</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> full_type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">(),</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L340" class="LineNr"> 340 </span><span class="Delimiter">}</span>
-<span id="L341" class="LineNr"> 341 </span>
-<span id="L342" class="LineNr"> 342 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L342'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span><span class="Normal">const</span> type_info&amp; exclusive_container_info<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* full_type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L343" class="LineNr"> 343 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
-<span id="L344" class="LineNr"> 344 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute <a href='043space.cc.html#L76'>address</a> offsets for exclusive container &quot;</span> &lt;&lt; exclusive_container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L345" class="LineNr"> 345 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>exclusive_container_info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L346" class="LineNr"> 346 </span>    set&lt;tag_condition_info&gt; key<span class="Delimiter">;</span>
-<span id="L347" class="LineNr"> 347 </span>    key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">tag is at offset</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
-<span id="L348" class="LineNr"> 348 </span>    <a href='036refcount.cc.html#L352'>append_addresses</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip tag offset</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>full_type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L349" class="LineNr"> 349 </span>  <span class="Delimiter">}</span>
-<span id="L350" class="LineNr"> 350 </span><span class="Delimiter">}</span>
-<span id="L351" class="LineNr"> 351 </span>
-<span id="L352" class="LineNr"> 352 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L352'>append_addresses</a><span class="Delimiter">(</span><span class="Normal">int</span> base_offset<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;&amp; out<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; key<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L353" class="LineNr"> 353 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L354" class="LineNr"> 354 </span>    <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> key<span class="Delimiter">).</span>insert<span class="Delimiter">(</span>address_element_info<span class="Delimiter">(</span>base_offset<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*payload_type<span class="Delimiter">(</span>type<span class="Delimiter">))));</span>
-<span id="L355" class="LineNr"> 355 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L356" class="LineNr"> 356 </span>  <span class="Delimiter">}</span>
-<span id="L357" class="LineNr"> 357 </span>  <span class="Normal">const</span> type_tree* base_type = type<span class="Delimiter">;</span>
-<span id="L358" class="LineNr"> 358 </span>  <span class="Comment">// Update base_type in append_container_address_offsets</span>
-<span id="L359" class="LineNr"> 359 </span>  <span class="Normal">const</span> type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L360" class="LineNr"> 360 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L361" class="LineNr"> 361 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> curr_index = <span class="Constant">0</span><span class="Delimiter">,</span> curr_offset = base_offset<span class="Delimiter">;</span>  curr_index &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++curr_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L362" class="LineNr"> 362 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking container &quot;</span> &lt;&lt; base_type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;, element &quot;</span> &lt;&lt; curr_index &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L363" class="LineNr"> 363 </span>      reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L430'>element_type</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> curr_index<span class="Delimiter">);</span>  <span class="Comment">// not base_type</span>
-<span id="L364" class="LineNr"> 364 </span>      <span class="Comment">// Compute Container Address Offset(element)</span>
-<span id="L365" class="LineNr"> 365 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L366" class="LineNr"> 366 </span>        <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address at offset &quot;</span> &lt;&lt; curr_offset &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L367" class="LineNr"> 367 </span>        <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> key<span class="Delimiter">).</span>insert<span class="Delimiter">(</span>address_element_info<span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*payload_type<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">))));</span>
-<span id="L368" class="LineNr"> 368 </span>        ++curr_offset<span class="Delimiter">;</span>
-<span id="L369" class="LineNr"> 369 </span>      <span class="Delimiter">}</span>
-<span id="L370" class="LineNr"> 370 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_array<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L371" class="LineNr"> 371 </span>        curr_offset += <span class="Comment">/*</span><span class="Comment">array length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L372" class="LineNr"> 372 </span>        <span class="Normal">const</span> type_tree* array_element_type = <a href='032array.cc.html#L370'>array_element</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L373" class="LineNr"> 373 </span>        <span class="Normal">int</span> array_element_size = size_of<span class="Delimiter">(</span>array_element_type<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 &lt; <a href='032array.cc.html#L117'>static_array_length</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L375" class="LineNr"> 375 </span>          <a href='036refcount.cc.html#L352'>append_addresses</a><span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> array_element_type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L376" class="LineNr"> 376 </span>          curr_offset += array_element_size<span class="Delimiter">;</span>
-<span id="L377" class="LineNr"> 377 </span>        <span class="Delimiter">}</span>
-<span id="L378" class="LineNr"> 378 </span>      <span class="Delimiter">}</span>
-<span id="L379" class="LineNr"> 379 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L380" class="LineNr"> 380 </span>        <a href='036refcount.cc.html#L352'>append_addresses</a><span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> element<span class="Delimiter">.</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L381" class="LineNr"> 381 </span>        curr_offset += size_of<span class="Delimiter">(</span>element<span class="Delimiter">);</span>
-<span id="L382" class="LineNr"> 382 </span>      <span class="Delimiter">}</span>
-<span id="L383" class="LineNr"> 383 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_exclusive_container<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L384" class="LineNr"> 384 </span>        <span class="Normal">const</span> type_tree* element_base_type = element<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
-<span id="L385" class="LineNr"> 385 </span>        <span class="Comment">// Update element_base_type For Exclusive Container in append_addresses</span>
-<span id="L386" class="LineNr"> 386 </span>        <span class="Normal">const</span> type_info&amp; element_info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> element_base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L387" class="LineNr"> 387 </span>        <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>element_info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L388" class="LineNr"> 388 </span>          set&lt;tag_condition_info&gt; new_key = key<span class="Delimiter">;</span>
-<span id="L389" class="LineNr"> 389 </span>          new_key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
-<span id="L390" class="LineNr"> 390 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>out<span class="Delimiter">,</span> new_key<span class="Delimiter">))</span>
-<span id="L391" class="LineNr"> 391 </span>            <a href='036refcount.cc.html#L352'>append_addresses</a><span class="Delimiter">(</span>curr_offset+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> new_key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L392" class="LineNr"> 392 </span>        <span class="Delimiter">}</span>
-<span id="L393" class="LineNr"> 393 </span>        curr_offset += size_of<span class="Delimiter">(</span>element<span class="Delimiter">);</span>
-<span id="L394" class="LineNr"> 394 </span>      <span class="Delimiter">}</span>
-<span id="L395" class="LineNr"> 395 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L396" class="LineNr"> 396 </span>        <span class="Comment">// non-address primitive</span>
-<span id="L397" class="LineNr"> 397 </span>        ++curr_offset<span class="Delimiter">;</span>
-<span id="L398" class="LineNr"> 398 </span>      <span class="Delimiter">}</span>
-<span id="L399" class="LineNr"> 399 </span>    <span class="Delimiter">}</span>
-<span id="L400" class="LineNr"> 400 </span>  <span class="Delimiter">}</span>
-<span id="L401" class="LineNr"> 401 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><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> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L403" class="LineNr"> 403 </span>      set&lt;tag_condition_info&gt; new_key = key<span class="Delimiter">;</span>
-<span id="L404" class="LineNr"> 404 </span>      new_key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span>base_offset<span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
-<span id="L405" class="LineNr"> 405 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>out<span class="Delimiter">,</span> new_key<span class="Delimiter">))</span>
-<span id="L406" class="LineNr"> 406 </span>        <a href='036refcount.cc.html#L352'>append_addresses</a><span class="Delimiter">(</span>base_offset+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> new_key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
-<span id="L407" class="LineNr"> 407 </span>    <span class="Delimiter">}</span>
-<span id="L408" class="LineNr"> 408 </span>  <span class="Delimiter">}</span>
-<span id="L409" class="LineNr"> 409 </span><span class="Delimiter">}</span>
-<span id="L410" class="LineNr"> 410 </span>
-<span id="L411" class="LineNr"> 411 </span><span class="Comment">//: for the following unit tests we'll do the work of the transform by hand</span>
-<span id="L412" class="LineNr"> 412 </span>
-<span id="L413" class="LineNr"> 413 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L414" class="LineNr"> 414 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L414'>test_container_address_offsets_empty</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L415" class="LineNr"> 415 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L416" class="LineNr"> 416 </span>  <span class="Comment">// define a container with no addresses</span>
-<span id="L417" class="LineNr"> 417 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:point&quot;</span><span class="Delimiter">);</span>
-<span id="L418" class="LineNr"> 418 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L419" class="LineNr"> 419 </span>  <span class="Comment">// scan</span>
-<span id="L420" class="LineNr"> 420 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L421" class="LineNr"> 421 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L422" class="LineNr"> 422 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L423" class="LineNr"> 423 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L424" class="LineNr"> 424 </span>  <span class="Comment">// the reagent we scanned knows it has no addresses</span>
-<span id="L425" class="LineNr"> 425 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L426" class="LineNr"> 426 </span>  <span class="Comment">// the global table contains an identical entry</span>
-<span id="L427" class="LineNr"> 427 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L428" class="LineNr"> 428 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L429" class="LineNr"> 429 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L430" class="LineNr"> 430 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L431" class="LineNr"> 431 </span><span class="Delimiter">}</span>
-<span id="L432" class="LineNr"> 432 </span>
-<span id="L433" class="LineNr"> 433 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L433'>test_container_address_offsets</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L434" class="LineNr"> 434 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L435" class="LineNr"> 435 </span>  <span class="Comment">// define a container with an address at offset 0 that we have the size for</span>
-<span id="L436" class="LineNr"> 436 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L437" class="LineNr"> 437 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L438" class="LineNr"> 438 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L439" class="LineNr"> 439 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L440" class="LineNr"> 440 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L441" class="LineNr"> 441 </span>  <span class="Comment">// scan</span>
-<span id="L442" class="LineNr"> 442 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L443" class="LineNr"> 443 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L444" class="LineNr"> 444 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L445" class="LineNr"> 445 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L446" class="LineNr"> 446 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 0</span>
-<span id="L447" class="LineNr"> 447 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L448" class="LineNr"> 448 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
-<span id="L449" class="LineNr"> 449 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>  <span class="Comment">// unconditional for containers</span>
-<span id="L450" class="LineNr"> 450 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L451" class="LineNr"> 451 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L452" class="LineNr"> 452 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L453" class="LineNr"> 453 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L454" class="LineNr"> 454 </span>  <span class="Comment">// the global table contains an identical entry</span>
-<span id="L455" class="LineNr"> 455 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L456" class="LineNr"> 456 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L457" class="LineNr"> 457 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L458" class="LineNr"> 458 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L459" class="LineNr"> 459 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L460" class="LineNr"> 460 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L461" class="LineNr"> 461 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L462" class="LineNr"> 462 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L463" class="LineNr"> 463 </span><span class="Delimiter">}</span>
-<span id="L464" class="LineNr"> 464 </span>
-<span id="L465" class="LineNr"> 465 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L465'>test_container_address_offsets_2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L466" class="LineNr"> 466 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L467" class="LineNr"> 467 </span>  <span class="Comment">// define a container with an address at offset 1 that we have the size for</span>
-<span id="L468" class="LineNr"> 468 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L469" class="LineNr"> 469 </span>      <span class="Constant">&quot;  x:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L470" class="LineNr"> 470 </span>      <span class="Constant">&quot;  y:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L471" class="LineNr"> 471 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L472" class="LineNr"> 472 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L473" class="LineNr"> 473 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L474" class="LineNr"> 474 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L475" class="LineNr"> 475 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L476" class="LineNr"> 476 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L477" class="LineNr"> 477 </span>  <span class="Comment">// scan</span>
-<span id="L478" class="LineNr"> 478 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L479" class="LineNr"> 479 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L480" class="LineNr"> 480 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L481" class="LineNr"> 481 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 1</span>
-<span id="L482" class="LineNr"> 482 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L483" class="LineNr"> 483 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
-<span id="L484" class="LineNr"> 484 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L485" class="LineNr"> 485 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L486" class="LineNr"> 486 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
-<span id="L487" class="LineNr"> 487 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L488" class="LineNr"> 488 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L489" class="LineNr"> 489 </span>  <span class="Comment">// the global table contains an identical entry</span>
-<span id="L490" class="LineNr"> 490 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L491" class="LineNr"> 491 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L492" class="LineNr"> 492 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L493" class="LineNr"> 493 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
-<span id="L494" class="LineNr"> 494 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L495" class="LineNr"> 495 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L496" class="LineNr"> 496 </span><span class="Delimiter">}</span>
-<span id="L497" class="LineNr"> 497 </span>
-<span id="L498" class="LineNr"> 498 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L498'>test_container_address_offsets_nested</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L499" class="LineNr"> 499 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L500" class="LineNr"> 500 </span>  <span class="Comment">// define a container with a nested container containing an address</span>
-<span id="L501" class="LineNr"> 501 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L502" class="LineNr"> 502 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L503" class="LineNr"> 503 </span>      <span class="Constant">&quot;  y:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L504" class="LineNr"> 504 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L505" class="LineNr"> 505 </span>      <span class="Constant">&quot;container bar [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L506" class="LineNr"> 506 </span>      <span class="Constant">&quot;  p:point</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L507" class="LineNr"> 507 </span>      <span class="Constant">&quot;  f:foo</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>  <span class="Comment">// nested container containing address</span>
-<span id="L508" class="LineNr"> 508 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L509" class="LineNr"> 509 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:bar&quot;</span><span class="Delimiter">);</span>
-<span id="L510" class="LineNr"> 510 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L511" class="LineNr"> 511 </span>  <span class="Comment">// global metadata contains entries for bar and included types: point and foo</span>
-<span id="L512" class="LineNr"> 512 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L513" class="LineNr"> 513 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L514" class="LineNr"> 514 </span>  <span class="Comment">// scan</span>
-<span id="L515" class="LineNr"> 515 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L516" class="LineNr"> 516 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 2</span>
-<span id="L517" class="LineNr"> 517 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L518" class="LineNr"> 518 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
-<span id="L519" class="LineNr"> 519 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L520" class="LineNr"> 520 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L521" class="LineNr"> 521 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
-<span id="L522" class="LineNr"> 522 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L523" class="LineNr"> 523 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L524" class="LineNr"> 524 </span>  <span class="Comment">// the global table also knows its address offset</span>
-<span id="L525" class="LineNr"> 525 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L526" class="LineNr"> 526 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L527" class="LineNr"> 527 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L528" class="LineNr"> 528 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
-<span id="L529" class="LineNr"> 529 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L530" class="LineNr"> 530 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L531" class="LineNr"> 531 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L532" class="LineNr"> 532 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L533" class="LineNr"> 533 </span><span class="Delimiter">}</span>
-<span id="L534" class="LineNr"> 534 </span>
-<span id="L535" class="LineNr"> 535 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L535'>test_container_address_offsets_from_address</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L536" class="LineNr"> 536 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L537" class="LineNr"> 537 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L538" class="LineNr"> 538 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L539" class="LineNr"> 539 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L540" class="LineNr"> 540 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L541" class="LineNr"> 541 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L542" class="LineNr"> 542 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L543" class="LineNr"> 543 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L544" class="LineNr"> 544 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L545" class="LineNr"> 545 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L546" class="LineNr"> 546 </span>  <span class="Comment">// scan an address to the container</span>
-<span id="L547" class="LineNr"> 547 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L548" class="LineNr"> 548 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L549" class="LineNr"> 549 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L550" class="LineNr"> 550 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L551" class="LineNr"> 551 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L552" class="LineNr"> 552 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L553" class="LineNr"> 553 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L554" class="LineNr"> 554 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L555" class="LineNr"> 555 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L556" class="LineNr"> 556 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L557" class="LineNr"> 557 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L558" class="LineNr"> 558 </span><span class="Delimiter">}</span>
-<span id="L559" class="LineNr"> 559 </span>
-<span id="L560" class="LineNr"> 560 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L560'>test_container_address_offsets_from_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L561" class="LineNr"> 561 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L562" class="LineNr"> 562 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L563" class="LineNr"> 563 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L564" class="LineNr"> 564 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L565" class="LineNr"> 565 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L566" class="LineNr"> 566 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:array:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L567" class="LineNr"> 567 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L568" class="LineNr"> 568 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L569" class="LineNr"> 569 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L570" class="LineNr"> 570 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L571" class="LineNr"> 571 </span>  <span class="Comment">// scan an array of the container</span>
-<span id="L572" class="LineNr"> 572 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L573" class="LineNr"> 573 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L574" class="LineNr"> 574 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L575" class="LineNr"> 575 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L576" class="LineNr"> 576 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L577" class="LineNr"> 577 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L578" class="LineNr"> 578 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L579" class="LineNr"> 579 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L580" class="LineNr"> 580 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L581" class="LineNr"> 581 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L582" class="LineNr"> 582 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L583" class="LineNr"> 583 </span><span class="Delimiter">}</span>
-<span id="L584" class="LineNr"> 584 </span>
-<span id="L585" class="LineNr"> 585 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L585'>test_container_address_offsets_from_address_to_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L586" class="LineNr"> 586 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L587" class="LineNr"> 587 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L588" class="LineNr"> 588 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L589" class="LineNr"> 589 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L590" class="LineNr"> 590 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L591" class="LineNr"> 591 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:array:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L592" class="LineNr"> 592 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L593" class="LineNr"> 593 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L594" class="LineNr"> 594 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L595" class="LineNr"> 595 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L596" class="LineNr"> 596 </span>  <span class="Comment">// scan an address to an array of the container</span>
-<span id="L597" class="LineNr"> 597 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L598" class="LineNr"> 598 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L599" class="LineNr"> 599 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L600" class="LineNr"> 600 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L601" class="LineNr"> 601 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L602" class="LineNr"> 602 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L603" class="LineNr"> 603 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L604" class="LineNr"> 604 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L605" class="LineNr"> 605 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L606" class="LineNr"> 606 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L607" class="LineNr"> 607 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L608" class="LineNr"> 608 </span><span class="Delimiter">}</span>
-<span id="L609" class="LineNr"> 609 </span>
-<span id="L610" class="LineNr"> 610 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L610'>test_container_address_offsets_from_static_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L611" class="LineNr"> 611 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L612" class="LineNr"> 612 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L613" class="LineNr"> 613 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L614" class="LineNr"> 614 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L615" class="LineNr"> 615 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L616" class="LineNr"> 616 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:array:foo:10&quot;</span><span class="Delimiter">);</span>
-<span id="L617" class="LineNr"> 617 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L618" class="LineNr"> 618 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L619" class="LineNr"> 619 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L620" class="LineNr"> 620 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L621" class="LineNr"> 621 </span>  <span class="Comment">// scan a static array of the container</span>
-<span id="L622" class="LineNr"> 622 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L623" class="LineNr"> 623 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L624" class="LineNr"> 624 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L625" class="LineNr"> 625 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L626" class="LineNr"> 626 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L627" class="LineNr"> 627 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L628" class="LineNr"> 628 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L629" class="LineNr"> 629 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L630" class="LineNr"> 630 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L631" class="LineNr"> 631 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L632" class="LineNr"> 632 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L633" class="LineNr"> 633 </span><span class="Delimiter">}</span>
-<span id="L634" class="LineNr"> 634 </span>
-<span id="L635" class="LineNr"> 635 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L635'>test_container_address_offsets_from_address_to_static_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L636" class="LineNr"> 636 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L637" class="LineNr"> 637 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L638" class="LineNr"> 638 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L639" class="LineNr"> 639 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L640" class="LineNr"> 640 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L641" class="LineNr"> 641 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:array:foo:10&quot;</span><span class="Delimiter">);</span>
-<span id="L642" class="LineNr"> 642 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L643" class="LineNr"> 643 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L644" class="LineNr"> 644 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L645" class="LineNr"> 645 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L646" class="LineNr"> 646 </span>  <span class="Comment">// scan an address to a static array of the container</span>
-<span id="L647" class="LineNr"> 647 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L648" class="LineNr"> 648 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L649" class="LineNr"> 649 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L650" class="LineNr"> 650 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L651" class="LineNr"> 651 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L652" class="LineNr"> 652 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L653" class="LineNr"> 653 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L654" class="LineNr"> 654 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L655" class="LineNr"> 655 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L656" class="LineNr"> 656 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L657" class="LineNr"> 657 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L658" class="LineNr"> 658 </span><span class="Delimiter">}</span>
-<span id="L659" class="LineNr"> 659 </span>
-<span id="L660" class="LineNr"> 660 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L660'>test_container_address_offsets_from_repeated_address_and_array_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L661" class="LineNr"> 661 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
-<span id="L662" class="LineNr"> 662 </span>  <span class="Comment">// define a container with an address at offset 0</span>
-<span id="L663" class="LineNr"> 663 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L664" class="LineNr"> 664 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L665" class="LineNr"> 665 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L666" class="LineNr"> 666 </span>  <span class="Comment">// scan a deep nest of 'address' and 'array' types modifying a container</span>
-<span id="L667" class="LineNr"> 667 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:array:<a href='043space.cc.html#L76'>address</a>:<a href='043space.cc.html#L76'>address</a>:array:foo:10&quot;</span><span class="Delimiter">);</span>
-<span id="L668" class="LineNr"> 668 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
-<span id="L669" class="LineNr"> 669 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
-<span id="L670" class="LineNr"> 670 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
-<span id="L671" class="LineNr"> 671 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L672" class="LineNr"> 672 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L673" class="LineNr"> 673 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
-<span id="L674" class="LineNr"> 674 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L675" class="LineNr"> 675 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
-<span id="L676" class="LineNr"> 676 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
-<span id="L677" class="LineNr"> 677 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L678" class="LineNr"> 678 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
-<span id="L679" class="LineNr"> 679 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L680" class="LineNr"> 680 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L681" class="LineNr"> 681 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
-<span id="L682" class="LineNr"> 682 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
-<span id="L683" class="LineNr"> 683 </span><span class="Delimiter">}</span>
-<span id="L684" class="LineNr"> 684 </span>
-<span id="L685" class="LineNr"> 685 </span><span class="Comment">//: use metadata.address to update refcounts within containers, arrays and</span>
-<span id="L686" class="LineNr"> 686 </span><span class="Comment">//: exclusive containers</span>
-<span id="L687" class="LineNr"> 687 </span>
-<span id="L688" class="LineNr"> 688 </span><span class="Delimiter">:(before &quot;End Increment Refcounts(canonized_x)&quot;)</span>
-<span id="L689" class="LineNr"> 689 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> || is_mu_exclusive_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L690" class="LineNr"> 690 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L691" class="LineNr"> 691 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><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="L692" class="LineNr"> 692 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L693" class="LineNr"> 693 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span>
-<span id="L694" class="LineNr"> 694 </span>      <a href='036refcount.cc.html#L43'>increment_refcount</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">));</span>
-<span id="L695" class="LineNr"> 695 </span>  <span class="Delimiter">}</span>
-<span id="L696" class="LineNr"> 696 </span><span class="Delimiter">}</span>
-<span id="L697" class="LineNr"> 697 </span>
-<span id="L698" class="LineNr"> 698 </span><span class="Delimiter">:(before &quot;End Decrement Refcounts(canonized_x)&quot;)</span>
-<span id="L699" class="LineNr"> 699 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> || is_mu_exclusive_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L700" class="LineNr"> 700 </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">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;need to read old value of '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' to figure out what refcounts to decrement&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L701" class="LineNr"> 701 </span>  <span class="Comment">// read from canonized_x but without canonizing again</span>
-<span id="L702" class="LineNr"> 702 </span>  <span class="Comment">// todo: inline without running canonize all over again</span>
-<span id="L703" class="LineNr"> 703 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> tmp = canonized_x<span class="Delimiter">;</span>
-<span id="L704" class="LineNr"> 704 </span>  tmp<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
-<span id="L705" class="LineNr"> 705 </span>  vector&lt;<span class="Normal">double</span>&gt; data = read_memory<span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
-<span id="L706" class="LineNr"> 706 </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">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done reading old value of '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L707" class="LineNr"> 707 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L708" class="LineNr"> 708 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><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="L709" class="LineNr"> 709 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L710" class="LineNr"> 710 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L711" class="LineNr"> 711 </span>      <span class="Normal">int</span> element_address = <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>value + info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">);</span>
-<span id="L712" class="LineNr"> 712 </span>      reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">;</span>
-<span id="L713" class="LineNr"> 713 </span>      element<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>element_address+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L714" class="LineNr"> 714 </span>      element<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">);</span>
-<span id="L715" class="LineNr"> 715 </span>      <a href='036refcount.cc.html#L60'>decrement_refcount</a><span class="Delimiter">(</span>element_address<span class="Delimiter">,</span> info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">,</span> size_of<span class="Delimiter">(</span>element<span class="Delimiter">)</span>+<span class="Comment">/*</span><span class="Comment">refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L716" class="LineNr"> 716 </span>    <span class="Delimiter">}</span>
-<span id="L717" class="LineNr"> 717 </span>  <span class="Delimiter">}</span>
-<span id="L718" class="LineNr"> 718 </span><span class="Delimiter">}</span>
-<span id="L719" class="LineNr"> 719 </span>
-<span id="L720" class="LineNr"> 720 </span><span class="Delimiter">:(code)</span>
-<span id="L721" class="LineNr"> 721 </span><span class="Normal">bool</span> <a href='036refcount.cc.html#L721'>all_match</a><span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; conditions<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L722" class="LineNr"> 722 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;tag_condition_info&gt;::const_iterator p = conditions<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != conditions<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="L723" class="LineNr"> 723 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> != p<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">)</span>
-<span id="L724" class="LineNr"> 724 </span>      <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L725" class="LineNr"> 725 </span>  <span class="Delimiter">}</span>
-<span id="L726" class="LineNr"> 726 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L727" class="LineNr"> 727 </span><span class="Delimiter">}</span>
-<span id="L728" class="LineNr"> 728 </span>
-<span id="L729" class="LineNr"> 729 </span><span class="Delimiter">:(scenario refcounts_put_container)</span>
-<span id="L730" class="LineNr"> 730 </span><span class="muData">container</span> foo [
-<span id="L731" class="LineNr"> 731 </span>  <span class="Normal">a</span>:bar  <span class="Comment"># contains an address</span>
-<span id="L732" class="LineNr"> 732 </span>]
-<span id="L733" class="LineNr"> 733 </span><span class="muData">container</span> bar [
-<span id="L734" class="LineNr"> 734 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L735" class="LineNr"> 735 </span>]
-<span id="L736" class="LineNr"> 736 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L737" class="LineNr"> 737 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L738" class="LineNr"> 738 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L739" class="LineNr"> 739 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L740" class="LineNr"> 740 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L218'>put</a> *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Delimiter">,</span> <span class="Constant">a:offset</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L218" class="LineNr"> 218 </span>  address_element_info<span class="Delimiter">(</span><span class="Normal">int</span> o<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* p<span class="Delimiter">);</span>
+<span id="L219" class="LineNr"> 219 </span>  address_element_info<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">);</span>
+<span id="L220" class="LineNr"> 220 </span>  <a href='036refcount.cc.html#L232'>~address_element_info</a><span class="Delimiter">();</span>
+<span id="L221" class="LineNr"> 221 </span>  address_element_info&amp; <span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">);</span>
+<span id="L222" class="LineNr"> 222 </span><span class="Delimiter">};</span>
+<span id="L223" class="LineNr"> 223 </span><span class="Delimiter">:(code)</span>
+<span id="L224" class="LineNr"> 224 </span>address_element_info::address_element_info<span class="Delimiter">(</span><span class="Normal">int</span> o<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L225" class="LineNr"> 225 </span>  offset = o<span class="Delimiter">;</span>
+<span id="L226" class="LineNr"> 226 </span>  <a href='030container.cc.html#L238'>payload_type</a> = p<span class="Delimiter">;</span>
+<span id="L227" class="LineNr"> 227 </span><span class="Delimiter">}</span>
+<span id="L228" class="LineNr"> 228 </span>address_element_info::address_element_info<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L229" class="LineNr"> 229 </span>  offset = other<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
+<span id="L230" class="LineNr"> 230 </span>  <a href='030container.cc.html#L238'>payload_type</a> = copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">);</span>
+<span id="L231" class="LineNr"> 231 </span><span class="Delimiter">}</span>
+<span id="L232" class="LineNr"> 232 </span>address_element_info::<a href='036refcount.cc.html#L232'>~address_element_info</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L233" class="LineNr"> 233 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L234" class="LineNr"> 234 </span>    <span class="Normal">delete</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">;</span>
+<span id="L235" class="LineNr"> 235 </span>    <a href='030container.cc.html#L238'>payload_type</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L236" class="LineNr"> 236 </span>  <span class="Delimiter">}</span>
+<span id="L237" class="LineNr"> 237 </span><span class="Delimiter">}</span>
+<span id="L238" class="LineNr"> 238 </span>address_element_info&amp; address_element_info::<span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; other<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L239" class="LineNr"> 239 </span>  offset = other<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
+<span id="L240" class="LineNr"> 240 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">;</span>
+<span id="L241" class="LineNr"> 241 </span>  <a href='030container.cc.html#L238'>payload_type</a> = copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">);</span>
+<span id="L242" class="LineNr"> 242 </span>  <span class="Identifier">return</span> *<span class="Normal">this</span><span class="Delimiter">;</span>
+<span id="L243" class="LineNr"> 243 </span><span class="Delimiter">}</span>
+<span id="L244" class="LineNr"> 244 </span>
+<span id="L245" class="LineNr"> 245 </span><span class="Delimiter">:(before &quot;End type_tree Definition&quot;)</span>
+<span id="L246" class="LineNr"> 246 </span><span class="Comment">// For exclusive containers we might sometimes have an address at some offset</span>
+<span id="L247" class="LineNr"> 247 </span><span class="Comment">// if some other offset has a specific tag. This struct encapsulates such</span>
+<span id="L248" class="LineNr"> 248 </span><span class="Comment">// guards.</span>
+<span id="L249" class="LineNr"> 249 </span><span class="Normal">struct</span> tag_condition_info <span class="Delimiter">{</span>
+<span id="L250" class="LineNr"> 250 </span>  <span class="Normal">int</span> offset<span class="Delimiter">;</span>
+<span id="L251" class="LineNr"> 251 </span>  <span class="Normal">int</span> tag<span class="Delimiter">;</span>
+<span id="L252" class="LineNr"> 252 </span>  tag_condition_info<span class="Delimiter">(</span><span class="Normal">int</span> o<span class="Delimiter">,</span> <span class="Normal">int</span> t<span class="Delimiter">)</span> :offset<span class="Delimiter">(</span>o<span class="Delimiter">),</span> tag<span class="Delimiter">(</span>t<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L253" class="LineNr"> 253 </span><span class="Delimiter">};</span>
+<span id="L254" class="LineNr"> 254 </span>
+<span id="L255" class="LineNr"> 255 </span><span class="Delimiter">:(before &quot;End container_metadata Fields&quot;)</span>
+<span id="L256" class="LineNr"> 256 </span><span class="Comment">// a list of facts of the form:</span>
+<span id="L257" class="LineNr"> 257 </span><span class="Comment">//</span>
+<span id="L258" class="LineNr"> 258 </span><span class="Comment">//  IF offset o1 has tag t2 AND offset o2 has tag t2 AND .., THEN</span>
+<span id="L259" class="LineNr"> 259 </span><span class="Comment">//    for all address_element_infos:</span>
+<span id="L260" class="LineNr"> 260 </span><span class="Comment">//      you need to update refcounts for the address at offset pointing to a payload of type payload_type (just in case we need to abandon something in the process)</span>
+<span id="L261" class="LineNr"> 261 </span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt; <a href='043space.cc.html#L76'>address</a><span class="Delimiter">;</span>
+<span id="L262" class="LineNr"> 262 </span><span class="Delimiter">:(code)</span>
+<span id="L263" class="LineNr"> 263 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L264" class="LineNr"> 264 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> != b<span class="Delimiter">.</span>size<span class="Delimiter">())</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; b<span class="Delimiter">.</span>size<span class="Delimiter">();</span>
+<span id="L265" class="LineNr"> 265 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;tag_condition_info&gt;::const_iterator pa = a<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> pb = b<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  pa != a<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>  ++pa<span class="Delimiter">,</span> ++pb<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L266" class="LineNr"> 266 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>offset != pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>offset &lt; pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">;</span>
+<span id="L267" class="LineNr"> 267 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>tag != pb<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>tag &lt; pb<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">;</span>
+<span id="L268" class="LineNr"> 268 </span>  <span class="Delimiter">}</span>
+<span id="L269" class="LineNr"> 269 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
+<span id="L270" class="LineNr"> 270 </span><span class="Delimiter">}</span>
+<span id="L271" class="LineNr"> 271 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> tag_condition_info&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> tag_condition_info&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L272" class="LineNr"> 272 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>offset != b<span class="Delimiter">.</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>offset &lt; b<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
+<span id="L273" class="LineNr"> 273 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>tag != b<span class="Delimiter">.</span>tag<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>tag &lt; b<span class="Delimiter">.</span>tag<span class="Delimiter">;</span>
+<span id="L274" class="LineNr"> 274 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
+<span id="L275" class="LineNr"> 275 </span><span class="Delimiter">}</span>
+<span id="L276" class="LineNr"> 276 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> set&lt;address_element_info&gt;&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L277" class="LineNr"> 277 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> != b<span class="Delimiter">.</span>size<span class="Delimiter">())</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; b<span class="Delimiter">.</span>size<span class="Delimiter">();</span>
+<span id="L278" class="LineNr"> 278 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator pa = a<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> pb = b<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  pa != a<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>  ++pa<span class="Delimiter">,</span> ++pb<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L279" class="LineNr"> 279 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>pa<span class="Delimiter">-&gt;</span>offset != pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> pa<span class="Delimiter">-&gt;</span>offset &lt; pb<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">;</span>
+<span id="L280" class="LineNr"> 280 </span>  <span class="Delimiter">}</span>
+<span id="L281" class="LineNr"> 281 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
+<span id="L282" class="LineNr"> 282 </span><span class="Delimiter">}</span>
+<span id="L283" class="LineNr"> 283 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> address_element_info&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> address_element_info&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L284" class="LineNr"> 284 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>offset != b<span class="Delimiter">.</span>offset<span class="Delimiter">)</span> <span class="Identifier">return</span> a<span class="Delimiter">.</span>offset &lt; b<span class="Delimiter">.</span>offset<span class="Delimiter">;</span>
+<span id="L285" class="LineNr"> 285 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// equal</span>
+<span id="L286" class="LineNr"> 286 </span><span class="Delimiter">}</span>
+<span id="L287" class="LineNr"> 287 </span>
+<span id="L288" class="LineNr"> 288 </span><span class="Comment">//: populate metadata.address in a separate transform, because it requires</span>
+<span id="L289" class="LineNr"> 289 </span><span class="Comment">//: already knowing the sizes of all types</span>
+<span id="L290" class="LineNr"> 290 </span>
+<span id="L291" class="LineNr"> 291 </span><span class="Delimiter">:(after &quot;Transform.push_back(compute_container_sizes)&quot;)</span>
+<span id="L292" class="LineNr"> 292 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>compute_container_address_offsets<span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
+<span id="L293" class="LineNr"> 293 </span><span class="Delimiter">:(code)</span>
+<span id="L294" class="LineNr"> 294 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L295" class="LineNr"> 295 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
+<span id="L296" class="LineNr"> 296 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- compute <a href='043space.cc.html#L76'>address</a> offsets for &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L297" class="LineNr"> 297 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L298" class="LineNr"> 298 </span>    instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L299" class="LineNr"> 299 </span>    <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;- compute <a href='043space.cc.html#L76'>address</a> offsets for &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L300" class="LineNr"> 300 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L301" class="LineNr"> 301 </span>      compute_container_address_offsets<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> <span class="Constant">&quot; in '&quot;</span>+to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span>+<span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
+<span id="L302" class="LineNr"> 302 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L303" class="LineNr"> 303 </span>      compute_container_address_offsets<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> <span class="Constant">&quot; in '&quot;</span>+to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span>+<span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
+<span id="L304" class="LineNr"> 304 </span>  <span class="Delimiter">}</span>
+<span id="L305" class="LineNr"> 305 </span><span class="Delimiter">}</span>
+<span id="L306" class="LineNr"> 306 </span>
+<span id="L307" class="LineNr"> 307 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span>reagent&amp; r<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L308" class="LineNr"> 308 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>r<span class="Delimiter">)</span> || is_dummy<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L309" class="LineNr"> 309 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L310" class="LineNr"> 310 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">))</span>
+<span id="L311" class="LineNr"> 311 </span>    r<span class="Delimiter">.</span>metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L312" class="LineNr"> 312 </span><span class="Delimiter">}</span>
+<span id="L313" class="LineNr"> 313 </span>
+<span id="L314" class="LineNr"> 314 </span><span class="Comment">// the recursive structure of this function needs to exactly match</span>
+<span id="L315" class="LineNr"> 315 </span><span class="Comment">// compute_container_sizes</span>
+<span id="L316" class="LineNr"> 316 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L317" class="LineNr"> 317 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L318" class="LineNr"> 318 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L319" class="LineNr"> 319 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L320" class="LineNr"> 320 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; location_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L321" class="LineNr"> 321 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L322" class="LineNr"> 322 </span>    <span class="Delimiter">}</span>
+<span id="L323" class="LineNr"> 323 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;address&quot;</span><span class="Delimiter">)</span>
+<span id="L324" class="LineNr"> 324 </span>      compute_container_address_offsets<span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">(</span>type<span class="Delimiter">),</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L325" class="LineNr"> 325 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;array&quot;</span><span class="Delimiter">)</span>
+<span id="L326" class="LineNr"> 326 </span>      compute_container_address_offsets<span class="Delimiter">(</span><a href='032array.cc.html#L370'>array_element</a><span class="Delimiter">(</span>type<span class="Delimiter">),</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L327" class="LineNr"> 327 </span>    <span class="Comment">// End compute_container_address_offsets Non-atom Special-cases</span>
+<span id="L328" class="LineNr"> 328 </span>  <span class="Delimiter">}</span>
+<span id="L329" class="LineNr"> 329 </span>  <span class="Normal">const</span> type_tree* base_type = type<span class="Delimiter">;</span>
+<span id="L330" class="LineNr"> 330 </span>  <span class="Comment">// Update base_type in compute_container_address_offsets</span>
+<span id="L331" class="LineNr"> 331 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
+<span id="L332" class="LineNr"> 332 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L333" class="LineNr"> 333 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L334" class="LineNr"> 334 </span>    compute_container_address_offsets<span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L335" class="LineNr"> 335 </span>  <span class="Delimiter">}</span>
+<span id="L336" class="LineNr"> 336 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L337" class="LineNr"> 337 </span>    <a href='036refcount.cc.html#L348'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L338" class="LineNr"> 338 </span>  <span class="Delimiter">}</span>
+<span id="L339" class="LineNr"> 339 </span><span class="Delimiter">}</span>
+<span id="L340" class="LineNr"> 340 </span>
+<span id="L341" class="LineNr"> 341 </span><span class="Normal">void</span> compute_container_address_offsets<span class="Delimiter">(</span><span class="Normal">const</span> type_info&amp; container_info<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* full_type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L342" class="LineNr"> 342 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
+<span id="L343" class="LineNr"> 343 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L344" class="LineNr"> 344 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute <a href='043space.cc.html#L76'>address</a> offsets for container &quot;</span> &lt;&lt; container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L345" class="LineNr"> 345 </span>  <a href='036refcount.cc.html#L358'>append_addresses</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> full_type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">(),</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L346" class="LineNr"> 346 </span><span class="Delimiter">}</span>
+<span id="L347" class="LineNr"> 347 </span>
+<span id="L348" class="LineNr"> 348 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L348'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span><span class="Normal">const</span> type_info&amp; exclusive_container_info<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* full_type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L349" class="LineNr"> 349 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
+<span id="L350" class="LineNr"> 350 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compute <a href='043space.cc.html#L76'>address</a> offsets for exclusive container &quot;</span> &lt;&lt; exclusive_container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L351" class="LineNr"> 351 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>exclusive_container_info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L352" class="LineNr"> 352 </span>    set&lt;tag_condition_info&gt; key<span class="Delimiter">;</span>
+<span id="L353" class="LineNr"> 353 </span>    key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">tag is at offset</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
+<span id="L354" class="LineNr"> 354 </span>    <a href='036refcount.cc.html#L358'>append_addresses</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip tag offset</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>full_type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L355" class="LineNr"> 355 </span>  <span class="Delimiter">}</span>
+<span id="L356" class="LineNr"> 356 </span><span class="Delimiter">}</span>
+<span id="L357" class="LineNr"> 357 </span>
+<span id="L358" class="LineNr"> 358 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L358'>append_addresses</a><span class="Delimiter">(</span><span class="Normal">int</span> base_offset<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;&amp; out<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; key<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L359" class="LineNr"> 359 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L360" class="LineNr"> 360 </span>    <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> key<span class="Delimiter">).</span>insert<span class="Delimiter">(</span>address_element_info<span class="Delimiter">(</span>base_offset<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*payload_type<span class="Delimiter">(</span>type<span class="Delimiter">))));</span>
+<span id="L361" class="LineNr"> 361 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L362" class="LineNr"> 362 </span>  <span class="Delimiter">}</span>
+<span id="L363" class="LineNr"> 363 </span>  <span class="Normal">const</span> type_tree* base_type = type<span class="Delimiter">;</span>
+<span id="L364" class="LineNr"> 364 </span>  <span class="Comment">// Update base_type in append_container_address_offsets</span>
+<span id="L365" class="LineNr"> 365 </span>  <span class="Normal">const</span> type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L366" class="LineNr"> 366 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L367" class="LineNr"> 367 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> curr_index = <span class="Constant">0</span><span class="Delimiter">,</span> curr_offset = base_offset<span class="Delimiter">;</span>  curr_index &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++curr_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L368" class="LineNr"> 368 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking container &quot;</span> &lt;&lt; base_type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;, element &quot;</span> &lt;&lt; curr_index &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L369" class="LineNr"> 369 </span>      reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L430'>element_type</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> curr_index<span class="Delimiter">);</span>  <span class="Comment">// not base_type</span>
+<span id="L370" class="LineNr"> 370 </span>      <span class="Comment">// Compute Container Address Offset(element)</span>
+<span id="L371" class="LineNr"> 371 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L372" class="LineNr"> 372 </span>        <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address at offset &quot;</span> &lt;&lt; curr_offset &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L373" class="LineNr"> 373 </span>        <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> key<span class="Delimiter">).</span>insert<span class="Delimiter">(</span>address_element_info<span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*payload_type<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">))));</span>
+<span id="L374" class="LineNr"> 374 </span>        ++curr_offset<span class="Delimiter">;</span>
+<span id="L375" class="LineNr"> 375 </span>      <span class="Delimiter">}</span>
+<span id="L376" class="LineNr"> 376 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_array<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L377" class="LineNr"> 377 </span>        curr_offset += <span class="Comment">/*</span><span class="Comment">array length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L378" class="LineNr"> 378 </span>        <span class="Normal">const</span> type_tree* array_element_type = <a href='032array.cc.html#L370'>array_element</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L379" class="LineNr"> 379 </span>        <span class="Normal">int</span> array_element_size = size_of<span class="Delimiter">(</span>array_element_type<span class="Delimiter">);</span>
+<span id="L380" class="LineNr"> 380 </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 &lt; <a href='032array.cc.html#L117'>static_array_length</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L381" class="LineNr"> 381 </span>          <a href='036refcount.cc.html#L358'>append_addresses</a><span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> array_element_type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L382" class="LineNr"> 382 </span>          curr_offset += array_element_size<span class="Delimiter">;</span>
+<span id="L383" class="LineNr"> 383 </span>        <span class="Delimiter">}</span>
+<span id="L384" class="LineNr"> 384 </span>      <span class="Delimiter">}</span>
+<span id="L385" class="LineNr"> 385 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L386" class="LineNr"> 386 </span>        <a href='036refcount.cc.html#L358'>append_addresses</a><span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> element<span class="Delimiter">.</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L387" class="LineNr"> 387 </span>        curr_offset += size_of<span class="Delimiter">(</span>element<span class="Delimiter">);</span>
+<span id="L388" class="LineNr"> 388 </span>      <span class="Delimiter">}</span>
+<span id="L389" class="LineNr"> 389 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_exclusive_container<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L390" class="LineNr"> 390 </span>        <span class="Normal">const</span> type_tree* element_base_type = element<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
+<span id="L391" class="LineNr"> 391 </span>        <span class="Comment">// Update element_base_type For Exclusive Container in append_addresses</span>
+<span id="L392" class="LineNr"> 392 </span>        <span class="Normal">const</span> type_info&amp; element_info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> element_base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L393" class="LineNr"> 393 </span>        <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>element_info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L394" class="LineNr"> 394 </span>          set&lt;tag_condition_info&gt; new_key = key<span class="Delimiter">;</span>
+<span id="L395" class="LineNr"> 395 </span>          new_key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span>curr_offset<span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
+<span id="L396" class="LineNr"> 396 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>out<span class="Delimiter">,</span> new_key<span class="Delimiter">))</span>
+<span id="L397" class="LineNr"> 397 </span>            <a href='036refcount.cc.html#L358'>append_addresses</a><span class="Delimiter">(</span>curr_offset+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> new_key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L398" class="LineNr"> 398 </span>        <span class="Delimiter">}</span>
+<span id="L399" class="LineNr"> 399 </span>        curr_offset += size_of<span class="Delimiter">(</span>element<span class="Delimiter">);</span>
+<span id="L400" class="LineNr"> 400 </span>      <span class="Delimiter">}</span>
+<span id="L401" class="LineNr"> 401 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L402" class="LineNr"> 402 </span>        <span class="Comment">// non-address primitive</span>
+<span id="L403" class="LineNr"> 403 </span>        ++curr_offset<span class="Delimiter">;</span>
+<span id="L404" class="LineNr"> 404 </span>      <span class="Delimiter">}</span>
+<span id="L405" class="LineNr"> 405 </span>    <span class="Delimiter">}</span>
+<span id="L406" class="LineNr"> 406 </span>  <span class="Delimiter">}</span>
+<span id="L407" class="LineNr"> 407 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L408" class="LineNr"> 408 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> tag = <span class="Constant">0</span><span class="Delimiter">;</span>  tag &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L409" class="LineNr"> 409 </span>      set&lt;tag_condition_info&gt; new_key = key<span class="Delimiter">;</span>
+<span id="L410" class="LineNr"> 410 </span>      new_key<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>tag_condition_info<span class="Delimiter">(</span>base_offset<span class="Delimiter">,</span> tag<span class="Delimiter">));</span>
+<span id="L411" class="LineNr"> 411 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>out<span class="Delimiter">,</span> new_key<span class="Delimiter">))</span>
+<span id="L412" class="LineNr"> 412 </span>        <a href='036refcount.cc.html#L358'>append_addresses</a><span class="Delimiter">(</span>base_offset+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> variant_type<span class="Delimiter">(</span>type<span class="Delimiter">,</span> tag<span class="Delimiter">).</span>type<span class="Delimiter">,</span> out<span class="Delimiter">,</span> new_key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L413" class="LineNr"> 413 </span>    <span class="Delimiter">}</span>
+<span id="L414" class="LineNr"> 414 </span>  <span class="Delimiter">}</span>
+<span id="L415" class="LineNr"> 415 </span><span class="Delimiter">}</span>
+<span id="L416" class="LineNr"> 416 </span>
+<span id="L417" class="LineNr"> 417 </span><span class="Comment">//: for the following unit tests we'll do the work of the transform by hand</span>
+<span id="L418" class="LineNr"> 418 </span>
+<span id="L419" class="LineNr"> 419 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
+<span id="L420" class="LineNr"> 420 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L420'>test_container_address_offsets_empty</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L421" class="LineNr"> 421 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L422" class="LineNr"> 422 </span>  <span class="Comment">// define a container with no addresses</span>
+<span id="L423" class="LineNr"> 423 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:point&quot;</span><span class="Delimiter">);</span>
+<span id="L424" class="LineNr"> 424 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L425" class="LineNr"> 425 </span>  <span class="Comment">// scan</span>
+<span id="L426" class="LineNr"> 426 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L427" class="LineNr"> 427 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L428" class="LineNr"> 428 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L429" class="LineNr"> 429 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L430" class="LineNr"> 430 </span>  <span class="Comment">// the reagent we scanned knows it has no addresses</span>
+<span id="L431" class="LineNr"> 431 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L432" class="LineNr"> 432 </span>  <span class="Comment">// the global table contains an identical entry</span>
+<span id="L433" class="LineNr"> 433 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L434" class="LineNr"> 434 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L435" class="LineNr"> 435 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L436" class="LineNr"> 436 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L437" class="LineNr"> 437 </span><span class="Delimiter">}</span>
+<span id="L438" class="LineNr"> 438 </span>
+<span id="L439" class="LineNr"> 439 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L439'>test_container_address_offsets</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L440" class="LineNr"> 440 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L441" class="LineNr"> 441 </span>  <span class="Comment">// define a container with an address at offset 0 that we have the size for</span>
+<span id="L442" class="LineNr"> 442 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L443" class="LineNr"> 443 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L444" class="LineNr"> 444 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L445" class="LineNr"> 445 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L446" class="LineNr"> 446 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L447" class="LineNr"> 447 </span>  <span class="Comment">// scan</span>
+<span id="L448" class="LineNr"> 448 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L449" class="LineNr"> 449 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L450" class="LineNr"> 450 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L451" class="LineNr"> 451 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L452" class="LineNr"> 452 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 0</span>
+<span id="L453" class="LineNr"> 453 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L454" class="LineNr"> 454 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L455" class="LineNr"> 455 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>  <span class="Comment">// unconditional for containers</span>
+<span id="L456" class="LineNr"> 456 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L457" class="LineNr"> 457 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L458" class="LineNr"> 458 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L459" class="LineNr"> 459 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L460" class="LineNr"> 460 </span>  <span class="Comment">// the global table contains an identical entry</span>
+<span id="L461" class="LineNr"> 461 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L462" class="LineNr"> 462 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L463" class="LineNr"> 463 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L464" class="LineNr"> 464 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L465" class="LineNr"> 465 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L466" class="LineNr"> 466 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L467" class="LineNr"> 467 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L468" class="LineNr"> 468 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L469" class="LineNr"> 469 </span><span class="Delimiter">}</span>
+<span id="L470" class="LineNr"> 470 </span>
+<span id="L471" class="LineNr"> 471 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L471'>test_container_address_offsets_2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L472" class="LineNr"> 472 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L473" class="LineNr"> 473 </span>  <span class="Comment">// define a container with an address at offset 1 that we have the size for</span>
+<span id="L474" class="LineNr"> 474 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L475" class="LineNr"> 475 </span>      <span class="Constant">&quot;  x:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L476" class="LineNr"> 476 </span>      <span class="Constant">&quot;  y:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L477" class="LineNr"> 477 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L478" class="LineNr"> 478 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L479" class="LineNr"> 479 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L480" class="LineNr"> 480 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L481" class="LineNr"> 481 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L482" class="LineNr"> 482 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L483" class="LineNr"> 483 </span>  <span class="Comment">// scan</span>
+<span id="L484" class="LineNr"> 484 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L485" class="LineNr"> 485 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L486" class="LineNr"> 486 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L487" class="LineNr"> 487 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 1</span>
+<span id="L488" class="LineNr"> 488 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L489" class="LineNr"> 489 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L490" class="LineNr"> 490 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L491" class="LineNr"> 491 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L492" class="LineNr"> 492 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
+<span id="L493" class="LineNr"> 493 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L494" class="LineNr"> 494 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L495" class="LineNr"> 495 </span>  <span class="Comment">// the global table contains an identical entry</span>
+<span id="L496" class="LineNr"> 496 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L497" class="LineNr"> 497 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L498" class="LineNr"> 498 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L499" class="LineNr"> 499 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
+<span id="L500" class="LineNr"> 500 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L501" class="LineNr"> 501 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L502" class="LineNr"> 502 </span><span class="Delimiter">}</span>
+<span id="L503" class="LineNr"> 503 </span>
+<span id="L504" class="LineNr"> 504 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L504'>test_container_address_offsets_nested</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L505" class="LineNr"> 505 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L506" class="LineNr"> 506 </span>  <span class="Comment">// define a container with a nested container containing an address</span>
+<span id="L507" class="LineNr"> 507 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L508" class="LineNr"> 508 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L509" class="LineNr"> 509 </span>      <span class="Constant">&quot;  y:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L510" class="LineNr"> 510 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L511" class="LineNr"> 511 </span>      <span class="Constant">&quot;container bar [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L512" class="LineNr"> 512 </span>      <span class="Constant">&quot;  p:point</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L513" class="LineNr"> 513 </span>      <span class="Constant">&quot;  f:foo</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>  <span class="Comment">// nested container containing address</span>
+<span id="L514" class="LineNr"> 514 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L515" class="LineNr"> 515 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:bar&quot;</span><span class="Delimiter">);</span>
+<span id="L516" class="LineNr"> 516 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L517" class="LineNr"> 517 </span>  <span class="Comment">// global metadata contains entries for bar and included types: point and foo</span>
+<span id="L518" class="LineNr"> 518 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L519" class="LineNr"> 519 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L520" class="LineNr"> 520 </span>  <span class="Comment">// scan</span>
+<span id="L521" class="LineNr"> 521 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L522" class="LineNr"> 522 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 2</span>
+<span id="L523" class="LineNr"> 523 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L524" class="LineNr"> 524 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L525" class="LineNr"> 525 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets = get<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L526" class="LineNr"> 526 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L527" class="LineNr"> 527 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
+<span id="L528" class="LineNr"> 528 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L529" class="LineNr"> 529 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L530" class="LineNr"> 530 </span>  <span class="Comment">// the global table also knows its address offset</span>
+<span id="L531" class="LineNr"> 531 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L532" class="LineNr"> 532 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L533" class="LineNr"> 533 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L534" class="LineNr"> 534 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>  <span class="Comment">//</span>
+<span id="L535" class="LineNr"> 535 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L536" class="LineNr"> 536 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L537" class="LineNr"> 537 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L538" class="LineNr"> 538 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L539" class="LineNr"> 539 </span><span class="Delimiter">}</span>
+<span id="L540" class="LineNr"> 540 </span>
+<span id="L541" class="LineNr"> 541 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L541'>test_container_address_offsets_from_address</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L542" class="LineNr"> 542 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L543" class="LineNr"> 543 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L544" class="LineNr"> 544 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L545" class="LineNr"> 545 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L546" class="LineNr"> 546 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L547" class="LineNr"> 547 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L548" class="LineNr"> 548 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L549" class="LineNr"> 549 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L550" class="LineNr"> 550 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L551" class="LineNr"> 551 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L552" class="LineNr"> 552 </span>  <span class="Comment">// scan an address to the container</span>
+<span id="L553" class="LineNr"> 553 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L554" class="LineNr"> 554 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L555" class="LineNr"> 555 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L556" class="LineNr"> 556 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L557" class="LineNr"> 557 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L558" class="LineNr"> 558 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L559" class="LineNr"> 559 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L560" class="LineNr"> 560 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L561" class="LineNr"> 561 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L562" class="LineNr"> 562 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L563" class="LineNr"> 563 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L564" class="LineNr"> 564 </span><span class="Delimiter">}</span>
+<span id="L565" class="LineNr"> 565 </span>
+<span id="L566" class="LineNr"> 566 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L566'>test_container_address_offsets_from_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L567" class="LineNr"> 567 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L568" class="LineNr"> 568 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L569" class="LineNr"> 569 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L570" class="LineNr"> 570 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L571" class="LineNr"> 571 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L572" class="LineNr"> 572 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:array:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L573" class="LineNr"> 573 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L574" class="LineNr"> 574 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L575" class="LineNr"> 575 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L576" class="LineNr"> 576 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L577" class="LineNr"> 577 </span>  <span class="Comment">// scan an array of the container</span>
+<span id="L578" class="LineNr"> 578 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L579" class="LineNr"> 579 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L580" class="LineNr"> 580 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L581" class="LineNr"> 581 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L582" class="LineNr"> 582 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L583" class="LineNr"> 583 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L584" class="LineNr"> 584 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L585" class="LineNr"> 585 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L586" class="LineNr"> 586 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L587" class="LineNr"> 587 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L588" class="LineNr"> 588 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L589" class="LineNr"> 589 </span><span class="Delimiter">}</span>
+<span id="L590" class="LineNr"> 590 </span>
+<span id="L591" class="LineNr"> 591 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L591'>test_container_address_offsets_from_address_to_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L592" class="LineNr"> 592 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L593" class="LineNr"> 593 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L594" class="LineNr"> 594 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L595" class="LineNr"> 595 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L596" class="LineNr"> 596 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L597" class="LineNr"> 597 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:array:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L598" class="LineNr"> 598 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L599" class="LineNr"> 599 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L600" class="LineNr"> 600 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L601" class="LineNr"> 601 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L602" class="LineNr"> 602 </span>  <span class="Comment">// scan an address to an array of the container</span>
+<span id="L603" class="LineNr"> 603 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L604" class="LineNr"> 604 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L605" class="LineNr"> 605 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L606" class="LineNr"> 606 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L607" class="LineNr"> 607 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L608" class="LineNr"> 608 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L609" class="LineNr"> 609 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L610" class="LineNr"> 610 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L611" class="LineNr"> 611 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L612" class="LineNr"> 612 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L613" class="LineNr"> 613 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L614" class="LineNr"> 614 </span><span class="Delimiter">}</span>
+<span id="L615" class="LineNr"> 615 </span>
+<span id="L616" class="LineNr"> 616 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L616'>test_container_address_offsets_from_static_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L617" class="LineNr"> 617 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L618" class="LineNr"> 618 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L619" class="LineNr"> 619 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L620" class="LineNr"> 620 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L621" class="LineNr"> 621 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L622" class="LineNr"> 622 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:array:foo:10&quot;</span><span class="Delimiter">);</span>
+<span id="L623" class="LineNr"> 623 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L624" class="LineNr"> 624 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L625" class="LineNr"> 625 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L626" class="LineNr"> 626 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L627" class="LineNr"> 627 </span>  <span class="Comment">// scan a static array of the container</span>
+<span id="L628" class="LineNr"> 628 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L629" class="LineNr"> 629 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L630" class="LineNr"> 630 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L631" class="LineNr"> 631 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L632" class="LineNr"> 632 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L633" class="LineNr"> 633 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L634" class="LineNr"> 634 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L635" class="LineNr"> 635 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L636" class="LineNr"> 636 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L637" class="LineNr"> 637 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L638" class="LineNr"> 638 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L639" class="LineNr"> 639 </span><span class="Delimiter">}</span>
+<span id="L640" class="LineNr"> 640 </span>
+<span id="L641" class="LineNr"> 641 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L641'>test_container_address_offsets_from_address_to_static_array</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L642" class="LineNr"> 642 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L643" class="LineNr"> 643 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L644" class="LineNr"> 644 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L645" class="LineNr"> 645 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L646" class="LineNr"> 646 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L647" class="LineNr"> 647 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:array:foo:10&quot;</span><span class="Delimiter">);</span>
+<span id="L648" class="LineNr"> 648 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L649" class="LineNr"> 649 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L650" class="LineNr"> 650 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L651" class="LineNr"> 651 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L652" class="LineNr"> 652 </span>  <span class="Comment">// scan an address to a static array of the container</span>
+<span id="L653" class="LineNr"> 653 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L654" class="LineNr"> 654 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L655" class="LineNr"> 655 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L656" class="LineNr"> 656 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L657" class="LineNr"> 657 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L658" class="LineNr"> 658 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L659" class="LineNr"> 659 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L660" class="LineNr"> 660 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L661" class="LineNr"> 661 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L662" class="LineNr"> 662 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L663" class="LineNr"> 663 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L664" class="LineNr"> 664 </span><span class="Delimiter">}</span>
+<span id="L665" class="LineNr"> 665 </span>
+<span id="L666" class="LineNr"> 666 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L666'>test_container_address_offsets_from_repeated_address_and_array_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L667" class="LineNr"> 667 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
+<span id="L668" class="LineNr"> 668 </span>  <span class="Comment">// define a container with an address at offset 0</span>
+<span id="L669" class="LineNr"> 669 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L670" class="LineNr"> 670 </span>      <span class="Constant">&quot;  x:<a href='043space.cc.html#L76'>address</a>:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L671" class="LineNr"> 671 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L672" class="LineNr"> 672 </span>  <span class="Comment">// scan a deep nest of 'address' and 'array' types modifying a container</span>
+<span id="L673" class="LineNr"> 673 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L76'>address</a>:array:<a href='043space.cc.html#L76'>address</a>:<a href='043space.cc.html#L76'>address</a>:array:foo:10&quot;</span><span class="Delimiter">);</span>
+<span id="L674" class="LineNr"> 674 </span>  compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>  <span class="Comment">// need to first pre-populate the metadata</span>
+<span id="L675" class="LineNr"> 675 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
+<span id="L676" class="LineNr"> 676 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
+<span id="L677" class="LineNr"> 677 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L678" class="LineNr"> 678 </span>  compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L679" class="LineNr"> 679 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
+<span id="L680" class="LineNr"> 680 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">)</span>-old_size<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L681" class="LineNr"> 681 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
+<span id="L682" class="LineNr"> 682 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L683" class="LineNr"> 683 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
+<span id="L684" class="LineNr"> 684 </span>  <span class="Normal">const</span> set&lt;address_element_info&gt;&amp; address_offsets2 = get<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> container<span class="Delimiter">.</span>type<span class="Delimiter">).</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
+<span id="L685" class="LineNr"> 685 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L686" class="LineNr"> 686 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span>offset<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L687" class="LineNr"> 687 </span>  <a href='002test.cc.html#L25'>CHECK</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L688" class="LineNr"> 688 </span>  <a href='002test.cc.html#L32'>CHECK_EQ</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">.</span>begin<span class="Delimiter">()-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;number&quot;</span><span class="Delimiter">);</span>
+<span id="L689" class="LineNr"> 689 </span><span class="Delimiter">}</span>
+<span id="L690" class="LineNr"> 690 </span>
+<span id="L691" class="LineNr"> 691 </span><span class="Comment">//: use metadata.address to update refcounts within containers, arrays and</span>
+<span id="L692" class="LineNr"> 692 </span><span class="Comment">//: exclusive containers</span>
+<span id="L693" class="LineNr"> 693 </span>
+<span id="L694" class="LineNr"> 694 </span><span class="Delimiter">:(before &quot;End Increment Refcounts(canonized_x)&quot;)</span>
+<span id="L695" class="LineNr"> 695 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> || is_mu_exclusive_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L696" class="LineNr"> 696 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L697" class="LineNr"> 697 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><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="L698" class="LineNr"> 698 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L699" class="LineNr"> 699 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span>
+<span id="L700" class="LineNr"> 700 </span>      <a href='036refcount.cc.html#L43'>increment_refcount</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">));</span>
+<span id="L701" class="LineNr"> 701 </span>  <span class="Delimiter">}</span>
+<span id="L702" class="LineNr"> 702 </span><span class="Delimiter">}</span>
+<span id="L703" class="LineNr"> 703 </span>
+<span id="L704" class="LineNr"> 704 </span><span class="Delimiter">:(before &quot;End Decrement Refcounts(canonized_x)&quot;)</span>
+<span id="L705" class="LineNr"> 705 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> || is_mu_exclusive_container<span class="Delimiter">(</span>canonized_x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L706" class="LineNr"> 706 </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">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;need to read old value of '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' to figure out what refcounts to decrement&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L707" class="LineNr"> 707 </span>  <span class="Comment">// read from canonized_x but without canonizing again</span>
+<span id="L708" class="LineNr"> 708 </span>  <span class="Comment">// todo: inline without running canonize all over again</span>
+<span id="L709" class="LineNr"> 709 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> tmp = canonized_x<span class="Delimiter">;</span>
+<span id="L710" class="LineNr"> 710 </span>  tmp<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
+<span id="L711" class="LineNr"> 711 </span>  vector&lt;<span class="Normal">double</span>&gt; data = read_memory<span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
+<span id="L712" class="LineNr"> 712 </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">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done reading old value of '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>canonized_x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L713" class="LineNr"> 713 </span>  <span class="Normal">const</span> container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L714" class="LineNr"> 714 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt;::const_iterator p = metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span><a href='043space.cc.html#L76'>address</a><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="L715" class="LineNr"> 715 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!all_match<span class="Delimiter">(</span>data<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L716" class="LineNr"> 716 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;address_element_info&gt;::const_iterator info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  info != p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L717" class="LineNr"> 717 </span>      <span class="Normal">int</span> element_address = <a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> canonized_x<span class="Delimiter">.</span>value + info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">);</span>
+<span id="L718" class="LineNr"> 718 </span>      reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">;</span>
+<span id="L719" class="LineNr"> 719 </span>      element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>element_address+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L720" class="LineNr"> 720 </span>      element<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">);</span>
+<span id="L721" class="LineNr"> 721 </span>      <a href='036refcount.cc.html#L60'>decrement_refcount</a><span class="Delimiter">(</span>element_address<span class="Delimiter">,</span> info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">,</span> size_of<span class="Delimiter">(</span>element<span class="Delimiter">)</span>+<span class="Comment">/*</span><span class="Comment">refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L722" class="LineNr"> 722 </span>    <span class="Delimiter">}</span>
+<span id="L723" class="LineNr"> 723 </span>  <span class="Delimiter">}</span>
+<span id="L724" class="LineNr"> 724 </span><span class="Delimiter">}</span>
+<span id="L725" class="LineNr"> 725 </span>
+<span id="L726" class="LineNr"> 726 </span><span class="Delimiter">:(code)</span>
+<span id="L727" class="LineNr"> 727 </span><span class="Normal">bool</span> <a href='036refcount.cc.html#L727'>all_match</a><span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;<span class="Normal">double</span>&gt;&amp; data<span class="Delimiter">,</span> <span class="Normal">const</span> set&lt;tag_condition_info&gt;&amp; conditions<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L728" class="LineNr"> 728 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;tag_condition_info&gt;::const_iterator p = conditions<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != conditions<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="L729" class="LineNr"> 729 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> != p<span class="Delimiter">-&gt;</span>tag<span class="Delimiter">)</span>
+<span id="L730" class="LineNr"> 730 </span>      <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L731" class="LineNr"> 731 </span>  <span class="Delimiter">}</span>
+<span id="L732" class="LineNr"> 732 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L733" class="LineNr"> 733 </span><span class="Delimiter">}</span>
+<span id="L734" class="LineNr"> 734 </span>
+<span id="L735" class="LineNr"> 735 </span><span class="Delimiter">:(scenario refcounts_put_container)</span>
+<span id="L736" class="LineNr"> 736 </span><span class="muData">container</span> foo [
+<span id="L737" class="LineNr"> 737 </span>  <span class="Normal">a</span>:bar  <span class="Comment"># contains an address</span>
+<span id="L738" class="LineNr"> 738 </span>]
+<span id="L739" class="LineNr"> 739 </span><span class="muData">container</span> bar [
+<span id="L740" class="LineNr"> 740 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
 <span id="L741" class="LineNr"> 741 </span>]
-<span id="L742" class="LineNr"> 742 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L743" class="LineNr"> 743 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L744" class="LineNr"> 744 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L745" class="LineNr"> 745 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L746" class="LineNr"> 746 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L218'>put</a> {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {a: &quot;offset&quot;}, {2: &quot;bar&quot;}</span>
-<span id="L747" class="LineNr"> 747 </span><span class="Comment"># put increments refcount inside container</span>
-<span id="L748" class="LineNr"> 748 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L749" class="LineNr"> 749 </span>
-<span id="L750" class="LineNr"> 750 </span><span class="Delimiter">:(scenario refcounts_put_index_array)</span>
-<span id="L751" class="LineNr"> 751 </span><span class="muData">container</span> bar [
-<span id="L752" class="LineNr"> 752 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L753" class="LineNr"> 753 </span>]
-<span id="L754" class="LineNr"> 754 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L755" class="LineNr"> 755 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L756" class="LineNr"> 756 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L757" class="LineNr"> 757 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:bar<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">bar:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
-<span id="L758" class="LineNr"> 758 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:bar<span class="Special"> &lt;- </span>put-index *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:bar<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L742" class="LineNr"> 742 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L743" class="LineNr"> 743 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L744" class="LineNr"> 744 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L745" class="LineNr"> 745 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L746" class="LineNr"> 746 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L218'>put</a> *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Delimiter">,</span> <span class="Constant">a:offset</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L747" class="LineNr"> 747 </span>]
+<span id="L748" class="LineNr"> 748 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L749" class="LineNr"> 749 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L750" class="LineNr"> 750 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L751" class="LineNr"> 751 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L752" class="LineNr"> 752 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L218'>put</a> {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {a: &quot;offset&quot;}, {2: &quot;bar&quot;}</span>
+<span id="L753" class="LineNr"> 753 </span><span class="Comment"># put increments refcount inside container</span>
+<span id="L754" class="LineNr"> 754 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L755" class="LineNr"> 755 </span>
+<span id="L756" class="LineNr"> 756 </span><span class="Delimiter">:(scenario refcounts_put_index_array)</span>
+<span id="L757" class="LineNr"> 757 </span><span class="muData">container</span> bar [
+<span id="L758" class="LineNr"> 758 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
 <span id="L759" class="LineNr"> 759 </span>]
-<span id="L760" class="LineNr"> 760 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L761" class="LineNr"> 761 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L762" class="LineNr"> 762 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L763" class="LineNr"> 763 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L764" class="LineNr"> 764 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;array&quot; &quot;bar&quot;), &quot;lookup&quot;: ()} &lt;- put-index {3: (&quot;address&quot; &quot;array&quot; &quot;bar&quot;), &quot;lookup&quot;: ()}, {0: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
-<span id="L765" class="LineNr"> 765 </span><span class="Comment"># put-index increments refcount inside container</span>
-<span id="L766" class="LineNr"> 766 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L767" class="LineNr"> 767 </span>
-<span id="L768" class="LineNr"> 768 </span><span class="Delimiter">:(scenario refcounts_maybe_convert_container)</span>
-<span id="L769" class="LineNr"> 769 </span><span class="muData">exclusive-container</span> foo [
-<span id="L770" class="LineNr"> 770 </span>  <span class="Normal">a</span>:num
-<span id="L771" class="LineNr"> 771 </span>  <span class="Normal">b</span>:bar  <span class="Comment"># contains an address</span>
-<span id="L772" class="LineNr"> 772 </span>]
-<span id="L773" class="LineNr"> 773 </span><span class="muData">container</span> bar [
-<span id="L774" class="LineNr"> 774 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L775" class="LineNr"> 775 </span>]
-<span id="L776" class="LineNr"> 776 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L777" class="LineNr"> 777 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L778" class="LineNr"> 778 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L779" class="LineNr"> 779 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L780" class="LineNr"> 780 </span>  <span class="Constant">5</span>:bar<span class="Delimiter">,</span> <span class="Constant">6</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">3</span>:foo<span class="Delimiter">,</span> <span class="Constant">1:variant/b</span>
+<span id="L760" class="LineNr"> 760 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L761" class="LineNr"> 761 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L762" class="LineNr"> 762 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L763" class="LineNr"> 763 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:bar<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">bar:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
+<span id="L764" class="LineNr"> 764 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:bar<span class="Special"> &lt;- </span>put-index *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:bar<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L765" class="LineNr"> 765 </span>]
+<span id="L766" class="LineNr"> 766 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L767" class="LineNr"> 767 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L768" class="LineNr"> 768 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L769" class="LineNr"> 769 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L770" class="LineNr"> 770 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;array&quot; &quot;bar&quot;), &quot;lookup&quot;: ()} &lt;- put-index {3: (&quot;address&quot; &quot;array&quot; &quot;bar&quot;), &quot;lookup&quot;: ()}, {0: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
+<span id="L771" class="LineNr"> 771 </span><span class="Comment"># put-index increments refcount inside container</span>
+<span id="L772" class="LineNr"> 772 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L773" class="LineNr"> 773 </span>
+<span id="L774" class="LineNr"> 774 </span><span class="Delimiter">:(scenario refcounts_maybe_convert_container)</span>
+<span id="L775" class="LineNr"> 775 </span><span class="muData">exclusive-container</span> foo [
+<span id="L776" class="LineNr"> 776 </span>  <span class="Normal">a</span>:num
+<span id="L777" class="LineNr"> 777 </span>  <span class="Normal">b</span>:bar  <span class="Comment"># contains an address</span>
+<span id="L778" class="LineNr"> 778 </span>]
+<span id="L779" class="LineNr"> 779 </span><span class="muData">container</span> bar [
+<span id="L780" class="LineNr"> 780 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
 <span id="L781" class="LineNr"> 781 </span>]
-<span id="L782" class="LineNr"> 782 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L783" class="LineNr"> 783 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L784" class="LineNr"> 784 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L785" class="LineNr"> 785 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L786" class="LineNr"> 786 </span><span class="traceContains">+run: {3: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {2: &quot;bar&quot;}</span>
-<span id="L787" class="LineNr"> 787 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L788" class="LineNr"> 788 </span><span class="traceContains">+run: {5: &quot;bar&quot;}, {6: &quot;boolean&quot;} &lt;- maybe-convert {3: &quot;foo&quot;}, {1: &quot;variant&quot;, &quot;b&quot;: ()}</span>
-<span id="L789" class="LineNr"> 789 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
-<span id="L790" class="LineNr"> 790 </span>
-<span id="L791" class="LineNr"> 791 </span><span class="Delimiter">:(scenario refcounts_copy_doubly_nested)</span>
-<span id="L792" class="LineNr"> 792 </span><span class="muData">container</span> foo [
-<span id="L793" class="LineNr"> 793 </span>  <span class="Normal">a</span>:bar  <span class="Comment"># no addresses</span>
-<span id="L794" class="LineNr"> 794 </span>  <span class="Normal">b</span>:curr  <span class="Comment"># contains addresses</span>
-<span id="L795" class="LineNr"> 795 </span>]
-<span id="L796" class="LineNr"> 796 </span><span class="muData">container</span> bar [
-<span id="L797" class="LineNr"> 797 </span>  <span class="Normal">x</span>:num
-<span id="L798" class="LineNr"> 798 </span>  <span class="Normal">y</span>:num
-<span id="L799" class="LineNr"> 799 </span>]
-<span id="L800" class="LineNr"> 800 </span><span class="muData">container</span> curr [
-<span id="L801" class="LineNr"> 801 </span>  <span class="Normal">x</span>:num
-<span id="L802" class="LineNr"> 802 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L76'>address</a>:num  <span class="Comment"># address inside container inside container</span>
-<span id="L803" class="LineNr"> 803 </span>]
-<span id="L804" class="LineNr"> 804 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L805" class="LineNr"> 805 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L806" class="LineNr"> 806 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:curr<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">curr:type</span>
-<span id="L807" class="LineNr"> 807 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:curr<span class="Special"> &lt;- </span><a href='001help.cc.html#L218'>put</a> *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:curr<span class="Delimiter">,</span> <span class="Constant">1:offset/y</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L808" class="LineNr"> 808 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L809" class="LineNr"> 809 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L218'>put</a> *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Delimiter">,</span> <span class="Constant">1:offset/b</span><span class="Delimiter">,</span> *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:curr
-<span id="L810" class="LineNr"> 810 </span>  <span class="Constant">4</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo
-<span id="L811" class="LineNr"> 811 </span>]
-<span id="L812" class="LineNr"> 812 </span><span class="traceContains">+transform: compute <a href='043space.cc.html#L76'>address</a> offsets for container foo</span>
-<span id="L813" class="LineNr"> 813 </span><span class="traceContains">+transform: checking container foo, element 1</span>
-<span id="L814" class="LineNr"> 814 </span><span class="traceContains">+transform: <a href='043space.cc.html#L76'>address</a> at offset 3</span>
-<span id="L815" class="LineNr"> 815 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L816" class="LineNr"> 816 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L817" class="LineNr"> 817 </span><span class="Comment"># storing an address in a container updates its refcount</span>
-<span id="L818" class="LineNr"> 818 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L218'>put</a> {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()}, {1: &quot;offset&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L819" class="LineNr"> 819 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L820" class="LineNr"> 820 </span><span class="Comment"># storing a container in a container updates refcounts of any contained addresses</span>
-<span id="L821" class="LineNr"> 821 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L218'>put</a> {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {1: &quot;offset&quot;, &quot;b&quot;: ()}, {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()}</span>
-<span id="L822" class="LineNr"> 822 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L823" class="LineNr"> 823 </span><span class="Comment"># copying a container containing a container containing an address updates refcount</span>
-<span id="L824" class="LineNr"> 824 </span><span class="traceContains">+run: {4: &quot;foo&quot;} &lt;- copy {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}</span>
-<span id="L825" class="LineNr"> 825 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
-<span id="L826" class="LineNr"> 826 </span>
-<span id="L827" class="LineNr"> 827 </span><span class="Delimiter">:(scenario refcounts_copy_exclusive_container_within_container)</span>
-<span id="L828" class="LineNr"> 828 </span><span class="muData">container</span> foo [
-<span id="L829" class="LineNr"> 829 </span>  <span class="Normal">a</span>:num
-<span id="L830" class="LineNr"> 830 </span>  <span class="Normal">b</span>:bar
-<span id="L831" class="LineNr"> 831 </span>]
-<span id="L832" class="LineNr"> 832 </span><span class="muData">exclusive-container</span> bar [
-<span id="L833" class="LineNr"> 833 </span>  <span class="Normal">x</span>:num
-<span id="L834" class="LineNr"> 834 </span>  <span class="Normal">y</span>:num
-<span id="L835" class="LineNr"> 835 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L836" class="LineNr"> 836 </span>]
-<span id="L837" class="LineNr"> 837 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L838" class="LineNr"> 838 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L839" class="LineNr"> 839 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L840" class="LineNr"> 840 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L841" class="LineNr"> 841 </span>  <span class="Constant">5</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">35</span>
-<span id="L842" class="LineNr"> 842 </span>  <span class="Constant">6</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">13</span><span class="Delimiter">,</span> <span class="Constant">5</span>:bar
-<span id="L843" class="LineNr"> 843 </span>  <span class="Constant">8</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/z<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L844" class="LineNr"> 844 </span>  <span class="Constant">9</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">8</span>:bar
-<span id="L845" class="LineNr"> 845 </span>  <span class="Constant">11</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">9</span>:foo
-<span id="L846" class="LineNr"> 846 </span>]
-<span id="L847" class="LineNr"> 847 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L848" class="LineNr"> 848 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L849" class="LineNr"> 849 </span><span class="Comment"># no change while merging items of other types</span>
-<span id="L850" class="LineNr"> 850 </span><span class="traceContains">+run: {8: &quot;bar&quot;} &lt;- merge {2: &quot;literal&quot;, &quot;z&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L851" class="LineNr"> 851 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L852" class="LineNr"> 852 </span><span class="traceContains">+run: {9: &quot;foo&quot;} &lt;- merge {14: &quot;literal&quot;}, {8: &quot;bar&quot;}</span>
-<span id="L853" class="LineNr"> 853 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L854" class="LineNr"> 854 </span><span class="traceContains">+run: {11: &quot;foo&quot;} &lt;- copy {9: &quot;foo&quot;}</span>
-<span id="L855" class="LineNr"> 855 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
-<span id="L856" class="LineNr"> 856 </span>
-<span id="L857" class="LineNr"> 857 </span><span class="Delimiter">:(scenario refcounts_copy_container_within_exclusive_container)</span>
-<span id="L858" class="LineNr"> 858 </span><span class="muData">exclusive-container</span> foo [
-<span id="L859" class="LineNr"> 859 </span>  <span class="Normal">a</span>:num
-<span id="L860" class="LineNr"> 860 </span>  <span class="Normal">b</span>:bar
-<span id="L861" class="LineNr"> 861 </span>]
-<span id="L862" class="LineNr"> 862 </span><span class="muData">container</span> bar [
-<span id="L863" class="LineNr"> 863 </span>  <span class="Normal">x</span>:num
-<span id="L864" class="LineNr"> 864 </span>  <span class="Normal">y</span>:num
-<span id="L865" class="LineNr"> 865 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L866" class="LineNr"> 866 </span>]
-<span id="L867" class="LineNr"> 867 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L868" class="LineNr"> 868 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L869" class="LineNr"> 869 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L870" class="LineNr"> 870 </span>  <span class="Constant">6</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">35</span>
-<span id="L871" class="LineNr"> 871 </span>  <span class="Constant">10</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/x<span class="Delimiter">,</span> <span class="Constant">15</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L872" class="LineNr"> 872 </span>  <span class="Constant">13</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">10</span>:bar
-<span id="L873" class="LineNr"> 873 </span>  <span class="Constant">17</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">13</span>:foo
-<span id="L874" class="LineNr"> 874 </span>]
-<span id="L875" class="LineNr"> 875 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L876" class="LineNr"> 876 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L877" class="LineNr"> 877 </span><span class="Comment"># no change while merging items of other types</span>
-<span id="L878" class="LineNr"> 878 </span><span class="traceContains">+run: {10: &quot;bar&quot;} &lt;- merge {2: &quot;literal&quot;, &quot;x&quot;: ()}, {15: &quot;literal&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L879" class="LineNr"> 879 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L880" class="LineNr"> 880 </span><span class="traceContains">+run: {13: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {10: &quot;bar&quot;}</span>
-<span id="L881" class="LineNr"> 881 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L882" class="LineNr"> 882 </span><span class="traceContains">+run: {17: &quot;foo&quot;} &lt;- copy {13: &quot;foo&quot;}</span>
-<span id="L883" class="LineNr"> 883 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
-<span id="L884" class="LineNr"> 884 </span>
-<span id="L885" class="LineNr"> 885 </span><span class="Delimiter">:(scenario refcounts_copy_exclusive_container_within_exclusive_container)</span>
-<span id="L886" class="LineNr"> 886 </span><span class="muData">exclusive-container</span> foo [
-<span id="L887" class="LineNr"> 887 </span>  <span class="Normal">a</span>:num
-<span id="L888" class="LineNr"> 888 </span>  <span class="Normal">b</span>:bar
-<span id="L889" class="LineNr"> 889 </span>]
-<span id="L890" class="LineNr"> 890 </span><span class="muData">exclusive-container</span> bar [
-<span id="L891" class="LineNr"> 891 </span>  <span class="Normal">x</span>:num
-<span id="L892" class="LineNr"> 892 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L893" class="LineNr"> 893 </span>]
-<span id="L894" class="LineNr"> 894 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L895" class="LineNr"> 895 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L896" class="LineNr"> 896 </span>  <span class="Constant">10</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L897" class="LineNr"> 897 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:foo
-<span id="L898" class="LineNr"> 898 </span>]
-<span id="L899" class="LineNr"> 899 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L900" class="LineNr"> 900 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L901" class="LineNr"> 901 </span><span class="Comment"># no change while merging items of other types</span>
-<span id="L902" class="LineNr"> 902 </span><span class="traceContains">+run: {10: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {1: &quot;literal&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L903" class="LineNr"> 903 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L904" class="LineNr"> 904 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- copy {10: &quot;foo&quot;}</span>
-<span id="L905" class="LineNr"> 905 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L906" class="LineNr"> 906 </span>
-<span id="L907" class="LineNr"> 907 </span><span class="Delimiter">:(scenario refcounts_copy_array_within_container)</span>
-<span id="L908" class="LineNr"> 908 </span><span class="muData">container</span> foo [
-<span id="L909" class="LineNr"> 909 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:array:num
-<span id="L910" class="LineNr"> 910 </span>]
-<span id="L911" class="LineNr"> 911 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L912" class="LineNr"> 912 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
-<span id="L913" class="LineNr"> 913 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num
-<span id="L914" class="LineNr"> 914 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span>
-<span id="L915" class="LineNr"> 915 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:num
+<span id="L782" class="LineNr"> 782 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L783" class="LineNr"> 783 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L784" class="LineNr"> 784 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L785" class="LineNr"> 785 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L786" class="LineNr"> 786 </span>  <span class="Constant">5</span>:bar<span class="Delimiter">,</span> <span class="Constant">6</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">3</span>:foo<span class="Delimiter">,</span> <span class="Constant">1:variant/b</span>
+<span id="L787" class="LineNr"> 787 </span>]
+<span id="L788" class="LineNr"> 788 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L789" class="LineNr"> 789 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L790" class="LineNr"> 790 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L791" class="LineNr"> 791 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L792" class="LineNr"> 792 </span><span class="traceContains">+run: {3: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {2: &quot;bar&quot;}</span>
+<span id="L793" class="LineNr"> 793 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L794" class="LineNr"> 794 </span><span class="traceContains">+run: {5: &quot;bar&quot;}, {6: &quot;boolean&quot;} &lt;- maybe-convert {3: &quot;foo&quot;}, {1: &quot;variant&quot;, &quot;b&quot;: ()}</span>
+<span id="L795" class="LineNr"> 795 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
+<span id="L796" class="LineNr"> 796 </span>
+<span id="L797" class="LineNr"> 797 </span><span class="Delimiter">:(scenario refcounts_copy_doubly_nested)</span>
+<span id="L798" class="LineNr"> 798 </span><span class="muData">container</span> foo [
+<span id="L799" class="LineNr"> 799 </span>  <span class="Normal">a</span>:bar  <span class="Comment"># no addresses</span>
+<span id="L800" class="LineNr"> 800 </span>  <span class="Normal">b</span>:curr  <span class="Comment"># contains addresses</span>
+<span id="L801" class="LineNr"> 801 </span>]
+<span id="L802" class="LineNr"> 802 </span><span class="muData">container</span> bar [
+<span id="L803" class="LineNr"> 803 </span>  <span class="Normal">x</span>:num
+<span id="L804" class="LineNr"> 804 </span>  <span class="Normal">y</span>:num
+<span id="L805" class="LineNr"> 805 </span>]
+<span id="L806" class="LineNr"> 806 </span><span class="muData">container</span> curr [
+<span id="L807" class="LineNr"> 807 </span>  <span class="Normal">x</span>:num
+<span id="L808" class="LineNr"> 808 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L76'>address</a>:num  <span class="Comment"># address inside container inside container</span>
+<span id="L809" class="LineNr"> 809 </span>]
+<span id="L810" class="LineNr"> 810 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L811" class="LineNr"> 811 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L812" class="LineNr"> 812 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:curr<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">curr:type</span>
+<span id="L813" class="LineNr"> 813 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:curr<span class="Special"> &lt;- </span><a href='001help.cc.html#L218'>put</a> *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:curr<span class="Delimiter">,</span> <span class="Constant">1:offset/y</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L814" class="LineNr"> 814 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L815" class="LineNr"> 815 </span>  *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L218'>put</a> *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Delimiter">,</span> <span class="Constant">1:offset/b</span><span class="Delimiter">,</span> *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:curr
+<span id="L816" class="LineNr"> 816 </span>  <span class="Constant">4</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:foo
+<span id="L817" class="LineNr"> 817 </span>]
+<span id="L818" class="LineNr"> 818 </span><span class="traceContains">+transform: compute <a href='043space.cc.html#L76'>address</a> offsets for container foo</span>
+<span id="L819" class="LineNr"> 819 </span><span class="traceContains">+transform: checking container foo, element 1</span>
+<span id="L820" class="LineNr"> 820 </span><span class="traceContains">+transform: <a href='043space.cc.html#L76'>address</a> at offset 3</span>
+<span id="L821" class="LineNr"> 821 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L822" class="LineNr"> 822 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L823" class="LineNr"> 823 </span><span class="Comment"># storing an address in a container updates its refcount</span>
+<span id="L824" class="LineNr"> 824 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L218'>put</a> {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()}, {1: &quot;offset&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L825" class="LineNr"> 825 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L826" class="LineNr"> 826 </span><span class="Comment"># storing a container in a container updates refcounts of any contained addresses</span>
+<span id="L827" class="LineNr"> 827 </span><span class="traceContains">+run: {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L218'>put</a> {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {1: &quot;offset&quot;, &quot;b&quot;: ()}, {2: (&quot;address&quot; &quot;curr&quot;), &quot;lookup&quot;: ()}</span>
+<span id="L828" class="LineNr"> 828 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L829" class="LineNr"> 829 </span><span class="Comment"># copying a container containing a container containing an address updates refcount</span>
+<span id="L830" class="LineNr"> 830 </span><span class="traceContains">+run: {4: &quot;foo&quot;} &lt;- copy {3: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}</span>
+<span id="L831" class="LineNr"> 831 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
+<span id="L832" class="LineNr"> 832 </span>
+<span id="L833" class="LineNr"> 833 </span><span class="Delimiter">:(scenario refcounts_copy_exclusive_container_within_container)</span>
+<span id="L834" class="LineNr"> 834 </span><span class="muData">container</span> foo [
+<span id="L835" class="LineNr"> 835 </span>  <span class="Normal">a</span>:num
+<span id="L836" class="LineNr"> 836 </span>  <span class="Normal">b</span>:bar
+<span id="L837" class="LineNr"> 837 </span>]
+<span id="L838" class="LineNr"> 838 </span><span class="muData">exclusive-container</span> bar [
+<span id="L839" class="LineNr"> 839 </span>  <span class="Normal">x</span>:num
+<span id="L840" class="LineNr"> 840 </span>  <span class="Normal">y</span>:num
+<span id="L841" class="LineNr"> 841 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L842" class="LineNr"> 842 </span>]
+<span id="L843" class="LineNr"> 843 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L844" class="LineNr"> 844 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L845" class="LineNr"> 845 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L846" class="LineNr"> 846 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L847" class="LineNr"> 847 </span>  <span class="Constant">5</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">35</span>
+<span id="L848" class="LineNr"> 848 </span>  <span class="Constant">6</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">13</span><span class="Delimiter">,</span> <span class="Constant">5</span>:bar
+<span id="L849" class="LineNr"> 849 </span>  <span class="Constant">8</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/z<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L850" class="LineNr"> 850 </span>  <span class="Constant">9</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">8</span>:bar
+<span id="L851" class="LineNr"> 851 </span>  <span class="Constant">11</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">9</span>:foo
+<span id="L852" class="LineNr"> 852 </span>]
+<span id="L853" class="LineNr"> 853 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L854" class="LineNr"> 854 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L855" class="LineNr"> 855 </span><span class="Comment"># no change while merging items of other types</span>
+<span id="L856" class="LineNr"> 856 </span><span class="traceContains">+run: {8: &quot;bar&quot;} &lt;- merge {2: &quot;literal&quot;, &quot;z&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L857" class="LineNr"> 857 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L858" class="LineNr"> 858 </span><span class="traceContains">+run: {9: &quot;foo&quot;} &lt;- merge {14: &quot;literal&quot;}, {8: &quot;bar&quot;}</span>
+<span id="L859" class="LineNr"> 859 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L860" class="LineNr"> 860 </span><span class="traceContains">+run: {11: &quot;foo&quot;} &lt;- copy {9: &quot;foo&quot;}</span>
+<span id="L861" class="LineNr"> 861 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
+<span id="L862" class="LineNr"> 862 </span>
+<span id="L863" class="LineNr"> 863 </span><span class="Delimiter">:(scenario refcounts_copy_container_within_exclusive_container)</span>
+<span id="L864" class="LineNr"> 864 </span><span class="muData">exclusive-container</span> foo [
+<span id="L865" class="LineNr"> 865 </span>  <span class="Normal">a</span>:num
+<span id="L866" class="LineNr"> 866 </span>  <span class="Normal">b</span>:bar
+<span id="L867" class="LineNr"> 867 </span>]
+<span id="L868" class="LineNr"> 868 </span><span class="muData">container</span> bar [
+<span id="L869" class="LineNr"> 869 </span>  <span class="Normal">x</span>:num
+<span id="L870" class="LineNr"> 870 </span>  <span class="Normal">y</span>:num
+<span id="L871" class="LineNr"> 871 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L872" class="LineNr"> 872 </span>]
+<span id="L873" class="LineNr"> 873 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L874" class="LineNr"> 874 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L875" class="LineNr"> 875 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L876" class="LineNr"> 876 </span>  <span class="Constant">6</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">35</span>
+<span id="L877" class="LineNr"> 877 </span>  <span class="Constant">10</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">2</span>/x<span class="Delimiter">,</span> <span class="Constant">15</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L878" class="LineNr"> 878 </span>  <span class="Constant">13</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">10</span>:bar
+<span id="L879" class="LineNr"> 879 </span>  <span class="Constant">17</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">13</span>:foo
+<span id="L880" class="LineNr"> 880 </span>]
+<span id="L881" class="LineNr"> 881 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L882" class="LineNr"> 882 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L883" class="LineNr"> 883 </span><span class="Comment"># no change while merging items of other types</span>
+<span id="L884" class="LineNr"> 884 </span><span class="traceContains">+run: {10: &quot;bar&quot;} &lt;- merge {2: &quot;literal&quot;, &quot;x&quot;: ()}, {15: &quot;literal&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L885" class="LineNr"> 885 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L886" class="LineNr"> 886 </span><span class="traceContains">+run: {13: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {10: &quot;bar&quot;}</span>
+<span id="L887" class="LineNr"> 887 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L888" class="LineNr"> 888 </span><span class="traceContains">+run: {17: &quot;foo&quot;} &lt;- copy {13: &quot;foo&quot;}</span>
+<span id="L889" class="LineNr"> 889 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
+<span id="L890" class="LineNr"> 890 </span>
+<span id="L891" class="LineNr"> 891 </span><span class="Delimiter">:(scenario refcounts_copy_exclusive_container_within_exclusive_container)</span>
+<span id="L892" class="LineNr"> 892 </span><span class="muData">exclusive-container</span> foo [
+<span id="L893" class="LineNr"> 893 </span>  <span class="Normal">a</span>:num
+<span id="L894" class="LineNr"> 894 </span>  <span class="Normal">b</span>:bar
+<span id="L895" class="LineNr"> 895 </span>]
+<span id="L896" class="LineNr"> 896 </span><span class="muData">exclusive-container</span> bar [
+<span id="L897" class="LineNr"> 897 </span>  <span class="Normal">x</span>:num
+<span id="L898" class="LineNr"> 898 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L899" class="LineNr"> 899 </span>]
+<span id="L900" class="LineNr"> 900 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L901" class="LineNr"> 901 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L902" class="LineNr"> 902 </span>  <span class="Constant">10</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L903" class="LineNr"> 903 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:foo
+<span id="L904" class="LineNr"> 904 </span>]
+<span id="L905" class="LineNr"> 905 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L906" class="LineNr"> 906 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L907" class="LineNr"> 907 </span><span class="Comment"># no change while merging items of other types</span>
+<span id="L908" class="LineNr"> 908 </span><span class="traceContains">+run: {10: &quot;foo&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;b&quot;: ()}, {1: &quot;literal&quot;, &quot;y&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L909" class="LineNr"> 909 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L910" class="LineNr"> 910 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- copy {10: &quot;foo&quot;}</span>
+<span id="L911" class="LineNr"> 911 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L912" class="LineNr"> 912 </span>
+<span id="L913" class="LineNr"> 913 </span><span class="Delimiter">:(scenario refcounts_copy_array_within_container)</span>
+<span id="L914" class="LineNr"> 914 </span><span class="muData">container</span> foo [
+<span id="L915" class="LineNr"> 915 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:array:num
 <span id="L916" class="LineNr"> 916 </span>]
-<span id="L917" class="LineNr"> 917 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}, {3: &quot;literal&quot;}</span>
-<span id="L918" class="LineNr"> 918 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L919" class="LineNr"> 919 </span><span class="traceContains">+run: {2: &quot;foo&quot;} &lt;- merge {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)}</span>
-<span id="L920" class="LineNr"> 920 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L921" class="LineNr"> 921 </span><span class="traceContains">+run: {2: &quot;foo&quot;} &lt;- merge {3: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)}</span>
-<span id="L922" class="LineNr"> 922 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
-<span id="L923" class="LineNr"> 923 </span>
-<span id="L924" class="LineNr"> 924 </span><span class="Delimiter">:(scenario refcounts_copy_address_within_static_array_within_container)</span>
-<span id="L925" class="LineNr"> 925 </span><span class="muData">container</span> foo [
-<span id="L926" class="LineNr"> 926 </span>  <span class="Normal">a</span>:array:bar:<span class="Constant">3</span>
-<span id="L927" class="LineNr"> 927 </span>  <span class="Normal">b</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L928" class="LineNr"> 928 </span>]
-<span id="L929" class="LineNr"> 929 </span><span class="muData">container</span> bar [
-<span id="L930" class="LineNr"> 930 </span>  <span class="Normal">y</span>:num
-<span id="L931" class="LineNr"> 931 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L932" class="LineNr"> 932 </span>]
-<span id="L933" class="LineNr"> 933 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L934" class="LineNr"> 934 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L935" class="LineNr"> 935 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L936" class="LineNr"> 936 </span>  <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Special"> &lt;- </span>create-array
-<span id="L937" class="LineNr"> 937 </span>  put-index <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L938" class="LineNr"> 938 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L939" class="LineNr"> 939 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L940" class="LineNr"> 940 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L941" class="LineNr"> 941 </span>  put-index <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
-<span id="L942" class="LineNr"> 942 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L943" class="LineNr"> 943 </span>]
-<span id="L944" class="LineNr"> 944 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
-<span id="L945" class="LineNr"> 945 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
-<span id="L946" class="LineNr"> 946 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {34: &quot;literal&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L947" class="LineNr"> 947 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
-<span id="L948" class="LineNr"> 948 </span><span class="traceContains">+run: put-index {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
-<span id="L949" class="LineNr"> 949 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
-<span id="L950" class="LineNr"> 950 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- merge {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L951" class="LineNr"> 951 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
-<span id="L952" class="LineNr"> 952 </span><span class="traceContains">+mem: incrementing refcount of 1000: 4 -&gt; 5</span>
-<span id="L953" class="LineNr"> 953 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {0: &quot;literal&quot;}</span>
-<span id="L954" class="LineNr"> 954 </span><span class="traceContains">+mem: decrementing refcount of 1000: 5 -&gt; 4</span>
-<span id="L955" class="LineNr"> 955 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {34: &quot;literal&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L956" class="LineNr"> 956 </span><span class="traceContains">+mem: decrementing refcount of 1000: 4 -&gt; 3</span>
-<span id="L957" class="LineNr"> 957 </span><span class="traceContains">+run: put-index {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
-<span id="L958" class="LineNr"> 958 </span><span class="traceContains">+mem: decrementing refcount of 1000: 3 -&gt; 2</span>
-<span id="L959" class="LineNr"> 959 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- merge {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L960" class="LineNr"> 960 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
-<span id="L961" class="LineNr"> 961 </span><span class="traceContains">+mem: decrementing refcount of 1000: 1 -&gt; 0</span>
-<span id="L962" class="LineNr"> 962 </span>
-<span id="L963" class="LineNr"> 963 </span><span class="Delimiter">:(scenario refcounts_handle_exclusive_containers_with_different_tags)</span>
-<span id="L964" class="LineNr"> 964 </span><span class="muData">container</span> foo1 [
-<span id="L965" class="LineNr"> 965 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L966" class="LineNr"> 966 </span>  <span class="Normal">y</span>:num
-<span id="L967" class="LineNr"> 967 </span>]
-<span id="L968" class="LineNr"> 968 </span><span class="muData">container</span> foo2 [
-<span id="L969" class="LineNr"> 969 </span>  <span class="Normal">x</span>:num
-<span id="L970" class="LineNr"> 970 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L971" class="LineNr"> 971 </span>]
-<span id="L972" class="LineNr"> 972 </span><span class="muData">exclusive-container</span> bar [
-<span id="L973" class="LineNr"> 973 </span>  <span class="Normal">a</span>:foo1
-<span id="L974" class="LineNr"> 974 </span>  <span class="Normal">b</span>:foo2
-<span id="L975" class="LineNr"> 975 </span>]
-<span id="L976" class="LineNr"> 976 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L977" class="LineNr"> 977 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">12000</span>/unsafe  <span class="Comment"># pretend allocation</span>
-<span id="L978" class="LineNr"> 978 </span>  *<span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L979" class="LineNr"> 979 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/foo1<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Delimiter">,</span> <span class="Constant">97</span>
-<span id="L980" class="LineNr"> 980 </span>  <span class="Constant">5</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">13000</span>/unsafe  <span class="Comment"># pretend allocation</span>
-<span id="L981" class="LineNr"> 981 </span>  *<span class="Constant">5</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
-<span id="L982" class="LineNr"> 982 </span>  <span class="Constant">6</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/foo2<span class="Delimiter">,</span> <span class="Constant">98</span><span class="Delimiter">,</span> <span class="Constant">5</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L983" class="LineNr"> 983 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>copy <span class="Constant">6</span>:bar
-<span id="L984" class="LineNr"> 984 </span>]
-<span id="L985" class="LineNr"> 985 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {0: &quot;literal&quot;, &quot;foo1&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}, {97: &quot;literal&quot;}</span>
-<span id="L986" class="LineNr"> 986 </span><span class="traceContains">+mem: incrementing refcount of 12000: 1 -&gt; 2</span>
-<span id="L987" class="LineNr"> 987 </span><span class="traceContains">+run: {6: &quot;bar&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;foo2&quot;: ()}, {98: &quot;literal&quot;}, {5: (&quot;address&quot; &quot;number&quot;)}</span>
-<span id="L988" class="LineNr"> 988 </span><span class="traceContains">+mem: incrementing refcount of 13000: 1 -&gt; 2</span>
-<span id="L989" class="LineNr"> 989 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- copy {6: &quot;bar&quot;}</span>
-<span id="L990" class="LineNr"> 990 </span><span class="traceContains">+mem: incrementing refcount of 13000: 2 -&gt; 3</span>
-<span id="L991" class="LineNr"> 991 </span><span class="traceContains">+mem: decrementing refcount of 12000: 2 -&gt; 1</span>
-<span id="L992" class="LineNr"> 992 </span>
-<span id="L993" class="LineNr"> 993 </span><span class="Delimiter">:(code)</span>
-<span id="L994" class="LineNr"> 994 </span><span class="Normal">bool</span> is_mu_container<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L995" class="LineNr"> 995 </span>  <span class="Identifier">return</span> is_mu_container<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L996" class="LineNr"> 996 </span><span class="Delimiter">}</span>
-<span id="L997" class="LineNr"> 997 </span><span class="Normal">bool</span> is_mu_container<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L998" class="LineNr"> 998 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L999" class="LineNr"> 999 </span>  <span class="Comment">// End is_mu_container(type) Special-cases</span>
-<span id="L1000" class="LineNr">1000 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == <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="L1001" class="LineNr">1001 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L1002" class="LineNr">1002 </span>  <span class="Identifier">return</span> info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">;</span>
-<span id="L1003" class="LineNr">1003 </span><span class="Delimiter">}</span>
-<span id="L1004" class="LineNr">1004 </span>
-<span id="L1005" class="LineNr">1005 </span><span class="Normal">bool</span> is_mu_exclusive_container<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L1006" class="LineNr">1006 </span>  <span class="Identifier">return</span> is_mu_exclusive_container<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L1007" class="LineNr">1007 </span><span class="Delimiter">}</span>
-<span id="L1008" class="LineNr">1008 </span><span class="Normal">bool</span> is_mu_exclusive_container<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L1009" class="LineNr">1009 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L1010" class="LineNr">1010 </span>  <span class="Comment">// End is_mu_exclusive_container(type) Special-cases</span>
-<span id="L1011" class="LineNr">1011 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == <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="L1012" class="LineNr">1012 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L1013" class="LineNr">1013 </span>  <span class="Identifier">return</span> info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">;</span>
-<span id="L1014" class="LineNr">1014 </span><span class="Delimiter">}</span>
+<span id="L917" class="LineNr"> 917 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L918" class="LineNr"> 918 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">3</span>
+<span id="L919" class="LineNr"> 919 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num
+<span id="L920" class="LineNr"> 920 </span>  <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span>
+<span id="L921" class="LineNr"> 921 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>:<a href='043space.cc.html#L76'>address</a>:array:num
+<span id="L922" class="LineNr"> 922 </span>]
+<span id="L923" class="LineNr"> 923 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}, {3: &quot;literal&quot;}</span>
+<span id="L924" class="LineNr"> 924 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L925" class="LineNr"> 925 </span><span class="traceContains">+run: {2: &quot;foo&quot;} &lt;- merge {1: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)}</span>
+<span id="L926" class="LineNr"> 926 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L927" class="LineNr"> 927 </span><span class="traceContains">+run: {2: &quot;foo&quot;} &lt;- merge {3: (&quot;address&quot; &quot;array&quot; &quot;number&quot;)}</span>
+<span id="L928" class="LineNr"> 928 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
+<span id="L929" class="LineNr"> 929 </span>
+<span id="L930" class="LineNr"> 930 </span><span class="Delimiter">:(scenario refcounts_copy_address_within_static_array_within_container)</span>
+<span id="L931" class="LineNr"> 931 </span><span class="muData">container</span> foo [
+<span id="L932" class="LineNr"> 932 </span>  <span class="Normal">a</span>:array:bar:<span class="Constant">3</span>
+<span id="L933" class="LineNr"> 933 </span>  <span class="Normal">b</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L934" class="LineNr"> 934 </span>]
+<span id="L935" class="LineNr"> 935 </span><span class="muData">container</span> bar [
+<span id="L936" class="LineNr"> 936 </span>  <span class="Normal">y</span>:num
+<span id="L937" class="LineNr"> 937 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L938" class="LineNr"> 938 </span>]
+<span id="L939" class="LineNr"> 939 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L940" class="LineNr"> 940 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L941" class="LineNr"> 941 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L942" class="LineNr"> 942 </span>  <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Special"> &lt;- </span>create-array
+<span id="L943" class="LineNr"> 943 </span>  put-index <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L944" class="LineNr"> 944 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L945" class="LineNr"> 945 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L946" class="LineNr"> 946 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L947" class="LineNr"> 947 </span>  put-index <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
+<span id="L948" class="LineNr"> 948 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L949" class="LineNr"> 949 </span>]
+<span id="L950" class="LineNr"> 950 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
+<span id="L951" class="LineNr"> 951 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
+<span id="L952" class="LineNr"> 952 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {34: &quot;literal&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L953" class="LineNr"> 953 </span><span class="traceContains">+mem: incrementing refcount of 1000: 1 -&gt; 2</span>
+<span id="L954" class="LineNr"> 954 </span><span class="traceContains">+run: put-index {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
+<span id="L955" class="LineNr"> 955 </span><span class="traceContains">+mem: incrementing refcount of 1000: 2 -&gt; 3</span>
+<span id="L956" class="LineNr"> 956 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- merge {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L957" class="LineNr"> 957 </span><span class="traceContains">+mem: incrementing refcount of 1000: 3 -&gt; 4</span>
+<span id="L958" class="LineNr"> 958 </span><span class="traceContains">+mem: incrementing refcount of 1000: 4 -&gt; 5</span>
+<span id="L959" class="LineNr"> 959 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {0: &quot;literal&quot;}</span>
+<span id="L960" class="LineNr"> 960 </span><span class="traceContains">+mem: decrementing refcount of 1000: 5 -&gt; 4</span>
+<span id="L961" class="LineNr"> 961 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {34: &quot;literal&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L962" class="LineNr"> 962 </span><span class="traceContains">+mem: decrementing refcount of 1000: 4 -&gt; 3</span>
+<span id="L963" class="LineNr"> 963 </span><span class="traceContains">+run: put-index {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: &quot;literal&quot;}, {2: &quot;bar&quot;}</span>
+<span id="L964" class="LineNr"> 964 </span><span class="traceContains">+mem: decrementing refcount of 1000: 3 -&gt; 2</span>
+<span id="L965" class="LineNr"> 965 </span><span class="traceContains">+run: {20: &quot;foo&quot;} &lt;- merge {10: (&quot;array&quot; &quot;bar&quot; &quot;3&quot;)}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L966" class="LineNr"> 966 </span><span class="traceContains">+mem: decrementing refcount of 1000: 2 -&gt; 1</span>
+<span id="L967" class="LineNr"> 967 </span><span class="traceContains">+mem: decrementing refcount of 1000: 1 -&gt; 0</span>
+<span id="L968" class="LineNr"> 968 </span>
+<span id="L969" class="LineNr"> 969 </span><span class="Delimiter">:(scenario refcounts_handle_exclusive_containers_with_different_tags)</span>
+<span id="L970" class="LineNr"> 970 </span><span class="muData">container</span> foo1 [
+<span id="L971" class="LineNr"> 971 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L972" class="LineNr"> 972 </span>  <span class="Normal">y</span>:num
+<span id="L973" class="LineNr"> 973 </span>]
+<span id="L974" class="LineNr"> 974 </span><span class="muData">container</span> foo2 [
+<span id="L975" class="LineNr"> 975 </span>  <span class="Normal">x</span>:num
+<span id="L976" class="LineNr"> 976 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L977" class="LineNr"> 977 </span>]
+<span id="L978" class="LineNr"> 978 </span><span class="muData">exclusive-container</span> bar [
+<span id="L979" class="LineNr"> 979 </span>  <span class="Normal">a</span>:foo1
+<span id="L980" class="LineNr"> 980 </span>  <span class="Normal">b</span>:foo2
+<span id="L981" class="LineNr"> 981 </span>]
+<span id="L982" class="LineNr"> 982 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L983" class="LineNr"> 983 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">12000</span>/unsafe  <span class="Comment"># pretend allocation</span>
+<span id="L984" class="LineNr"> 984 </span>  *<span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L985" class="LineNr"> 985 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/foo1<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Delimiter">,</span> <span class="Constant">97</span>
+<span id="L986" class="LineNr"> 986 </span>  <span class="Constant">5</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">13000</span>/unsafe  <span class="Comment"># pretend allocation</span>
+<span id="L987" class="LineNr"> 987 </span>  *<span class="Constant">5</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L988" class="LineNr"> 988 </span>  <span class="Constant">6</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/foo2<span class="Delimiter">,</span> <span class="Constant">98</span><span class="Delimiter">,</span> <span class="Constant">5</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L989" class="LineNr"> 989 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>copy <span class="Constant">6</span>:bar
+<span id="L990" class="LineNr"> 990 </span>]
+<span id="L991" class="LineNr"> 991 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- merge {0: &quot;literal&quot;, &quot;foo1&quot;: ()}, {1: (&quot;address&quot; &quot;number&quot;)}, {97: &quot;literal&quot;}</span>
+<span id="L992" class="LineNr"> 992 </span><span class="traceContains">+mem: incrementing refcount of 12000: 1 -&gt; 2</span>
+<span id="L993" class="LineNr"> 993 </span><span class="traceContains">+run: {6: &quot;bar&quot;} &lt;- merge {1: &quot;literal&quot;, &quot;foo2&quot;: ()}, {98: &quot;literal&quot;}, {5: (&quot;address&quot; &quot;number&quot;)}</span>
+<span id="L994" class="LineNr"> 994 </span><span class="traceContains">+mem: incrementing refcount of 13000: 1 -&gt; 2</span>
+<span id="L995" class="LineNr"> 995 </span><span class="traceContains">+run: {2: &quot;bar&quot;} &lt;- copy {6: &quot;bar&quot;}</span>
+<span id="L996" class="LineNr"> 996 </span><span class="traceContains">+mem: incrementing refcount of 13000: 2 -&gt; 3</span>
+<span id="L997" class="LineNr"> 997 </span><span class="traceContains">+mem: decrementing refcount of 12000: 2 -&gt; 1</span>
+<span id="L998" class="LineNr"> 998 </span>
+<span id="L999" class="LineNr"> 999 </span><span class="Delimiter">:(code)</span>
+<span id="L1000" class="LineNr">1000 </span><span class="Normal">bool</span> is_mu_container<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1001" class="LineNr">1001 </span>  <span class="Identifier">return</span> is_mu_container<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L1002" class="LineNr">1002 </span><span class="Delimiter">}</span>
+<span id="L1003" class="LineNr">1003 </span><span class="Normal">bool</span> is_mu_container<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1004" class="LineNr">1004 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L1005" class="LineNr">1005 </span>  <span class="Comment">// End is_mu_container(type) Special-cases</span>
+<span id="L1006" class="LineNr">1006 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == <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="L1007" class="LineNr">1007 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L1008" class="LineNr">1008 </span>  <span class="Identifier">return</span> info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">;</span>
+<span id="L1009" class="LineNr">1009 </span><span class="Delimiter">}</span>
+<span id="L1010" class="LineNr">1010 </span>
+<span id="L1011" class="LineNr">1011 </span><span class="Normal">bool</span> is_mu_exclusive_container<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1012" class="LineNr">1012 </span>  <span class="Identifier">return</span> is_mu_exclusive_container<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
+<span id="L1013" class="LineNr">1013 </span><span class="Delimiter">}</span>
+<span id="L1014" class="LineNr">1014 </span><span class="Normal">bool</span> is_mu_exclusive_container<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L1015" class="LineNr">1015 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L1016" class="LineNr">1016 </span>  <span class="Comment">// End is_mu_exclusive_container(type) Special-cases</span>
+<span id="L1017" class="LineNr">1017 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == <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="L1018" class="LineNr">1018 </span>  type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L1019" class="LineNr">1019 </span>  <span class="Identifier">return</span> info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">;</span>
+<span id="L1020" class="LineNr">1020 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/037abandon.cc.html b/html/037abandon.cc.html
index b1326186..0718a421 100644
--- a/html/037abandon.cc.html
+++ b/html/037abandon.cc.html
@@ -101,14 +101,14 @@ if ('onhashchange' in window) {
 <span id="L38" class="LineNr"> 38 </span>    assert<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name != <span class="Constant">&quot;array&quot;</span><span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span>    <span class="Normal">int</span> element_size = size_of<span class="Delimiter">(</span>element<span class="Delimiter">);</span>
 <span id="L40" class="LineNr"> 40 </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 &lt; <a href='032array.cc.html#L386'>array_length</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L41" class="LineNr"> 41 </span>      element<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a> + <span class="Comment">/*</span><span class="Comment">skip refcount and length</span><span class="Comment">*/</span><span class="Constant">2</span> + i*element_size<span class="Delimiter">);</span>
+<span id="L41" class="LineNr"> 41 </span>      element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a> + <span class="Comment">/*</span><span class="Comment">skip refcount and length</span><span class="Comment">*/</span><span class="Constant">2</span> + i*element_size<span class="Delimiter">);</span>
 <span id="L42" class="LineNr"> 42 </span>      <a href='036refcount.cc.html#L51'>decrement_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">);</span>
 <span id="L43" class="LineNr"> 43 </span>    <span class="Delimiter">}</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Delimiter">}</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_container<span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">)</span> || is_mu_exclusive_container<span class="Delimiter">(</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L46" class="LineNr"> 46 </span>    reagent tmp<span class="Delimiter">;</span>
 <span id="L47" class="LineNr"> 47 </span>    tmp<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*payload_type<span class="Delimiter">);</span>
-<span id="L48" class="LineNr"> 48 </span>    tmp<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a> + <span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>    tmp<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a> + <span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L49" class="LineNr"> 49 </span>    <a href='036refcount.cc.html#L51'>decrement_any_refcounts</a><span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Delimiter">}</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Comment">// clear memory</span>
diff --git a/html/040brace.cc.html b/html/040brace.cc.html
index fb92c3da..41ac0d83 100644
--- a/html/040brace.cc.html
+++ b/html/040brace.cc.html
@@ -128,411 +128,412 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Delimiter">}</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L70" class="LineNr"> 70 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>old_name != <span class="Constant">&quot;loop&quot;</span>
-<span id="L71" class="LineNr"> 71 </span>         &amp;&amp; inst<span class="Delimiter">.</span>old_name != <span class="Constant">&quot;loop-if&quot;</span>
-<span id="L72" class="LineNr"> 72 </span>         &amp;&amp; inst<span class="Delimiter">.</span>old_name != <span class="Constant">&quot;loop-unless&quot;</span>
-<span id="L73" class="LineNr"> 73 </span>         &amp;&amp; inst<span class="Delimiter">.</span>old_name != <span class="Constant">&quot;break&quot;</span>
-<span id="L74" class="LineNr"> 74 </span>         &amp;&amp; inst<span class="Delimiter">.</span>old_name != <span class="Constant">&quot;break-if&quot;</span>
-<span id="L75" class="LineNr"> 75 </span>         &amp;&amp; inst<span class="Delimiter">.</span>old_name != <span class="Constant">&quot;break-unless&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L76" class="LineNr"> 76 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>old_name &lt;&lt; <span class="Constant">&quot; ...&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L70" class="LineNr"> 70 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;loop&quot;</span>
+<span id="L71" class="LineNr"> 71 </span>         &amp;&amp; inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;loop-if&quot;</span>
+<span id="L72" class="LineNr"> 72 </span>         &amp;&amp; inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;loop-unless&quot;</span>
+<span id="L73" class="LineNr"> 73 </span>         &amp;&amp; inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;break&quot;</span>
+<span id="L74" class="LineNr"> 74 </span>         &amp;&amp; inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;break-if&quot;</span>
+<span id="L75" class="LineNr"> 75 </span>         &amp;&amp; inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;break-unless&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L76" class="LineNr"> 76 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; ...&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L77" class="LineNr"> 77 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="Delimiter">}</span>
 <span id="L79" class="LineNr"> 79 </span>    <span class="Comment">// check for errors</span>
-<span id="L80" class="LineNr"> 80 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>old_name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-if&quot;</span><span class="Delimiter">)</span> != string::npos || inst<span class="Delimiter">.</span>old_name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-unless&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L80" class="LineNr"> 80 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-if&quot;</span><span class="Delimiter">)</span> != string::npos || inst<span class="Delimiter">.</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-unless&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L81" class="LineNr"> 81 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L82" class="LineNr"> 82 </span>        <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>old_name &lt;&lt; <span class="Constant">&quot;' expects 1 or 2 ingredients, but got none</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L82" class="LineNr"> 82 </span>        <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' expects 1 or 2 ingredients, but got none</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L83" class="LineNr"> 83 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L84" class="LineNr"> 84 </span>      <span class="Delimiter">}</span>
 <span id="L85" class="LineNr"> 85 </span>    <span class="Delimiter">}</span>
 <span id="L86" class="LineNr"> 86 </span>    <span class="Comment">// update instruction operation</span>
-<span id="L87" class="LineNr"> 87 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>old_name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-if&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L88" class="LineNr"> 88 </span>      inst<span class="Delimiter">.</span>name = <span class="Constant">&quot;jump-if&quot;</span><span class="Delimiter">;</span>
-<span id="L89" class="LineNr"> 89 </span>      inst<span class="Delimiter">.</span>operation = JUMP_IF<span class="Delimiter">;</span>
-<span id="L90" class="LineNr"> 90 </span>    <span class="Delimiter">}</span>
-<span id="L91" class="LineNr"> 91 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>old_name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-unless&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L92" class="LineNr"> 92 </span>      inst<span class="Delimiter">.</span>name = <span class="Constant">&quot;jump-unless&quot;</span><span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span>      inst<span class="Delimiter">.</span>operation = JUMP_UNLESS<span class="Delimiter">;</span>
-<span id="L94" class="LineNr"> 94 </span>    <span class="Delimiter">}</span>
-<span id="L95" class="LineNr"> 95 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span>      inst<span class="Delimiter">.</span>name = <span class="Constant">&quot;jump&quot;</span><span class="Delimiter">;</span>
-<span id="L97" class="LineNr"> 97 </span>      inst<span class="Delimiter">.</span>operation = JUMP<span class="Delimiter">;</span>
-<span id="L98" class="LineNr"> 98 </span>    <span class="Delimiter">}</span>
-<span id="L99" class="LineNr"> 99 </span>    <span class="Comment">// check for explicitly provided targets</span>
-<span id="L100" class="LineNr">100 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>old_name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-if&quot;</span><span class="Delimiter">)</span> != string::npos || inst<span class="Delimiter">.</span>old_name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-unless&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L101" class="LineNr">101 </span>      <span class="Comment">// conditional branches check arg 1</span>
-<span id="L102" class="LineNr">102 </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> &gt; <span class="Constant">1</span> &amp;&amp; is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L103" class="LineNr">103 </span>        <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
-<span id="L104" class="LineNr">104 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L105" class="LineNr">105 </span>      <span class="Delimiter">}</span>
-<span id="L106" class="LineNr">106 </span>    <span class="Delimiter">}</span>
-<span id="L107" class="LineNr">107 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L108" class="LineNr">108 </span>      <span class="Comment">// unconditional branches check arg 0</span>
-<span id="L109" class="LineNr">109 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; is_literal<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="L110" class="LineNr">110 </span>        <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
-<span id="L111" class="LineNr">111 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L112" class="LineNr">112 </span>      <span class="Delimiter">}</span>
-<span id="L113" class="LineNr">113 </span>    <span class="Delimiter">}</span>
-<span id="L114" class="LineNr">114 </span>    <span class="Comment">// if implicit, compute target</span>
-<span id="L115" class="LineNr">115 </span>    reagent target<span class="Delimiter">;</span>
-<span id="L116" class="LineNr">116 </span>    target<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;offset&quot;</span><span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </span>    target<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L118" class="LineNr">118 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>open_braces<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L119" class="LineNr">119 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>old_name &lt;&lt; <span class="Constant">&quot;' needs a '{' before</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L120" class="LineNr">120 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>old_name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;loop&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span>
-<span id="L121" class="LineNr">121 </span>      target<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>open_braces<span class="Delimiter">.</span>top<span class="Delimiter">()</span>-index<span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>    <span class="Normal">else</span>  <span class="Comment">// break instruction</span>
-<span id="L123" class="LineNr">123 </span>      target<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='040brace.cc.html#L135'>matching_brace</a><span class="Delimiter">(</span>open_braces<span class="Delimiter">.</span>top<span class="Delimiter">(),</span> braces<span class="Delimiter">,</span> r<span class="Delimiter">)</span> - index - <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L124" class="LineNr">124 </span>    inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>target<span class="Delimiter">);</span>
-<span id="L125" class="LineNr">125 </span>    <span class="Comment">// log computed target</span>
-<span id="L126" class="LineNr">126 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;jump&quot;</span><span class="Delimiter">)</span>
-<span id="L127" class="LineNr">127 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>target<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
-<span id="L128" class="LineNr">128 </span>    <span class="Normal">else</span>
-<span id="L129" class="LineNr">129 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>target<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Delimiter">}</span>
-<span id="L131" class="LineNr">131 </span><span class="Delimiter">}</span>
-<span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span><span class="Comment">// returns a signed integer not just so that we can return -1 but also to</span>
-<span id="L134" class="LineNr">134 </span><span class="Comment">// enable future signed arithmetic</span>
-<span id="L135" class="LineNr">135 </span><span class="Normal">int</span> <a href='040brace.cc.html#L135'>matching_brace</a><span class="Delimiter">(</span><span class="Normal">int</span> index<span class="Delimiter">,</span> <span class="Normal">const</span> list&lt;pair&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt; &gt;&amp; braces<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Normal">int</span> stacksize = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>list&lt;pair&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt; &gt;::const_iterator p = braces<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != braces<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="L138" class="LineNr">138 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second &lt; index<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span>    stacksize += <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first ? <span class="Constant">1</span> : -<span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L140" class="LineNr">140 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>stacksize == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Delimiter">}</span>
-<span id="L142" class="LineNr">142 </span>  <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <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> &lt;&lt; <span class="Constant">&quot;unbalanced '{'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">);</span>  <span class="Comment">// exit current routine</span>
-<span id="L144" class="LineNr">144 </span><span class="Delimiter">}</span>
-<span id="L145" class="LineNr">145 </span>
-<span id="L146" class="LineNr">146 </span><span class="Delimiter">:(scenario loop)</span>
-<span id="L147" class="LineNr">147 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L148" class="LineNr">148 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Delimiter">{</span>
-<span id="L151" class="LineNr">151 </span>    <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L152" class="LineNr">152 </span>    loop
-<span id="L153" class="LineNr">153 </span>  <span class="Delimiter">}</span>
-<span id="L154" class="LineNr">154 </span>]
-<span id="L155" class="LineNr">155 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
-<span id="L156" class="LineNr">156 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L87" class="LineNr"> 87 </span>    string old_name = inst<span class="Delimiter">.</span>name<span class="Delimiter">;</span>  <span class="Comment">// save a copy</span>
+<span id="L88" class="LineNr"> 88 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-if&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L89" class="LineNr"> 89 </span>      inst<span class="Delimiter">.</span>name = <span class="Constant">&quot;jump-if&quot;</span><span class="Delimiter">;</span>
+<span id="L90" class="LineNr"> 90 </span>      inst<span class="Delimiter">.</span>operation = JUMP_IF<span class="Delimiter">;</span>
+<span id="L91" class="LineNr"> 91 </span>    <span class="Delimiter">}</span>
+<span id="L92" class="LineNr"> 92 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-unless&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L93" class="LineNr"> 93 </span>      inst<span class="Delimiter">.</span>name = <span class="Constant">&quot;jump-unless&quot;</span><span class="Delimiter">;</span>
+<span id="L94" class="LineNr"> 94 </span>      inst<span class="Delimiter">.</span>operation = JUMP_UNLESS<span class="Delimiter">;</span>
+<span id="L95" class="LineNr"> 95 </span>    <span class="Delimiter">}</span>
+<span id="L96" class="LineNr"> 96 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L97" class="LineNr"> 97 </span>      inst<span class="Delimiter">.</span>name = <span class="Constant">&quot;jump&quot;</span><span class="Delimiter">;</span>
+<span id="L98" class="LineNr"> 98 </span>      inst<span class="Delimiter">.</span>operation = JUMP<span class="Delimiter">;</span>
+<span id="L99" class="LineNr"> 99 </span>    <span class="Delimiter">}</span>
+<span id="L100" class="LineNr">100 </span>    <span class="Comment">// check for explicitly provided targets</span>
+<span id="L101" class="LineNr">101 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-if&quot;</span><span class="Delimiter">)</span> != string::npos || inst<span class="Delimiter">.</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-unless&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L102" class="LineNr">102 </span>      <span class="Comment">// conditional branches check arg 1</span>
+<span id="L103" class="LineNr">103 </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> &gt; <span class="Constant">1</span> &amp;&amp; is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
+<span id="L104" class="LineNr">104 </span>        <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
+<span id="L105" class="LineNr">105 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L106" class="LineNr">106 </span>      <span class="Delimiter">}</span>
+<span id="L107" class="LineNr">107 </span>    <span class="Delimiter">}</span>
+<span id="L108" class="LineNr">108 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L109" class="LineNr">109 </span>      <span class="Comment">// unconditional branches check arg 0</span>
+<span id="L110" class="LineNr">110 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; is_literal<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="L111" class="LineNr">111 </span>        <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
+<span id="L112" class="LineNr">112 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>      <span class="Delimiter">}</span>
+<span id="L114" class="LineNr">114 </span>    <span class="Delimiter">}</span>
+<span id="L115" class="LineNr">115 </span>    <span class="Comment">// if implicit, compute target</span>
+<span id="L116" class="LineNr">116 </span>    reagent target<span class="Delimiter">;</span>
+<span id="L117" class="LineNr">117 </span>    target<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;offset&quot;</span><span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span>    target<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>open_braces<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
+<span id="L120" class="LineNr">120 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; old_name &lt;&lt; <span class="Constant">&quot;' needs a '{' before</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L121" class="LineNr">121 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>old_name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;loop&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span>
+<span id="L122" class="LineNr">122 </span>      target<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>open_braces<span class="Delimiter">.</span>top<span class="Delimiter">()</span>-index<span class="Delimiter">);</span>
+<span id="L123" class="LineNr">123 </span>    <span class="Normal">else</span>  <span class="Comment">// break instruction</span>
+<span id="L124" class="LineNr">124 </span>      target<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='040brace.cc.html#L136'>matching_brace</a><span class="Delimiter">(</span>open_braces<span class="Delimiter">.</span>top<span class="Delimiter">(),</span> braces<span class="Delimiter">,</span> r<span class="Delimiter">)</span> - index - <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L125" class="LineNr">125 </span>    inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>target<span class="Delimiter">);</span>
+<span id="L126" class="LineNr">126 </span>    <span class="Comment">// log computed target</span>
+<span id="L127" class="LineNr">127 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;jump&quot;</span><span class="Delimiter">)</span>
+<span id="L128" class="LineNr">128 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>target<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
+<span id="L129" class="LineNr">129 </span>    <span class="Normal">else</span>
+<span id="L130" class="LineNr">130 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>target<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Delimiter">}</span>
+<span id="L132" class="LineNr">132 </span><span class="Delimiter">}</span>
+<span id="L133" class="LineNr">133 </span>
+<span id="L134" class="LineNr">134 </span><span class="Comment">// returns a signed integer not just so that we can return -1 but also to</span>
+<span id="L135" class="LineNr">135 </span><span class="Comment">// enable future signed arithmetic</span>
+<span id="L136" class="LineNr">136 </span><span class="Normal">int</span> <a href='040brace.cc.html#L136'>matching_brace</a><span class="Delimiter">(</span><span class="Normal">int</span> index<span class="Delimiter">,</span> <span class="Normal">const</span> list&lt;pair&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt; &gt;&amp; braces<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Normal">int</span> stacksize = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L138" class="LineNr">138 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>list&lt;pair&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt; &gt;::const_iterator p = braces<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != braces<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="L139" class="LineNr">139 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second &lt; index<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L140" class="LineNr">140 </span>    stacksize += <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first ? <span class="Constant">1</span> : -<span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L141" class="LineNr">141 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>stacksize == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Delimiter">}</span>
+<span id="L143" class="LineNr">143 </span>  <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <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> &lt;&lt; <span class="Constant">&quot;unbalanced '{'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">);</span>  <span class="Comment">// exit current routine</span>
+<span id="L145" class="LineNr">145 </span><span class="Delimiter">}</span>
+<span id="L146" class="LineNr">146 </span>
+<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(scenario loop)</span>
+<span id="L148" class="LineNr">148 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L149" class="LineNr">149 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Delimiter">{</span>
+<span id="L152" class="LineNr">152 </span>    <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L153" class="LineNr">153 </span>    loop
+<span id="L154" class="LineNr">154 </span>  <span class="Delimiter">}</span>
+<span id="L155" class="LineNr">155 </span>]
+<span id="L156" class="LineNr">156 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
 <span id="L157" class="LineNr">157 </span><span class="traceContains">+transform: copy ...</span>
 <span id="L158" class="LineNr">158 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L159" class="LineNr">159 </span><span class="traceContains">+transform: jump -2:offset</span>
-<span id="L160" class="LineNr">160 </span>
-<span id="L161" class="LineNr">161 </span><span class="Delimiter">:(scenario break_empty_block)</span>
-<span id="L162" class="LineNr">162 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L163" class="LineNr">163 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Delimiter">{</span>
-<span id="L165" class="LineNr">165 </span>    <span class="Identifier">break</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Delimiter">}</span>
-<span id="L167" class="LineNr">167 </span>]
-<span id="L168" class="LineNr">168 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
-<span id="L169" class="LineNr">169 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L170" class="LineNr">170 </span><span class="traceContains">+transform: jump 0:offset</span>
-<span id="L171" class="LineNr">171 </span>
-<span id="L172" class="LineNr">172 </span><span class="Delimiter">:(scenario break_cascading)</span>
-<span id="L173" class="LineNr">173 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L174" class="LineNr">174 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L175" class="LineNr">175 </span>  <span class="Delimiter">{</span>
-<span id="L176" class="LineNr">176 </span>    <span class="Identifier">break</span>
-<span id="L177" class="LineNr">177 </span>  <span class="Delimiter">}</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Delimiter">{</span>
-<span id="L179" class="LineNr">179 </span>    <span class="Identifier">break</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Delimiter">}</span>
-<span id="L181" class="LineNr">181 </span>]
-<span id="L182" class="LineNr">182 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
-<span id="L183" class="LineNr">183 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L184" class="LineNr">184 </span><span class="traceContains">+transform: jump 0:offset</span>
+<span id="L159" class="LineNr">159 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L160" class="LineNr">160 </span><span class="traceContains">+transform: jump -2:offset</span>
+<span id="L161" class="LineNr">161 </span>
+<span id="L162" class="LineNr">162 </span><span class="Delimiter">:(scenario break_empty_block)</span>
+<span id="L163" class="LineNr">163 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L164" class="LineNr">164 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L165" class="LineNr">165 </span>  <span class="Delimiter">{</span>
+<span id="L166" class="LineNr">166 </span>    <span class="Identifier">break</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Delimiter">}</span>
+<span id="L168" class="LineNr">168 </span>]
+<span id="L169" class="LineNr">169 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
+<span id="L170" class="LineNr">170 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L171" class="LineNr">171 </span><span class="traceContains">+transform: jump 0:offset</span>
+<span id="L172" class="LineNr">172 </span>
+<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(scenario break_cascading)</span>
+<span id="L174" class="LineNr">174 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L175" class="LineNr">175 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L176" class="LineNr">176 </span>  <span class="Delimiter">{</span>
+<span id="L177" class="LineNr">177 </span>    <span class="Identifier">break</span>
+<span id="L178" class="LineNr">178 </span>  <span class="Delimiter">}</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Delimiter">{</span>
+<span id="L180" class="LineNr">180 </span>    <span class="Identifier">break</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Delimiter">}</span>
+<span id="L182" class="LineNr">182 </span>]
+<span id="L183" class="LineNr">183 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
+<span id="L184" class="LineNr">184 </span><span class="traceContains">+transform: copy ...</span>
 <span id="L185" class="LineNr">185 </span><span class="traceContains">+transform: jump 0:offset</span>
-<span id="L186" class="LineNr">186 </span>
-<span id="L187" class="LineNr">187 </span><span class="Delimiter">:(scenario break_cascading_2)</span>
-<span id="L188" class="LineNr">188 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L189" class="LineNr">189 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L190" class="LineNr">190 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L191" class="LineNr">191 </span>  <span class="Delimiter">{</span>
-<span id="L192" class="LineNr">192 </span>    <span class="Identifier">break</span>
-<span id="L193" class="LineNr">193 </span>    <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L194" class="LineNr">194 </span>  <span class="Delimiter">}</span>
-<span id="L195" class="LineNr">195 </span>  <span class="Delimiter">{</span>
-<span id="L196" class="LineNr">196 </span>    <span class="Identifier">break</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Delimiter">}</span>
-<span id="L198" class="LineNr">198 </span>]
-<span id="L199" class="LineNr">199 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
-<span id="L200" class="LineNr">200 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L186" class="LineNr">186 </span><span class="traceContains">+transform: jump 0:offset</span>
+<span id="L187" class="LineNr">187 </span>
+<span id="L188" class="LineNr">188 </span><span class="Delimiter">:(scenario break_cascading_2)</span>
+<span id="L189" class="LineNr">189 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L190" class="LineNr">190 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L192" class="LineNr">192 </span>  <span class="Delimiter">{</span>
+<span id="L193" class="LineNr">193 </span>    <span class="Identifier">break</span>
+<span id="L194" class="LineNr">194 </span>    <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L195" class="LineNr">195 </span>  <span class="Delimiter">}</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Delimiter">{</span>
+<span id="L197" class="LineNr">197 </span>    <span class="Identifier">break</span>
+<span id="L198" class="LineNr">198 </span>  <span class="Delimiter">}</span>
+<span id="L199" class="LineNr">199 </span>]
+<span id="L200" class="LineNr">200 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
 <span id="L201" class="LineNr">201 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L202" class="LineNr">202 </span><span class="traceContains">+transform: jump 1:offset</span>
-<span id="L203" class="LineNr">203 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L204" class="LineNr">204 </span><span class="traceContains">+transform: jump 0:offset</span>
-<span id="L205" class="LineNr">205 </span>
-<span id="L206" class="LineNr">206 </span><span class="Delimiter">:(scenario break_if)</span>
-<span id="L207" class="LineNr">207 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L208" class="LineNr">208 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Delimiter">{</span>
-<span id="L211" class="LineNr">211 </span>    <span class="Identifier">break</span>-<span class="Normal">if</span> <span class="Constant">2</span>:num
-<span id="L212" class="LineNr">212 </span>    <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Delimiter">}</span>
-<span id="L214" class="LineNr">214 </span>  <span class="Delimiter">{</span>
-<span id="L215" class="LineNr">215 </span>    <span class="Identifier">break</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Delimiter">}</span>
-<span id="L217" class="LineNr">217 </span>]
-<span id="L218" class="LineNr">218 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
-<span id="L219" class="LineNr">219 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L202" class="LineNr">202 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L203" class="LineNr">203 </span><span class="traceContains">+transform: jump 1:offset</span>
+<span id="L204" class="LineNr">204 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L205" class="LineNr">205 </span><span class="traceContains">+transform: jump 0:offset</span>
+<span id="L206" class="LineNr">206 </span>
+<span id="L207" class="LineNr">207 </span><span class="Delimiter">:(scenario break_if)</span>
+<span id="L208" class="LineNr">208 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L209" class="LineNr">209 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L211" class="LineNr">211 </span>  <span class="Delimiter">{</span>
+<span id="L212" class="LineNr">212 </span>    <span class="Identifier">break</span>-<span class="Normal">if</span> <span class="Constant">2</span>:num
+<span id="L213" class="LineNr">213 </span>    <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L214" class="LineNr">214 </span>  <span class="Delimiter">}</span>
+<span id="L215" class="LineNr">215 </span>  <span class="Delimiter">{</span>
+<span id="L216" class="LineNr">216 </span>    <span class="Identifier">break</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Delimiter">}</span>
+<span id="L218" class="LineNr">218 </span>]
+<span id="L219" class="LineNr">219 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
 <span id="L220" class="LineNr">220 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L221" class="LineNr">221 </span><span class="traceContains">+transform: jump-if 2, 1:offset</span>
-<span id="L222" class="LineNr">222 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L223" class="LineNr">223 </span><span class="traceContains">+transform: jump 0:offset</span>
-<span id="L224" class="LineNr">224 </span>
-<span id="L225" class="LineNr">225 </span><span class="Delimiter">:(scenario break_nested)</span>
-<span id="L226" class="LineNr">226 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L227" class="LineNr">227 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L228" class="LineNr">228 </span>  <span class="Delimiter">{</span>
-<span id="L229" class="LineNr">229 </span>    <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L230" class="LineNr">230 </span>    <span class="Identifier">break</span>
-<span id="L231" class="LineNr">231 </span>    <span class="Delimiter">{</span>
-<span id="L232" class="LineNr">232 </span>      <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L233" class="LineNr">233 </span>    <span class="Delimiter">}</span>
-<span id="L234" class="LineNr">234 </span>    <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L235" class="LineNr">235 </span>  <span class="Delimiter">}</span>
-<span id="L236" class="LineNr">236 </span>]
-<span id="L237" class="LineNr">237 </span><span class="traceContains">+transform: jump 4:offset</span>
-<span id="L238" class="LineNr">238 </span>
-<span id="L239" class="LineNr">239 </span><span class="Delimiter">:(scenario break_nested_degenerate)</span>
-<span id="L240" class="LineNr">240 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L241" class="LineNr">241 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Delimiter">{</span>
-<span id="L243" class="LineNr">243 </span>    <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L244" class="LineNr">244 </span>    <span class="Identifier">break</span>
-<span id="L245" class="LineNr">245 </span>    <span class="Delimiter">{</span>
-<span id="L246" class="LineNr">246 </span>    <span class="Delimiter">}</span>
-<span id="L247" class="LineNr">247 </span>    <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L248" class="LineNr">248 </span>  <span class="Delimiter">}</span>
-<span id="L249" class="LineNr">249 </span>]
-<span id="L250" class="LineNr">250 </span><span class="traceContains">+transform: jump 3:offset</span>
-<span id="L251" class="LineNr">251 </span>
-<span id="L252" class="LineNr">252 </span><span class="Delimiter">:(scenario break_nested_degenerate_2)</span>
-<span id="L253" class="LineNr">253 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L254" class="LineNr">254 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L255" class="LineNr">255 </span>  <span class="Delimiter">{</span>
-<span id="L256" class="LineNr">256 </span>    <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L257" class="LineNr">257 </span>    <span class="Identifier">break</span>
-<span id="L258" class="LineNr">258 </span>    <span class="Delimiter">{</span>
-<span id="L259" class="LineNr">259 </span>    <span class="Delimiter">}</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Delimiter">}</span>
-<span id="L261" class="LineNr">261 </span>]
-<span id="L262" class="LineNr">262 </span><span class="traceContains">+transform: jump 2:offset</span>
-<span id="L263" class="LineNr">263 </span>
-<span id="L264" class="LineNr">264 </span><span class="Delimiter">:(scenario break_label)</span>
-<span id="L265" class="LineNr">265 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L266" class="LineNr">266 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L267" class="LineNr">267 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L268" class="LineNr">268 </span>  <span class="Delimiter">{</span>
-<span id="L269" class="LineNr">269 </span>    <span class="Identifier">break</span> <span class="Constant">+foo:offset</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="traceContains">+transform: jump +foo:offset</span>
-<span id="L273" class="LineNr">273 </span>
-<span id="L274" class="LineNr">274 </span><span class="Delimiter">:(scenario break_unless)</span>
-<span id="L275" class="LineNr">275 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L276" class="LineNr">276 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L277" class="LineNr">277 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L278" class="LineNr">278 </span>  <span class="Delimiter">{</span>
-<span id="L279" class="LineNr">279 </span>    <span class="Identifier">break</span>-unless <span class="Constant">2</span>:num
-<span id="L280" class="LineNr">280 </span>    <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Delimiter">}</span>
-<span id="L282" class="LineNr">282 </span>]
-<span id="L283" class="LineNr">283 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
-<span id="L284" class="LineNr">284 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L221" class="LineNr">221 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L222" class="LineNr">222 </span><span class="traceContains">+transform: jump-if 2, 1:offset</span>
+<span id="L223" class="LineNr">223 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L224" class="LineNr">224 </span><span class="traceContains">+transform: jump 0:offset</span>
+<span id="L225" class="LineNr">225 </span>
+<span id="L226" class="LineNr">226 </span><span class="Delimiter">:(scenario break_nested)</span>
+<span id="L227" class="LineNr">227 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L228" class="LineNr">228 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Delimiter">{</span>
+<span id="L230" class="LineNr">230 </span>    <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L231" class="LineNr">231 </span>    <span class="Identifier">break</span>
+<span id="L232" class="LineNr">232 </span>    <span class="Delimiter">{</span>
+<span id="L233" class="LineNr">233 </span>      <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L234" class="LineNr">234 </span>    <span class="Delimiter">}</span>
+<span id="L235" class="LineNr">235 </span>    <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Delimiter">}</span>
+<span id="L237" class="LineNr">237 </span>]
+<span id="L238" class="LineNr">238 </span><span class="traceContains">+transform: jump 4:offset</span>
+<span id="L239" class="LineNr">239 </span>
+<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(scenario break_nested_degenerate)</span>
+<span id="L241" class="LineNr">241 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L242" class="LineNr">242 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Delimiter">{</span>
+<span id="L244" class="LineNr">244 </span>    <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L245" class="LineNr">245 </span>    <span class="Identifier">break</span>
+<span id="L246" class="LineNr">246 </span>    <span class="Delimiter">{</span>
+<span id="L247" class="LineNr">247 </span>    <span class="Delimiter">}</span>
+<span id="L248" class="LineNr">248 </span>    <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Delimiter">}</span>
+<span id="L250" class="LineNr">250 </span>]
+<span id="L251" class="LineNr">251 </span><span class="traceContains">+transform: jump 3:offset</span>
+<span id="L252" class="LineNr">252 </span>
+<span id="L253" class="LineNr">253 </span><span class="Delimiter">:(scenario break_nested_degenerate_2)</span>
+<span id="L254" class="LineNr">254 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L255" class="LineNr">255 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L256" class="LineNr">256 </span>  <span class="Delimiter">{</span>
+<span id="L257" class="LineNr">257 </span>    <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L258" class="LineNr">258 </span>    <span class="Identifier">break</span>
+<span id="L259" class="LineNr">259 </span>    <span class="Delimiter">{</span>
+<span id="L260" class="LineNr">260 </span>    <span class="Delimiter">}</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Delimiter">}</span>
+<span id="L262" class="LineNr">262 </span>]
+<span id="L263" class="LineNr">263 </span><span class="traceContains">+transform: jump 2:offset</span>
+<span id="L264" class="LineNr">264 </span>
+<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(scenario break_label)</span>
+<span id="L266" class="LineNr">266 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L267" class="LineNr">267 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L268" class="LineNr">268 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L269" class="LineNr">269 </span>  <span class="Delimiter">{</span>
+<span id="L270" class="LineNr">270 </span>    <span class="Identifier">break</span> <span class="Constant">+foo:offset</span>
+<span id="L271" class="LineNr">271 </span>  <span class="Delimiter">}</span>
+<span id="L272" class="LineNr">272 </span>]
+<span id="L273" class="LineNr">273 </span><span class="traceContains">+transform: jump +foo:offset</span>
+<span id="L274" class="LineNr">274 </span>
+<span id="L275" class="LineNr">275 </span><span class="Delimiter">:(scenario break_unless)</span>
+<span id="L276" class="LineNr">276 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L277" class="LineNr">277 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Delimiter">{</span>
+<span id="L280" class="LineNr">280 </span>    <span class="Identifier">break</span>-unless <span class="Constant">2</span>:num
+<span id="L281" class="LineNr">281 </span>    <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Delimiter">}</span>
+<span id="L283" class="LineNr">283 </span>]
+<span id="L284" class="LineNr">284 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
 <span id="L285" class="LineNr">285 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L286" class="LineNr">286 </span><span class="traceContains">+transform: jump-unless 2, 1:offset</span>
-<span id="L287" class="LineNr">287 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L288" class="LineNr">288 </span>
-<span id="L289" class="LineNr">289 </span><span class="Delimiter">:(scenario loop_unless)</span>
-<span id="L290" class="LineNr">290 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L291" class="LineNr">291 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L292" class="LineNr">292 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Delimiter">{</span>
-<span id="L294" class="LineNr">294 </span>    loop-unless <span class="Constant">2</span>:num
-<span id="L295" class="LineNr">295 </span>    <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L296" class="LineNr">296 </span>  <span class="Delimiter">}</span>
-<span id="L297" class="LineNr">297 </span>]
-<span id="L298" class="LineNr">298 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
-<span id="L299" class="LineNr">299 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L286" class="LineNr">286 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L287" class="LineNr">287 </span><span class="traceContains">+transform: jump-unless 2, 1:offset</span>
+<span id="L288" class="LineNr">288 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L289" class="LineNr">289 </span>
+<span id="L290" class="LineNr">290 </span><span class="Delimiter">:(scenario loop_unless)</span>
+<span id="L291" class="LineNr">291 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L292" class="LineNr">292 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Delimiter">{</span>
+<span id="L295" class="LineNr">295 </span>    loop-unless <span class="Constant">2</span>:num
+<span id="L296" class="LineNr">296 </span>    <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Delimiter">}</span>
+<span id="L298" class="LineNr">298 </span>]
+<span id="L299" class="LineNr">299 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
 <span id="L300" class="LineNr">300 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L301" class="LineNr">301 </span><span class="traceContains">+transform: jump-unless 2, -1:offset</span>
-<span id="L302" class="LineNr">302 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L303" class="LineNr">303 </span>
-<span id="L304" class="LineNr">304 </span><span class="Delimiter">:(scenario loop_nested)</span>
-<span id="L305" class="LineNr">305 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L306" class="LineNr">306 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Delimiter">{</span>
-<span id="L308" class="LineNr">308 </span>    <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L309" class="LineNr">309 </span>    <span class="Delimiter">{</span>
-<span id="L310" class="LineNr">310 </span>      <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L311" class="LineNr">311 </span>    <span class="Delimiter">}</span>
-<span id="L312" class="LineNr">312 </span>    loop-<span class="Normal">if</span> <span class="Constant">4</span>:<span class="Normal">bool</span>
-<span id="L313" class="LineNr">313 </span>    <span class="Constant">5</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</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="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
-<span id="L317" class="LineNr">317 </span><span class="traceContains">+transform: jump-if 4, -5:offset</span>
-<span id="L318" class="LineNr">318 </span>
-<span id="L319" class="LineNr">319 </span><span class="Delimiter">:(scenario loop_label)</span>
-<span id="L320" class="LineNr">320 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L321" class="LineNr">321 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L322" class="LineNr">322 </span>  +foo
-<span id="L323" class="LineNr">323 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L324" class="LineNr">324 </span>]
-<span id="L325" class="LineNr">325 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
-<span id="L326" class="LineNr">326 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L301" class="LineNr">301 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L302" class="LineNr">302 </span><span class="traceContains">+transform: jump-unless 2, -1:offset</span>
+<span id="L303" class="LineNr">303 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L304" class="LineNr">304 </span>
+<span id="L305" class="LineNr">305 </span><span class="Delimiter">:(scenario loop_nested)</span>
+<span id="L306" class="LineNr">306 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L307" class="LineNr">307 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Delimiter">{</span>
+<span id="L309" class="LineNr">309 </span>    <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L310" class="LineNr">310 </span>    <span class="Delimiter">{</span>
+<span id="L311" class="LineNr">311 </span>      <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L312" class="LineNr">312 </span>    <span class="Delimiter">}</span>
+<span id="L313" class="LineNr">313 </span>    loop-<span class="Normal">if</span> <span class="Constant">4</span>:<span class="Normal">bool</span>
+<span id="L314" class="LineNr">314 </span>    <span class="Constant">5</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Delimiter">}</span>
+<span id="L316" class="LineNr">316 </span>]
+<span id="L317" class="LineNr">317 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
+<span id="L318" class="LineNr">318 </span><span class="traceContains">+transform: jump-if 4, -5:offset</span>
+<span id="L319" class="LineNr">319 </span>
+<span id="L320" class="LineNr">320 </span><span class="Delimiter">:(scenario loop_label)</span>
+<span id="L321" class="LineNr">321 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L322" class="LineNr">322 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L323" class="LineNr">323 </span>  +foo
+<span id="L324" class="LineNr">324 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L325" class="LineNr">325 </span>]
+<span id="L326" class="LineNr">326 </span><span class="traceContains">+transform: --- <a href='012transform.cc.html#L98'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> <a href='000organization.cc.html#L113'>main</a></span>
 <span id="L327" class="LineNr">327 </span><span class="traceContains">+transform: copy ...</span>
-<span id="L328" class="LineNr">328 </span>
-<span id="L329" class="LineNr">329 </span><span class="Comment">//: test how things actually run</span>
-<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L331" class="LineNr">331 </span><span class="Delimiter">:(scenario brace_conversion_and_run)</span>
-<span id="L332" class="LineNr">332 </span><span class="muRecipe">def</span> test-factorial [
-<span id="L333" class="LineNr">333 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>
-<span id="L334" class="LineNr">334 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
-<span id="L335" class="LineNr">335 </span>  <span class="Delimiter">{</span>
-<span id="L336" class="LineNr">336 </span>    <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L337" class="LineNr">337 </span>    <span class="Identifier">break</span>-<span class="Normal">if</span> <span class="Constant">3</span>:<span class="Normal">bool</span>
-<span id="L338" class="LineNr">338 </span><span class="Comment">#    $print 1:num</span>
-<span id="L339" class="LineNr">339 </span>    <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>multiply <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span>:num
-<span id="L340" class="LineNr">340 </span>    <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>subtract <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span>
-<span id="L341" class="LineNr">341 </span>    loop
-<span id="L342" class="LineNr">342 </span>  <span class="Delimiter">}</span>
-<span id="L343" class="LineNr">343 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span>:num  <span class="Comment"># trigger a read</span>
-<span id="L344" class="LineNr">344 </span>]
-<span id="L345" class="LineNr">345 </span><span class="traceContains">+mem: location 2 is 120</span>
-<span id="L346" class="LineNr">346 </span>
-<span id="L347" class="LineNr">347 </span><span class="Delimiter">:(scenario break_outside_braces_fails)</span>
-<span id="L348" class="LineNr">348 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L349" class="LineNr">349 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L350" class="LineNr">350 </span>  <span class="Identifier">break</span>
-<span id="L351" class="LineNr">351 </span>]
-<span id="L352" class="LineNr">352 </span><span class="traceContains">+error: 'break' needs a '{' before</span>
-<span id="L353" class="LineNr">353 </span>
-<span id="L354" class="LineNr">354 </span><span class="Delimiter">:(scenario break_conditional_without_ingredient_fails)</span>
-<span id="L355" class="LineNr">355 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L356" class="LineNr">356 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L357" class="LineNr">357 </span>  <span class="Delimiter">{</span>
-<span id="L358" class="LineNr">358 </span>    <span class="Identifier">break</span>-<span class="Normal">if</span>
-<span id="L359" class="LineNr">359 </span>  <span class="Delimiter">}</span>
-<span id="L360" class="LineNr">360 </span>]
-<span id="L361" class="LineNr">361 </span><span class="traceContains">+error: 'break-if' expects 1 or 2 ingredients, but got none</span>
-<span id="L362" class="LineNr">362 </span>
-<span id="L363" class="LineNr">363 </span><span class="Comment">//: Using break we can now implement conditional returns.</span>
-<span id="L364" class="LineNr">364 </span>
-<span id="L365" class="LineNr">365 </span><span class="Delimiter">:(scenario return_if)</span>
-<span id="L366" class="LineNr">366 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L367" class="LineNr">367 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>test1
-<span id="L368" class="LineNr">368 </span>]
-<span id="L369" class="LineNr">369 </span><span class="muRecipe">def</span> test1 [
-<span id="L370" class="LineNr">370 </span>  <span class="Identifier">return</span>-<span class="Normal">if</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L371" class="LineNr">371 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
-<span id="L372" class="LineNr">372 </span>]
-<span id="L373" class="LineNr">373 </span><span class="traceContains">+mem: storing 35 in location 1</span>
-<span id="L374" class="LineNr">374 </span>
-<span id="L375" class="LineNr">375 </span><span class="Delimiter">:(scenario return_if_2)</span>
-<span id="L376" class="LineNr">376 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L377" class="LineNr">377 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>test1
-<span id="L378" class="LineNr">378 </span>]
-<span id="L379" class="LineNr">379 </span><span class="muRecipe">def</span> test1 [
-<span id="L380" class="LineNr">380 </span>  <span class="Identifier">return</span>-<span class="Normal">if</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span>
-<span id="L381" class="LineNr">381 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
-<span id="L382" class="LineNr">382 </span>]
-<span id="L383" class="LineNr">383 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L384" class="LineNr">384 </span>
-<span id="L385" class="LineNr">385 </span><span class="Delimiter">:(before &quot;End Rewrite Instruction(curr, <a href='010vm.cc.html#L19'>recipe</a> result)&quot;)</span>
-<span id="L386" class="LineNr">386 </span><span class="Comment">// rewrite `return-if a, b, c, ...` to</span>
-<span id="L387" class="LineNr">387 </span><span class="Comment">//   ```</span>
-<span id="L388" class="LineNr">388 </span><span class="Comment">//   {</span>
-<span id="L389" class="LineNr">389 </span><span class="Comment">//     break-unless a</span>
-<span id="L390" class="LineNr">390 </span><span class="Comment">//     return b, c, ...</span>
-<span id="L391" class="LineNr">391 </span><span class="Comment">//   }</span>
-<span id="L392" class="LineNr">392 </span><span class="Comment">//   ```</span>
-<span id="L393" class="LineNr">393 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;return-if&quot;</span> || curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;reply-if&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L394" class="LineNr">394 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L395" class="LineNr">395 </span>    <a href='040brace.cc.html#L420'>emit_return_block</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> <span class="Constant">&quot;break-unless&quot;</span><span class="Delimiter">,</span> curr<span class="Delimiter">);</span>
-<span id="L396" class="LineNr">396 </span>    curr<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L397" class="LineNr">397 </span>  <span class="Delimiter">}</span>
-<span id="L398" class="LineNr">398 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L399" class="LineNr">399 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' never yields any products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L400" class="LineNr">400 </span>  <span class="Delimiter">}</span>
-<span id="L401" class="LineNr">401 </span><span class="Delimiter">}</span>
-<span id="L402" class="LineNr">402 </span><span class="Comment">// rewrite `return-unless a, b, c, ...` to</span>
-<span id="L403" class="LineNr">403 </span><span class="Comment">//   ```</span>
-<span id="L404" class="LineNr">404 </span><span class="Comment">//   {</span>
-<span id="L405" class="LineNr">405 </span><span class="Comment">//     break-if a</span>
-<span id="L406" class="LineNr">406 </span><span class="Comment">//     return b, c, ...</span>
-<span id="L407" class="LineNr">407 </span><span class="Comment">//   }</span>
-<span id="L408" class="LineNr">408 </span><span class="Comment">//   ```</span>
-<span id="L409" class="LineNr">409 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;return-unless&quot;</span> || curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;reply-unless&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L410" class="LineNr">410 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L411" class="LineNr">411 </span>    <a href='040brace.cc.html#L420'>emit_return_block</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> <span class="Constant">&quot;break-if&quot;</span><span class="Delimiter">,</span> curr<span class="Delimiter">);</span>
-<span id="L412" class="LineNr">412 </span>    curr<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L413" class="LineNr">413 </span>  <span class="Delimiter">}</span>
-<span id="L414" class="LineNr">414 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L415" class="LineNr">415 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' never yields any products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L416" class="LineNr">416 </span>  <span class="Delimiter">}</span>
-<span id="L417" class="LineNr">417 </span><span class="Delimiter">}</span>
-<span id="L418" class="LineNr">418 </span>
-<span id="L419" class="LineNr">419 </span><span class="Delimiter">:(code)</span>
-<span id="L420" class="LineNr">420 </span><span class="Normal">void</span> <a href='040brace.cc.html#L420'>emit_return_block</a><span class="Delimiter">(</span>recipe&amp; out<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; break_command<span class="Delimiter">,</span> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L421" class="LineNr">421 </span>  <span class="Normal">const</span> vector&lt;reagent&gt;&amp; ingredients = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">;</span>
-<span id="L422" class="LineNr">422 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> condition = ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L423" class="LineNr">423 </span>  vector&lt;reagent&gt; return_ingredients<span class="Delimiter">;</span>
-<span id="L424" class="LineNr">424 </span>  copy<span class="Delimiter">(</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>return_ingredients<span class="Delimiter">,</span> return_ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">()));</span>
-<span id="L425" class="LineNr">425 </span>
-<span id="L426" class="LineNr">426 </span>  <span class="Comment">// {</span>
-<span id="L427" class="LineNr">427 </span>  <a href='010vm.cc.html#L32'>instruction</a> open_label<span class="Delimiter">;</span>  open_label<span class="Delimiter">.</span>is_label=<span class="Constant">true</span><span class="Delimiter">;</span>  open_label<span class="Delimiter">.</span>label = <span class="Constant">&quot;{&quot;</span><span class="Delimiter">;</span>
-<span id="L428" class="LineNr">428 </span>  out<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>open_label<span class="Delimiter">);</span>
-<span id="L429" class="LineNr">429 </span>
-<span id="L430" class="LineNr">430 </span>  <span class="Comment">// &lt;break command&gt; &lt;condition&gt;</span>
-<span id="L431" class="LineNr">431 </span>  <a href='010vm.cc.html#L32'>instruction</a> break_inst<span class="Delimiter">;</span>
-<span id="L432" class="LineNr">432 </span>  break_inst<span class="Delimiter">.</span>operation = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> break_command<span class="Delimiter">);</span>
-<span id="L433" class="LineNr">433 </span>  break_inst<span class="Delimiter">.</span>name = break_inst<span class="Delimiter">.</span>old_name = break_command<span class="Delimiter">;</span>
-<span id="L434" class="LineNr">434 </span>  break_inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>condition<span class="Delimiter">);</span>
-<span id="L435" class="LineNr">435 </span>  out<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>break_inst<span class="Delimiter">);</span>
-<span id="L436" class="LineNr">436 </span>
-<span id="L437" class="LineNr">437 </span>  <span class="Comment">// return &lt;return ingredients&gt;</span>
-<span id="L438" class="LineNr">438 </span>  <a href='010vm.cc.html#L32'>instruction</a> return_inst<span class="Delimiter">;</span>
-<span id="L439" class="LineNr">439 </span>  return_inst<span class="Delimiter">.</span>operation = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;return&quot;</span><span class="Delimiter">);</span>
-<span id="L440" class="LineNr">440 </span>  return_inst<span class="Delimiter">.</span>name = <span class="Constant">&quot;return&quot;</span><span class="Delimiter">;</span>
-<span id="L441" class="LineNr">441 </span>  return_inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>return_ingredients<span class="Delimiter">);</span>
-<span id="L442" class="LineNr">442 </span>  return_inst<span class="Delimiter">.</span>original_string = inst<span class="Delimiter">.</span>original_string<span class="Delimiter">;</span>
-<span id="L443" class="LineNr">443 </span>  out<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>return_inst<span class="Delimiter">);</span>
-<span id="L444" class="LineNr">444 </span>
-<span id="L445" class="LineNr">445 </span>  <span class="Comment">// }</span>
-<span id="L446" class="LineNr">446 </span>  <a href='010vm.cc.html#L32'>instruction</a> close_label<span class="Delimiter">;</span>  close_label<span class="Delimiter">.</span>is_label=<span class="Constant">true</span><span class="Delimiter">;</span>  close_label<span class="Delimiter">.</span>label = <span class="Constant">&quot;}&quot;</span><span class="Delimiter">;</span>
-<span id="L447" class="LineNr">447 </span>  out<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>close_label<span class="Delimiter">);</span>
-<span id="L448" class="LineNr">448 </span><span class="Delimiter">}</span>
-<span id="L449" class="LineNr">449 </span>
-<span id="L450" class="LineNr">450 </span><span class="Comment">//: Make sure these pseudo recipes get consistent numbers in all tests, even</span>
-<span id="L451" class="LineNr">451 </span><span class="Comment">//: though they aren't implemented. Allows greater flexibility in ordering</span>
-<span id="L452" class="LineNr">452 </span><span class="Comment">//: transforms.</span>
-<span id="L453" class="LineNr">453 </span>
-<span id="L454" class="LineNr">454 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
-<span id="L455" class="LineNr">455 </span>BREAK<span class="Delimiter">,</span>
-<span id="L456" class="LineNr">456 </span>BREAK_IF<span class="Delimiter">,</span>
-<span id="L457" class="LineNr">457 </span>BREAK_UNLESS<span class="Delimiter">,</span>
-<span id="L458" class="LineNr">458 </span>LOOP<span class="Delimiter">,</span>
-<span id="L459" class="LineNr">459 </span>LOOP_IF<span class="Delimiter">,</span>
-<span id="L460" class="LineNr">460 </span>LOOP_UNLESS<span class="Delimiter">,</span>
-<span id="L461" class="LineNr">461 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
-<span id="L462" class="LineNr">462 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;break&quot;</span><span class="Delimiter">,</span> BREAK<span class="Delimiter">);</span>
-<span id="L463" class="LineNr">463 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;break-if&quot;</span><span class="Delimiter">,</span> BREAK_IF<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">&quot;break-unless&quot;</span><span class="Delimiter">,</span> BREAK_UNLESS<span class="Delimiter">);</span>
-<span id="L465" class="LineNr">465 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;loop&quot;</span><span class="Delimiter">,</span> LOOP<span class="Delimiter">);</span>
-<span id="L466" class="LineNr">466 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;loop-if&quot;</span><span class="Delimiter">,</span> LOOP_IF<span class="Delimiter">);</span>
-<span id="L467" class="LineNr">467 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;loop-unless&quot;</span><span class="Delimiter">,</span> LOOP_UNLESS<span class="Delimiter">);</span>
-<span id="L468" class="LineNr">468 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
-<span id="L469" class="LineNr">469 </span><span class="Normal">case</span> BREAK: <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L470" class="LineNr">470 </span><span class="Normal">case</span> BREAK_IF: <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L471" class="LineNr">471 </span><span class="Normal">case</span> BREAK_UNLESS: <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L472" class="LineNr">472 </span><span class="Normal">case</span> LOOP: <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L473" class="LineNr">473 </span><span class="Normal">case</span> LOOP_IF: <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L474" class="LineNr">474 </span><span class="Normal">case</span> LOOP_UNLESS: <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L328" class="LineNr">328 </span><span class="traceContains">+transform: copy ...</span>
+<span id="L329" class="LineNr">329 </span>
+<span id="L330" class="LineNr">330 </span><span class="Comment">//: test how things actually run</span>
+<span id="L331" class="LineNr">331 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L332" class="LineNr">332 </span><span class="Delimiter">:(scenario brace_conversion_and_run)</span>
+<span id="L333" class="LineNr">333 </span><span class="muRecipe">def</span> test-factorial [
+<span id="L334" class="LineNr">334 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>
+<span id="L335" class="LineNr">335 </span>  <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>
+<span id="L336" class="LineNr">336 </span>  <span class="Delimiter">{</span>
+<span id="L337" class="LineNr">337 </span>    <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L338" class="LineNr">338 </span>    <span class="Identifier">break</span>-<span class="Normal">if</span> <span class="Constant">3</span>:<span class="Normal">bool</span>
+<span id="L339" class="LineNr">339 </span><span class="Comment">#    $print 1:num</span>
+<span id="L340" class="LineNr">340 </span>    <span class="Constant">2</span>:num<span class="Special"> &lt;- </span>multiply <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span>:num
+<span id="L341" class="LineNr">341 </span>    <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>subtract <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span>
+<span id="L342" class="LineNr">342 </span>    loop
+<span id="L343" class="LineNr">343 </span>  <span class="Delimiter">}</span>
+<span id="L344" class="LineNr">344 </span>  <span class="Constant">4</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">2</span>:num  <span class="Comment"># trigger a read</span>
+<span id="L345" class="LineNr">345 </span>]
+<span id="L346" class="LineNr">346 </span><span class="traceContains">+mem: location 2 is 120</span>
+<span id="L347" class="LineNr">347 </span>
+<span id="L348" class="LineNr">348 </span><span class="Delimiter">:(scenario break_outside_braces_fails)</span>
+<span id="L349" class="LineNr">349 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L350" class="LineNr">350 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L351" class="LineNr">351 </span>  <span class="Identifier">break</span>
+<span id="L352" class="LineNr">352 </span>]
+<span id="L353" class="LineNr">353 </span><span class="traceContains">+error: 'break' needs a '{' before</span>
+<span id="L354" class="LineNr">354 </span>
+<span id="L355" class="LineNr">355 </span><span class="Delimiter">:(scenario break_conditional_without_ingredient_fails)</span>
+<span id="L356" class="LineNr">356 </span><span class="Special">% Hide_errors = true;</span>
+<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="Delimiter">{</span>
+<span id="L359" class="LineNr">359 </span>    <span class="Identifier">break</span>-<span class="Normal">if</span>
+<span id="L360" class="LineNr">360 </span>  <span class="Delimiter">}</span>
+<span id="L361" class="LineNr">361 </span>]
+<span id="L362" class="LineNr">362 </span><span class="traceContains">+error: 'break-if' expects 1 or 2 ingredients, but got none</span>
+<span id="L363" class="LineNr">363 </span>
+<span id="L364" class="LineNr">364 </span><span class="Comment">//: Using break we can now implement conditional returns.</span>
+<span id="L365" class="LineNr">365 </span>
+<span id="L366" class="LineNr">366 </span><span class="Delimiter">:(scenario return_if)</span>
+<span id="L367" class="LineNr">367 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L368" class="LineNr">368 </span>  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>test1
+<span id="L369" class="LineNr">369 </span>]
+<span id="L370" class="LineNr">370 </span><span class="muRecipe">def</span> test1 [
+<span id="L371" class="LineNr">371 </span>  <span class="Identifier">return</span>-<span class="Normal">if</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L372" class="LineNr">372 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L373" class="LineNr">373 </span>]
+<span id="L374" class="LineNr">374 </span><span class="traceContains">+mem: storing 35 in location 1</span>
+<span id="L375" class="LineNr">375 </span>
+<span id="L376" class="LineNr">376 </span><span class="Delimiter">:(scenario return_if_2)</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>:num<span class="Special"> &lt;- </span>test1
+<span id="L379" class="LineNr">379 </span>]
+<span id="L380" class="LineNr">380 </span><span class="muRecipe">def</span> test1 [
+<span id="L381" class="LineNr">381 </span>  <span class="Identifier">return</span>-<span class="Normal">if</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Identifier">return</span> <span class="Constant">35</span>
+<span id="L383" class="LineNr">383 </span>]
+<span id="L384" class="LineNr">384 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L385" class="LineNr">385 </span>
+<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(before &quot;End Rewrite Instruction(curr, <a href='010vm.cc.html#L19'>recipe</a> result)&quot;)</span>
+<span id="L387" class="LineNr">387 </span><span class="Comment">// rewrite `return-if a, b, c, ...` to</span>
+<span id="L388" class="LineNr">388 </span><span class="Comment">//   ```</span>
+<span id="L389" class="LineNr">389 </span><span class="Comment">//   {</span>
+<span id="L390" class="LineNr">390 </span><span class="Comment">//     break-unless a</span>
+<span id="L391" class="LineNr">391 </span><span class="Comment">//     return b, c, ...</span>
+<span id="L392" class="LineNr">392 </span><span class="Comment">//   }</span>
+<span id="L393" class="LineNr">393 </span><span class="Comment">//   ```</span>
+<span id="L394" class="LineNr">394 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;return-if&quot;</span> || curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;reply-if&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L396" class="LineNr">396 </span>    <a href='040brace.cc.html#L421'>emit_return_block</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> <span class="Constant">&quot;break-unless&quot;</span><span class="Delimiter">,</span> curr<span class="Delimiter">);</span>
+<span id="L397" class="LineNr">397 </span>    curr<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L398" class="LineNr">398 </span>  <span class="Delimiter">}</span>
+<span id="L399" class="LineNr">399 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L400" class="LineNr">400 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' never yields any products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L401" class="LineNr">401 </span>  <span class="Delimiter">}</span>
+<span id="L402" class="LineNr">402 </span><span class="Delimiter">}</span>
+<span id="L403" class="LineNr">403 </span><span class="Comment">// rewrite `return-unless a, b, c, ...` to</span>
+<span id="L404" class="LineNr">404 </span><span class="Comment">//   ```</span>
+<span id="L405" class="LineNr">405 </span><span class="Comment">//   {</span>
+<span id="L406" class="LineNr">406 </span><span class="Comment">//     break-if a</span>
+<span id="L407" class="LineNr">407 </span><span class="Comment">//     return b, c, ...</span>
+<span id="L408" class="LineNr">408 </span><span class="Comment">//   }</span>
+<span id="L409" class="LineNr">409 </span><span class="Comment">//   ```</span>
+<span id="L410" class="LineNr">410 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;return-unless&quot;</span> || curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;reply-unless&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L411" class="LineNr">411 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L412" class="LineNr">412 </span>    <a href='040brace.cc.html#L421'>emit_return_block</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> <span class="Constant">&quot;break-if&quot;</span><span class="Delimiter">,</span> curr<span class="Delimiter">);</span>
+<span id="L413" class="LineNr">413 </span>    curr<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L414" class="LineNr">414 </span>  <span class="Delimiter">}</span>
+<span id="L415" class="LineNr">415 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L416" class="LineNr">416 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' never yields any products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L417" class="LineNr">417 </span>  <span class="Delimiter">}</span>
+<span id="L418" class="LineNr">418 </span><span class="Delimiter">}</span>
+<span id="L419" class="LineNr">419 </span>
+<span id="L420" class="LineNr">420 </span><span class="Delimiter">:(code)</span>
+<span id="L421" class="LineNr">421 </span><span class="Normal">void</span> <a href='040brace.cc.html#L421'>emit_return_block</a><span class="Delimiter">(</span>recipe&amp; out<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; break_command<span class="Delimiter">,</span> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L422" class="LineNr">422 </span>  <span class="Normal">const</span> vector&lt;reagent&gt;&amp; ingredients = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">;</span>
+<span id="L423" class="LineNr">423 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> condition = ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L424" class="LineNr">424 </span>  vector&lt;reagent&gt; return_ingredients<span class="Delimiter">;</span>
+<span id="L425" class="LineNr">425 </span>  copy<span class="Delimiter">(</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>return_ingredients<span class="Delimiter">,</span> return_ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">()));</span>
+<span id="L426" class="LineNr">426 </span>
+<span id="L427" class="LineNr">427 </span>  <span class="Comment">// {</span>
+<span id="L428" class="LineNr">428 </span>  <a href='010vm.cc.html#L32'>instruction</a> open_label<span class="Delimiter">;</span>  open_label<span class="Delimiter">.</span>is_label=<span class="Constant">true</span><span class="Delimiter">;</span>  open_label<span class="Delimiter">.</span>label = <span class="Constant">&quot;{&quot;</span><span class="Delimiter">;</span>
+<span id="L429" class="LineNr">429 </span>  out<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>open_label<span class="Delimiter">);</span>
+<span id="L430" class="LineNr">430 </span>
+<span id="L431" class="LineNr">431 </span>  <span class="Comment">// &lt;break command&gt; &lt;condition&gt;</span>
+<span id="L432" class="LineNr">432 </span>  <a href='010vm.cc.html#L32'>instruction</a> break_inst<span class="Delimiter">;</span>
+<span id="L433" class="LineNr">433 </span>  break_inst<span class="Delimiter">.</span>operation = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> break_command<span class="Delimiter">);</span>
+<span id="L434" class="LineNr">434 </span>  break_inst<span class="Delimiter">.</span>name = break_command<span class="Delimiter">;</span>
+<span id="L435" class="LineNr">435 </span>  break_inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>condition<span class="Delimiter">);</span>
+<span id="L436" class="LineNr">436 </span>  out<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>break_inst<span class="Delimiter">);</span>
+<span id="L437" class="LineNr">437 </span>
+<span id="L438" class="LineNr">438 </span>  <span class="Comment">// return &lt;return ingredients&gt;</span>
+<span id="L439" class="LineNr">439 </span>  <a href='010vm.cc.html#L32'>instruction</a> return_inst<span class="Delimiter">;</span>
+<span id="L440" class="LineNr">440 </span>  return_inst<span class="Delimiter">.</span>operation = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;return&quot;</span><span class="Delimiter">);</span>
+<span id="L441" class="LineNr">441 </span>  return_inst<span class="Delimiter">.</span>name = <span class="Constant">&quot;return&quot;</span><span class="Delimiter">;</span>
+<span id="L442" class="LineNr">442 </span>  return_inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>return_ingredients<span class="Delimiter">);</span>
+<span id="L443" class="LineNr">443 </span>  return_inst<span class="Delimiter">.</span>original_string = inst<span class="Delimiter">.</span>original_string<span class="Delimiter">;</span>
+<span id="L444" class="LineNr">444 </span>  out<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>return_inst<span class="Delimiter">);</span>
+<span id="L445" class="LineNr">445 </span>
+<span id="L446" class="LineNr">446 </span>  <span class="Comment">// }</span>
+<span id="L447" class="LineNr">447 </span>  <a href='010vm.cc.html#L32'>instruction</a> close_label<span class="Delimiter">;</span>  close_label<span class="Delimiter">.</span>is_label=<span class="Constant">true</span><span class="Delimiter">;</span>  close_label<span class="Delimiter">.</span>label = <span class="Constant">&quot;}&quot;</span><span class="Delimiter">;</span>
+<span id="L448" class="LineNr">448 </span>  out<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>close_label<span class="Delimiter">);</span>
+<span id="L449" class="LineNr">449 </span><span class="Delimiter">}</span>
+<span id="L450" class="LineNr">450 </span>
+<span id="L451" class="LineNr">451 </span><span class="Comment">//: Make sure these pseudo recipes get consistent numbers in all tests, even</span>
+<span id="L452" class="LineNr">452 </span><span class="Comment">//: though they aren't implemented. Allows greater flexibility in ordering</span>
+<span id="L453" class="LineNr">453 </span><span class="Comment">//: transforms.</span>
+<span id="L454" class="LineNr">454 </span>
+<span id="L455" class="LineNr">455 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
+<span id="L456" class="LineNr">456 </span>BREAK<span class="Delimiter">,</span>
+<span id="L457" class="LineNr">457 </span>BREAK_IF<span class="Delimiter">,</span>
+<span id="L458" class="LineNr">458 </span>BREAK_UNLESS<span class="Delimiter">,</span>
+<span id="L459" class="LineNr">459 </span>LOOP<span class="Delimiter">,</span>
+<span id="L460" class="LineNr">460 </span>LOOP_IF<span class="Delimiter">,</span>
+<span id="L461" class="LineNr">461 </span>LOOP_UNLESS<span class="Delimiter">,</span>
+<span id="L462" class="LineNr">462 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
+<span id="L463" class="LineNr">463 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;break&quot;</span><span class="Delimiter">,</span> BREAK<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">&quot;break-if&quot;</span><span class="Delimiter">,</span> BREAK_IF<span class="Delimiter">);</span>
+<span id="L465" class="LineNr">465 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;break-unless&quot;</span><span class="Delimiter">,</span> BREAK_UNLESS<span class="Delimiter">);</span>
+<span id="L466" class="LineNr">466 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;loop&quot;</span><span class="Delimiter">,</span> LOOP<span class="Delimiter">);</span>
+<span id="L467" class="LineNr">467 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;loop-if&quot;</span><span class="Delimiter">,</span> LOOP_IF<span class="Delimiter">);</span>
+<span id="L468" class="LineNr">468 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;loop-unless&quot;</span><span class="Delimiter">,</span> LOOP_UNLESS<span class="Delimiter">);</span>
+<span id="L469" class="LineNr">469 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
+<span id="L470" class="LineNr">470 </span><span class="Normal">case</span> BREAK: <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L471" class="LineNr">471 </span><span class="Normal">case</span> BREAK_IF: <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L472" class="LineNr">472 </span><span class="Normal">case</span> BREAK_UNLESS: <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L473" class="LineNr">473 </span><span class="Normal">case</span> LOOP: <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L474" class="LineNr">474 </span><span class="Normal">case</span> LOOP_IF: <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L475" class="LineNr">475 </span><span class="Normal">case</span> LOOP_UNLESS: <span class="Identifier">break</span><span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/041jump_target.cc.html b/html/041jump_target.cc.html
index aa5ce74d..af84acf4 100644
--- a/html/041jump_target.cc.html
+++ b/html/041jump_target.cc.html
@@ -73,7 +73,7 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr"> 11 </span><span class="Normal">bool</span> <a href='041jump_target.cc.html#L11'>is_jump_target</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L12" class="LineNr"> 12 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>label == <span class="Constant">&quot;{&quot;</span> || label == <span class="Constant">&quot;}&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L13" class="LineNr"> 13 </span>  <span class="Comment">// End is_jump_target Special-cases</span>
-<span id="L14" class="LineNr"> 14 </span>  <span class="Identifier">return</span> <a href='011load.cc.html#L178'>is_label_word</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L14" class="LineNr"> 14 </span>  <span class="Identifier">return</span> <a href='011load.cc.html#L179'>is_label_word</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L15" class="LineNr"> 15 </span><span class="Delimiter">}</span>
 <span id="L16" class="LineNr"> 16 </span>
 <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(scenario jump_to_label)</span>
@@ -138,22 +138,22 @@ if ('onhashchange' in window) {
 <span id="L76" class="LineNr"> 76 </span><span class="Normal">void</span> <a href='041jump_target.cc.html#L76'>replace_offset</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;&amp; offset<span class="Delimiter">,</span> <span class="Normal">const</span> <span class="Normal">int</span> current_offset<span class="Delimiter">,</span> <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L77" class="LineNr"> 77 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L78" class="LineNr"> 78 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <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> &lt;&lt; <span class="Constant">&quot;jump target must be offset or label but is '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L79" class="LineNr"> 79 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// no jump by default</span>
+<span id="L79" class="LineNr"> 79 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// no jump by default</span>
 <span id="L80" class="LineNr"> 80 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L81" class="LineNr"> 81 </span>  <span class="Delimiter">}</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L86'>is_integer</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// non-labels will be handled like other number operands</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_jump_target<span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L85" class="LineNr"> 85 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <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> &lt;&lt; <span class="Constant">&quot;can't jump to label '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L86" class="LineNr"> 86 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// no jump by default</span>
+<span id="L86" class="LineNr"> 86 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// no jump by default</span>
 <span id="L87" class="LineNr"> 87 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Delimiter">}</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>offset<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L90" class="LineNr"> 90 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <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> &lt;&lt; <span class="Constant">&quot;can't find label '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L91" class="LineNr"> 91 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// no jump by default</span>
+<span id="L91" class="LineNr"> 91 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// no jump by default</span>
 <span id="L92" class="LineNr"> 92 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Delimiter">}</span>
-<span id="L94" class="LineNr"> 94 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>offset<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">)</span> - current_offset<span class="Delimiter">);</span>
+<span id="L94" class="LineNr"> 94 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>offset<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">)</span> - current_offset<span class="Delimiter">);</span>
 <span id="L95" class="LineNr"> 95 </span><span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span>
 <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">:(scenario break_to_label)</span>
diff --git a/html/042name.cc.html b/html/042name.cc.html
index 915412f1..562616f8 100644
--- a/html/042name.cc.html
+++ b/html/042name.cc.html
@@ -124,7 +124,7 @@ if ('onhashchange' in window) {
 <span id="L61" class="LineNr"> 61 </span>      <span class="Delimiter">}</span>
 <span id="L62" class="LineNr"> 62 </span>      <span class="Normal">int</span> v = lookup_name<span class="Delimiter">(</span>ingredient<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L63" class="LineNr"> 63 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>v &gt;= <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L64" class="LineNr"> 64 </span>        ingredient<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>v<span class="Delimiter">);</span>
+<span id="L64" class="LineNr"> 64 </span>        ingredient<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>v<span class="Delimiter">);</span>
 <span id="L65" class="LineNr"> 65 </span>        <span class="Comment">// Done Placing Ingredient(ingredient, inst, caller)</span>
 <span id="L66" class="LineNr"> 66 </span>      <span class="Delimiter">}</span>
 <span id="L67" class="LineNr"> 67 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
@@ -146,7 +146,7 @@ if ('onhashchange' in window) {
 <span id="L83" class="LineNr"> 83 </span>      <span class="Delimiter">}</span>
 <span id="L84" class="LineNr"> 84 </span>      <span class="Normal">int</span> v = lookup_name<span class="Delimiter">(</span>product<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L85" class="LineNr"> 85 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>v &gt;= <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L86" class="LineNr"> 86 </span>        product<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>v<span class="Delimiter">);</span>
+<span id="L86" class="LineNr"> 86 </span>        product<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>v<span class="Delimiter">);</span>
 <span id="L87" class="LineNr"> 87 </span>        <span class="Comment">// Done Placing Product(product, inst, caller)</span>
 <span id="L88" class="LineNr"> 88 </span>      <span class="Delimiter">}</span>
 <span id="L89" class="LineNr"> 89 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
@@ -180,7 +180,7 @@ if ('onhashchange' in window) {
 <span id="L117" class="LineNr">117 </span>  <span class="Identifier">return</span> Name[default_recipe][r<span class="Delimiter">.</span>name]<span class="Delimiter">;</span>
 <span id="L118" class="LineNr">118 </span><span class="Delimiter">}</span>
 <span id="L119" class="LineNr">119 </span>
-<span id="L120" class="LineNr">120 </span><a href='010vm.cc.html#L124'>type_ordinal</a> <a href='042name.cc.html#L120'>skip_addresses</a><span class="Delimiter">(</span>type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L120" class="LineNr">120 </span><a href='010vm.cc.html#L123'>type_ordinal</a> <a href='042name.cc.html#L120'>skip_addresses</a><span class="Delimiter">(</span>type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L121" class="LineNr">121 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>type &amp;&amp; <a href='039location_array.cc.html#L23'>is_compound_type_starting_with</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">))</span>
 <span id="L122" class="LineNr">122 </span>    type = type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// error handled elsewhere</span>
@@ -193,7 +193,7 @@ if ('onhashchange' in window) {
 <span id="L130" class="LineNr">130 </span>  <span class="Identifier">return</span> base_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value<span class="Delimiter">;</span>
 <span id="L131" class="LineNr">131 </span><span class="Delimiter">}</span>
 <span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span><span class="Normal">int</span> <a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L124'>type_ordinal</a> t<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; name<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; recipe_name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L133" class="LineNr">133 </span><span class="Normal">int</span> <a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L123'>type_ordinal</a> t<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; name<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; recipe_name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L134" class="LineNr">134 </span>  <span class="Normal">const</span> type_info&amp; container = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> t<span class="Delimiter">);</span>
 <span id="L135" class="LineNr">135 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>container<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L136" class="LineNr">136 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>container<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name == name<span class="Delimiter">)</span> <span class="Identifier">return</span> i<span class="Delimiter">;</span>
@@ -322,9 +322,9 @@ if ('onhashchange' in window) {
 <span id="L259" class="LineNr">259 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
 <span id="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name<span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L261" class="LineNr">261 </span>    <span class="Comment">// since first non-address in base type must be a container, we don't have to canonize</span>
-<span id="L262" class="LineNr">262 </span>    <a href='010vm.cc.html#L124'>type_ordinal</a> base_type = <a href='042name.cc.html#L120'>skip_addresses</a><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>type<span class="Delimiter">);</span>
+<span id="L262" class="LineNr">262 </span>    <a href='010vm.cc.html#L123'>type_ordinal</a> base_type = <a href='042name.cc.html#L120'>skip_addresses</a><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>type<span class="Delimiter">);</span>
 <span id="L263" class="LineNr">263 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// otherwise we'll raise an error elsewhere</span>
-<span id="L264" class="LineNr">264 </span>      inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>base_type<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name<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 id="L264" class="LineNr">264 </span>      inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>base_type<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name<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 id="L265" class="LineNr">265 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;element &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; of type &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is at offset &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L266" class="LineNr">266 </span>    <span class="Delimiter">}</span>
 <span id="L267" class="LineNr">267 </span>  <span class="Delimiter">}</span>
@@ -372,9 +372,9 @@ if ('onhashchange' in window) {
 <span id="L309" class="LineNr">309 </span>  assert<span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)));</span>
 <span id="L310" class="LineNr">310 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name<span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L311" class="LineNr">311 </span>    <span class="Comment">// since first non-address in base type must be an exclusive container, we don't have to canonize</span>
-<span id="L312" class="LineNr">312 </span>    <a href='010vm.cc.html#L124'>type_ordinal</a> base_type = <a href='042name.cc.html#L120'>skip_addresses</a><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>type<span class="Delimiter">);</span>
+<span id="L312" class="LineNr">312 </span>    <a href='010vm.cc.html#L123'>type_ordinal</a> base_type = <a href='042name.cc.html#L120'>skip_addresses</a><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>type<span class="Delimiter">);</span>
 <span id="L313" class="LineNr">313 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// otherwise we'll raise an error elsewhere</span>
-<span id="L314" class="LineNr">314 </span>      inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>base_type<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name<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 id="L314" class="LineNr">314 </span>      inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='042name.cc.html#L133'>find_element_name</a><span class="Delimiter">(</span>base_type<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name<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 id="L315" class="LineNr">315 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;variant &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; of type &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; has tag &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L316" class="LineNr">316 </span>    <span class="Delimiter">}</span>
 <span id="L317" class="LineNr">317 </span>  <span class="Delimiter">}</span>
diff --git a/html/043space.cc.html b/html/043space.cc.html
index efc582f4..60bc5518 100644
--- a/html/043space.cc.html
+++ b/html/043space.cc.html
@@ -127,7 +127,7 @@ if ('onhashchange' in window) {
 <span id="L63" class="LineNr"> 63 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span>
 <span id="L65" class="LineNr"> 65 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;: reagent not initialized: '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L66" class="LineNr"> 66 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">,</span> space_base<span class="Delimiter">(</span>x<span class="Delimiter">)));</span>
+<span id="L66" class="LineNr"> 66 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">,</span> space_base<span class="Delimiter">(</span>x<span class="Delimiter">)));</span>
 <span id="L67" class="LineNr"> 67 </span>  x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
 <span id="L68" class="LineNr"> 68 </span>  assert<span class="Delimiter">(</span><a href='022arithmetic.cc.html#L108'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">));</span>
 <span id="L69" class="LineNr"> 69 </span><span class="Delimiter">}</span>
@@ -241,7 +241,7 @@ if ('onhashchange' in window) {
 <span id="L177" class="LineNr">177 </span><span class="Comment">//   `default-space:space &lt;- new location:type, number-of-locals:literal`</span>
 <span id="L178" class="LineNr">178 </span><span class="Comment">// where N is Name[recipe][&quot;&quot;]</span>
 <span id="L179" class="LineNr">179 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;new-default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L180" class="LineNr">180 </span>  <a href='043space.cc.html#L305'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L180" class="LineNr">180 </span>  <a href='043space.cc.html#L314'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L181" class="LineNr">181 </span><span class="Delimiter">}</span>
 <span id="L182" class="LineNr">182 </span><span class="Delimiter">:(after &quot;Begin Preprocess read_memory(x)&quot;)</span>
 <span id="L183" class="LineNr">183 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;number-of-locals&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -283,7 +283,7 @@ if ('onhashchange' in window) {
 <span id="L219" class="LineNr">219 </span>
 <span id="L220" class="LineNr">220 </span><span class="Delimiter">:(before &quot;End Rewrite Instruction(curr, <a href='010vm.cc.html#L19'>recipe</a> result)&quot;)</span>
 <span id="L221" class="LineNr">221 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;local-scope&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L222" class="LineNr">222 </span>  <a href='043space.cc.html#L305'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L222" class="LineNr">222 </span>  <a href='043space.cc.html#L314'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L223" class="LineNr">223 </span><span class="Delimiter">}</span>
 <span id="L224" class="LineNr">224 </span>
 <span id="L225" class="LineNr">225 </span><span class="Comment">//: todo: do this in a transform, rather than magically in the 'return' instruction</span>
@@ -309,7 +309,7 @@ if ('onhashchange' in window) {
 <span id="L245" class="LineNr">245 </span>      <span class="Comment">// local variables only</span>
 <span id="L246" class="LineNr">246 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>product<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L247" class="LineNr">247 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>product<span class="Delimiter">,</span> <span class="Constant">&quot;raw&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// tests often want to check such locations after they run</span>
-<span id="L248" class="LineNr">248 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L264'>escaping</a><span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L248" class="LineNr">248 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L273'>escaping</a><span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L249" class="LineNr">249 </span>      <span class="Comment">// End Checks For Reclaiming Locals</span>
 <span id="L250" class="LineNr">250 </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">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;clearing &quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L251" class="LineNr">251 </span>      zeros<span class="Delimiter">.</span>resize<span class="Delimiter">(</span>size_of<span class="Delimiter">(</span>product<span class="Delimiter">));</span>
@@ -322,180 +322,189 @@ if ('onhashchange' in window) {
 <span id="L258" class="LineNr">258 </span>          <span class="Comment">/*</span><span class="Comment">refcount</span><span class="Comment">*/</span><span class="Constant">1</span> + <span class="Comment">/*</span><span class="Comment">array length</span><span class="Comment">*/</span><span class="Constant">1</span> + <span class="Comment">/*</span><span class="Comment">number-of-locals</span><span class="Comment">*/</span>Name[r][<span class="Constant">&quot;&quot;</span>]<span class="Delimiter">);</span>
 <span id="L259" class="LineNr">259 </span><span class="Delimiter">}</span>
 <span id="L260" class="LineNr">260 </span>
-<span id="L261" class="LineNr">261 </span><span class="Delimiter">:(code)</span>
-<span id="L262" class="LineNr">262 </span><span class="Comment">// is this reagent one of the values returned by the current (return) instruction?</span>
-<span id="L263" class="LineNr">263 </span><span class="Comment">// is the corresponding ingredient saved in the caller?</span>
-<span id="L264" class="LineNr">264 </span><span class="Normal">bool</span> <a href='043space.cc.html#L264'>escaping</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L265" class="LineNr">265 </span>  assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>  <span class="Comment">// run-time only</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Comment">// nothing escapes when you fall through past end of recipe</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>current_step_index<span class="Delimiter">()</span> &gt;= <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>steps<span class="Delimiter">()))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L268" class="LineNr">268 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">long</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L269" class="LineNr">269 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>r == current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L270" class="LineNr">270 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L295'>caller_uses_product</a><span class="Delimiter">(</span>i<span class="Delimiter">))</span>
-<span id="L271" class="LineNr">271 </span>        <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L272" class="LineNr">272 </span>    <span class="Delimiter">}</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Delimiter">}</span>
-<span id="L274" class="LineNr">274 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L275" class="LineNr">275 </span><span class="Delimiter">}</span>
-<span id="L276" class="LineNr">276 </span>
-<span id="L277" class="LineNr">277 </span><span class="Comment">//: since we don't decrement refcounts for escaping values above, make sure we</span>
-<span id="L278" class="LineNr">278 </span><span class="Comment">//: don't increment them when the caller saves them either</span>
-<span id="L279" class="LineNr">279 </span>
-<span id="L280" class="LineNr">280 </span><span class="Delimiter">:(after &quot;Write Products of Instruction&quot;)</span>
-<span id="L281" class="LineNr">281 </span>Update_refcounts_in_write_memory = <a href='043space.cc.html#L285'>should_update_refcounts_in_write_memory</a><span class="Delimiter">();</span>
-<span id="L282" class="LineNr">282 </span><span class="Delimiter">:(before &quot;End Write Products of Instruction&quot;)</span>
-<span id="L283" class="LineNr">283 </span>Update_refcounts_in_write_memory = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L284" class="LineNr">284 </span><span class="Delimiter">:(code)</span>
-<span id="L285" class="LineNr">285 </span><span class="Normal">bool</span> <a href='043space.cc.html#L285'>should_update_refcounts_in_write_memory</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L286" class="LineNr">286 </span>  <span class="Normal">const</span> instruction&amp; inst = current_instruction<span class="Delimiter">();</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Comment">// End should_update_refcounts_in_write_memory Special-cases For Primitives</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation &lt; <a href='010vm.cc.html#L192'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L289" class="LineNr">289 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Normal">const</span> recipe&amp; callee = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">);</span>
-<span id="L291" class="LineNr">291 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>callee<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L292" class="LineNr">292 </span>  <span class="Identifier">return</span> callee<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>old_name != <span class="Constant">&quot;local-scope&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// callees that call local-scope are already dealt with before return</span>
-<span id="L293" class="LineNr">293 </span><span class="Delimiter">}</span>
-<span id="L294" class="LineNr">294 </span>
-<span id="L295" class="LineNr">295 </span><span class="Normal">bool</span> <a href='043space.cc.html#L295'>caller_uses_product</a><span class="Delimiter">(</span><span class="Normal">int</span> product_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L296" class="LineNr">296 </span>  assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>  <span class="Comment">// run-time only</span>
-<span id="L297" class="LineNr">297 </span>  assert<span class="Delimiter">(</span>!Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>size<span class="Delimiter">()</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Normal">const</span> call&amp; caller = *++Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Normal">const</span> instruction&amp; caller_inst = to_instruction<span class="Delimiter">(</span>caller<span class="Delimiter">);</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>product_index &gt;= <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>caller_inst<span class="Delimiter">.</span>products<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L302" class="LineNr">302 </span>  <span class="Identifier">return</span> !is_dummy<span class="Delimiter">(</span>caller_inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>product_index<span class="Delimiter">));</span>
-<span id="L303" class="LineNr">303 </span><span class="Delimiter">}</span>
-<span id="L304" class="LineNr">304 </span>
-<span id="L305" class="LineNr">305 </span><span class="Normal">void</span> <a href='043space.cc.html#L305'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>instruction&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L307" class="LineNr">307 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; to_original_string<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; can't take any ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L308" class="LineNr">308 </span>  curr<span class="Delimiter">.</span>name = <span class="Constant">&quot;new&quot;</span><span class="Delimiter">;</span>
-<span id="L309" class="LineNr">309 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;location:type</span><span class="Constant">&quot;));</span>
-<span id="L310" class="LineNr">310 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;number-of-locals:literal</span><span class="Constant">&quot;));</span>
-<span id="L311" class="LineNr">311 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L312" class="LineNr">312 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;new-default-space can't take any results</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L313" class="LineNr">313 </span>  curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;default-space:space&quot;</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 local_scope_frees_up_addresses_inside_containers)</span>
-<span id="L317" class="LineNr">317 </span><span class="muData">container</span> foo [
-<span id="L318" class="LineNr">318 </span>  <span class="Normal">x</span>:num
-<span id="L319" class="LineNr">319 </span>  <span class="Normal">y</span>:&amp;:num
-<span id="L320" class="LineNr">320 </span>]
-<span id="L321" class="LineNr">321 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L322" class="LineNr">322 </span>  local-scope
-<span id="L323" class="LineNr">323 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L324" class="LineNr">324 </span>  <span class="Normal">y</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:&amp;:num
-<span id="L325" class="LineNr">325 </span>  <span class="Comment"># x and y are both cleared when main returns</span>
-<span id="L326" class="LineNr">326 </span>]
-<span id="L327" class="LineNr">327 </span><span class="traceContains">+mem: clearing x:&amp;:num</span>
-<span id="L328" class="LineNr">328 </span><span class="traceContains">+mem: decrementing refcount of 1006: 2 -&gt; 1</span>
-<span id="L329" class="LineNr">329 </span><span class="traceContains">+mem: clearing y:foo</span>
-<span id="L330" class="LineNr">330 </span><span class="traceContains">+mem: decrementing refcount of 1006: 1 -&gt; 0</span>
-<span id="L331" class="LineNr">331 </span><span class="traceContains">+mem: automatically abandoning 1006</span>
-<span id="L332" class="LineNr">332 </span>
-<span id="L333" class="LineNr">333 </span><span class="Delimiter">:(scenario local_scope_returns_addresses_inside_containers)</span>
-<span id="L334" class="LineNr">334 </span><span class="muData">container</span> foo [
-<span id="L335" class="LineNr">335 </span>  <span class="Normal">x</span>:num
-<span id="L336" class="LineNr">336 </span>  <span class="Normal">y</span>:&amp;:num
-<span id="L337" class="LineNr">337 </span>]
-<span id="L338" class="LineNr">338 </span><span class="muRecipe">def</span> f [
-<span id="L339" class="LineNr">339 </span>  local-scope
-<span id="L340" class="LineNr">340 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L341" class="LineNr">341 </span>  *x:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Normal">y</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:&amp;:num
-<span id="L343" class="LineNr">343 </span>  <span class="Comment"># since y is 'escaping' f, it should not be cleared</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Identifier">return</span> y:foo
-<span id="L345" class="LineNr">345 </span>]
-<span id="L346" class="LineNr">346 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L347" class="LineNr">347 </span>  <span class="Constant">1</span>:foo<span class="Special"> &lt;- </span>f
-<span id="L348" class="LineNr">348 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
-<span id="L349" class="LineNr">349 </span>  <span class="Constant">4</span>:&amp;:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">y:offset</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Constant">5</span>:num<span class="Special"> &lt;- </span>copy *<span class="Constant">4</span>:&amp;:num
-<span id="L351" class="LineNr">351 </span>  <span class="Constant">1</span>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L218'>put</a> <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">y:offset</span><span class="Delimiter">,</span> <span class="Constant">0</span>
-<span id="L352" class="LineNr">352 </span>  <span class="Constant">4</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
-<span id="L353" class="LineNr">353 </span>]
-<span id="L354" class="LineNr">354 </span><span class="traceContains">+mem: storing 34 in location 1</span>
-<span id="L355" class="LineNr">355 </span><span class="traceContains">+mem: storing 1006 in location 2</span>
-<span id="L356" class="LineNr">356 </span><span class="traceContains">+mem: storing 34 in location 3</span>
-<span id="L357" class="LineNr">357 </span><span class="Comment"># refcount of 1:foo shouldn't include any stray ones from f</span>
-<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: {4: (&quot;address&quot; &quot;number&quot;)} &lt;- get {1: &quot;foo&quot;}, {y: &quot;offset&quot;}</span>
-<span id="L359" class="LineNr">359 </span><span class="traceContains">+mem: incrementing refcount of 1006: 1 -&gt; 2</span>
-<span id="L360" class="LineNr">360 </span><span class="Comment"># 1:foo wasn't abandoned/cleared</span>
-<span id="L361" class="LineNr">361 </span><span class="traceContains">+run: {5: &quot;number&quot;} &lt;- copy {4: (&quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()}</span>
-<span id="L362" class="LineNr">362 </span><span class="traceContains">+mem: storing 12 in location 5</span>
-<span id="L363" class="LineNr">363 </span><span class="traceContains">+run: {1: &quot;foo&quot;} &lt;- <a href='001help.cc.html#L218'>put</a> {1: &quot;foo&quot;}, {y: &quot;offset&quot;}, {0: &quot;literal&quot;}</span>
-<span id="L364" class="LineNr">364 </span><span class="traceContains">+mem: decrementing refcount of 1006: 2 -&gt; 1</span>
-<span id="L365" class="LineNr">365 </span><span class="traceContains">+run: {4: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {0: &quot;literal&quot;}</span>
-<span id="L366" class="LineNr">366 </span><span class="traceContains">+mem: decrementing refcount of 1006: 1 -&gt; 0</span>
-<span id="L367" class="LineNr">367 </span><span class="traceContains">+mem: automatically abandoning 1006</span>
-<span id="L368" class="LineNr">368 </span>
-<span id="L369" class="LineNr">369 </span><span class="Delimiter">:(scenario local_scope_claims_return_values_when_not_saved)</span>
-<span id="L370" class="LineNr">370 </span><span class="muRecipe">def</span> f [
-<span id="L371" class="LineNr">371 </span>  local-scope
-<span id="L372" class="LineNr">372 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
-<span id="L373" class="LineNr">373 </span>  <span class="Identifier">return</span> x:&amp;:num
-<span id="L374" class="LineNr">374 </span>]
-<span id="L375" class="LineNr">375 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L376" class="LineNr">376 </span>  f  <span class="Comment"># doesn't save result</span>
-<span id="L377" class="LineNr">377 </span>]
-<span id="L378" class="LineNr">378 </span><span class="Comment"># x reclaimed</span>
-<span id="L379" class="LineNr">379 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
-<span id="L380" class="LineNr">380 </span><span class="Comment"># f's local scope reclaimed</span>
-<span id="L381" class="LineNr">381 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
-<span id="L382" class="LineNr">382 </span>
-<span id="L383" class="LineNr">383 </span><span class="SalientComment">//:: all recipes must set default-space one way or another</span>
-<span id="L384" class="LineNr">384 </span>
-<span id="L385" class="LineNr">385 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L386" class="LineNr">386 </span><span class="Normal">bool</span> Hide_missing_default_space_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L387" class="LineNr">387 </span><span class="Delimiter">:(before &quot;End Checks&quot;)</span>
-<span id="L388" class="LineNr">388 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>check_default_space<span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
-<span id="L389" class="LineNr">389 </span><span class="Delimiter">:(code)</span>
-<span id="L390" class="LineNr">390 </span><span class="Normal">void</span> check_default_space<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L391" class="LineNr">391 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Hide_missing_default_space_errors<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// skip previous core tests; this is only for Mu code</span>
-<span id="L392" class="LineNr">392 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L393" class="LineNr">393 </span>  <span class="Comment">// End check_default_space Special-cases</span>
-<span id="L394" class="LineNr">394 </span>  <span class="Comment">// assume recipes with only numeric addresses know what they're doing (usually tests)</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_non_special_name<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L396" class="LineNr">396 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check that <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; sets default-space&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L397" class="LineNr">397 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L398" class="LineNr">398 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span>
-<span id="L399" class="LineNr">399 </span>      || caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name != <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L400" class="LineNr">400 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; does not seem to start with default-space or local-scope</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L401" class="LineNr">401 </span>  <span class="Delimiter">}</span>
-<span id="L402" class="LineNr">402 </span><span class="Delimiter">}</span>
-<span id="L403" class="LineNr">403 </span><span class="Delimiter">:(after &quot;Load Mu Prelude&quot;)</span>
-<span id="L404" class="LineNr">404 </span>Hide_missing_default_space_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L405" class="LineNr">405 </span><span class="Delimiter">:(after &quot;Test Runs&quot;)</span>
-<span id="L406" class="LineNr">406 </span>Hide_missing_default_space_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L407" class="LineNr">407 </span><span class="Delimiter">:(after &quot;Running Main&quot;)</span>
-<span id="L408" class="LineNr">408 </span>Hide_missing_default_space_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L409" class="LineNr">409 </span>
-<span id="L410" class="LineNr">410 </span><span class="Delimiter">:(code)</span>
-<span id="L411" class="LineNr">411 </span><span class="Normal">bool</span> contains_non_special_name<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L412" class="LineNr">412 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;::iterator p = Name[r]<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Name[r]<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="L413" class="LineNr">413 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L414" class="LineNr">414 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;stash_&quot;</span><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// generated by rewrite_stashes_to_text (cross-layer)</span>
-<span id="L415" class="LineNr">415 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_special_name<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span>
-<span id="L416" class="LineNr">416 </span>      <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L417" class="LineNr">417 </span>  <span class="Delimiter">}</span>
-<span id="L418" class="LineNr">418 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><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="Comment">// reagent comparison -- only between reagents in a single recipe</span>
-<span id="L422" class="LineNr">422 </span><span class="Normal">bool</span> <span class="Normal">operator</span>==<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L423" class="LineNr">423 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>name != b<span class="Delimiter">.</span>name<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L424" class="LineNr">424 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)</span> != property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L425" class="LineNr">425 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L426" class="LineNr">426 </span><span class="Delimiter">}</span>
-<span id="L427" class="LineNr">427 </span>
-<span id="L428" class="LineNr">428 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L429" class="LineNr">429 </span>  <span class="Normal">int</span> aspace = <span class="Constant">0</span><span class="Delimiter">,</span> bspace = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L430" class="LineNr">430 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> aspace = <a href='002test.cc.html#L92'>to_integer</a><span class="Delimiter">(</span>property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L431" class="LineNr">431 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> bspace = <a href='002test.cc.html#L92'>to_integer</a><span class="Delimiter">(</span>property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L432" class="LineNr">432 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>aspace != bspace<span class="Delimiter">)</span> <span class="Identifier">return</span> aspace &lt; bspace<span class="Delimiter">;</span>
-<span id="L433" class="LineNr">433 </span>  <span class="Identifier">return</span> a<span class="Delimiter">.</span>name &lt; b<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
-<span id="L434" class="LineNr">434 </span><span class="Delimiter">}</span>
+<span id="L261" class="LineNr">261 </span><span class="Comment">//: Reclaiming local variables above requires remembering what name an</span>
+<span id="L262" class="LineNr">262 </span><span class="Comment">//: instruction had before any rewrites or transforms.</span>
+<span id="L263" class="LineNr">263 </span><span class="Delimiter">:(before &quot;End <a href='010vm.cc.html#L32'>instruction</a> Fields&quot;)</span>
+<span id="L264" class="LineNr">264 </span>string old_name<span class="Delimiter">;</span>
+<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(before &quot;End <a href='010vm.cc.html#L32'>instruction</a> Clear&quot;)</span>
+<span id="L266" class="LineNr">266 </span>old_name<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L267" class="LineNr">267 </span><span class="Delimiter">:(before &quot;End next_instruction(curr)&quot;)</span>
+<span id="L268" class="LineNr">268 </span>curr<span class="Delimiter">-&gt;</span>old_name = curr<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>  <span class="Comment">// before rewrite rules modify it</span>
+<span id="L269" class="LineNr">269 </span>
+<span id="L270" class="LineNr">270 </span><span class="Delimiter">:(code)</span>
+<span id="L271" class="LineNr">271 </span><span class="Comment">// is this reagent one of the values returned by the current (return) instruction?</span>
+<span id="L272" class="LineNr">272 </span><span class="Comment">// is the corresponding ingredient saved in the caller?</span>
+<span id="L273" class="LineNr">273 </span><span class="Normal">bool</span> <a href='043space.cc.html#L273'>escaping</a><span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L274" class="LineNr">274 </span>  assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>  <span class="Comment">// run-time only</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Comment">// nothing escapes when you fall through past end of recipe</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>current_step_index<span class="Delimiter">()</span> &gt;= <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>steps<span class="Delimiter">()))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L277" class="LineNr">277 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">long</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L278" class="LineNr">278 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>r == current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L279" class="LineNr">279 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L304'>caller_uses_product</a><span class="Delimiter">(</span>i<span class="Delimiter">))</span>
+<span id="L280" class="LineNr">280 </span>        <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span>    <span class="Delimiter">}</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Delimiter">}</span>
+<span id="L283" class="LineNr">283 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L284" class="LineNr">284 </span><span class="Delimiter">}</span>
+<span id="L285" class="LineNr">285 </span>
+<span id="L286" class="LineNr">286 </span><span class="Comment">//: since we don't decrement refcounts for escaping values above, make sure we</span>
+<span id="L287" class="LineNr">287 </span><span class="Comment">//: don't increment them when the caller saves them either</span>
+<span id="L288" class="LineNr">288 </span>
+<span id="L289" class="LineNr">289 </span><span class="Delimiter">:(after &quot;Write Products of Instruction&quot;)</span>
+<span id="L290" class="LineNr">290 </span>Update_refcounts_in_write_memory = <a href='043space.cc.html#L294'>should_update_refcounts_in_write_memory</a><span class="Delimiter">();</span>
+<span id="L291" class="LineNr">291 </span><span class="Delimiter">:(before &quot;End Write Products of Instruction&quot;)</span>
+<span id="L292" class="LineNr">292 </span>Update_refcounts_in_write_memory = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </span><span class="Delimiter">:(code)</span>
+<span id="L294" class="LineNr">294 </span><span class="Normal">bool</span> <a href='043space.cc.html#L294'>should_update_refcounts_in_write_memory</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Normal">const</span> instruction&amp; inst = current_instruction<span class="Delimiter">();</span>
+<span id="L296" class="LineNr">296 </span>  <span class="Comment">// End should_update_refcounts_in_write_memory Special-cases For Primitives</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation &lt; <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Normal">const</span> recipe&amp; callee = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">);</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>callee<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Identifier">return</span> callee<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>old_name != <span class="Constant">&quot;local-scope&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// callees that call local-scope are already dealt with before return</span>
+<span id="L302" class="LineNr">302 </span><span class="Delimiter">}</span>
+<span id="L303" class="LineNr">303 </span>
+<span id="L304" class="LineNr">304 </span><span class="Normal">bool</span> <a href='043space.cc.html#L304'>caller_uses_product</a><span class="Delimiter">(</span><span class="Normal">int</span> product_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L305" class="LineNr">305 </span>  assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>  <span class="Comment">// run-time only</span>
+<span id="L306" class="LineNr">306 </span>  assert<span class="Delimiter">(</span>!Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>size<span class="Delimiter">()</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Normal">const</span> call&amp; caller = *++Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
+<span id="L309" class="LineNr">309 </span>  <span class="Normal">const</span> instruction&amp; caller_inst = to_instruction<span class="Delimiter">(</span>caller<span class="Delimiter">);</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>product_index &gt;= <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>caller_inst<span class="Delimiter">.</span>products<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Identifier">return</span> !is_dummy<span class="Delimiter">(</span>caller_inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>product_index<span class="Delimiter">));</span>
+<span id="L312" class="LineNr">312 </span><span class="Delimiter">}</span>
+<span id="L313" class="LineNr">313 </span>
+<span id="L314" class="LineNr">314 </span><span class="Normal">void</span> <a href='043space.cc.html#L314'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>instruction&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
+<span id="L316" class="LineNr">316 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; to_original_string<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; can't take any ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L317" class="LineNr">317 </span>  curr<span class="Delimiter">.</span>name = <span class="Constant">&quot;new&quot;</span><span class="Delimiter">;</span>
+<span id="L318" class="LineNr">318 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;location:type</span><span class="Constant">&quot;));</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;number-of-locals:literal</span><span class="Constant">&quot;));</span>
+<span id="L320" class="LineNr">320 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
+<span id="L321" class="LineNr">321 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;new-default-space can't take any results</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L322" class="LineNr">322 </span>  curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;default-space:space&quot;</span><span class="Delimiter">));</span>
+<span id="L323" class="LineNr">323 </span><span class="Delimiter">}</span>
+<span id="L324" class="LineNr">324 </span>
+<span id="L325" class="LineNr">325 </span><span class="Delimiter">:(scenario local_scope_frees_up_addresses_inside_containers)</span>
+<span id="L326" class="LineNr">326 </span><span class="muData">container</span> foo [
+<span id="L327" class="LineNr">327 </span>  <span class="Normal">x</span>:num
+<span id="L328" class="LineNr">328 </span>  <span class="Normal">y</span>:&amp;:num
+<span id="L329" class="LineNr">329 </span>]
+<span id="L330" class="LineNr">330 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L331" class="LineNr">331 </span>  local-scope
+<span id="L332" class="LineNr">332 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L333" class="LineNr">333 </span>  <span class="Normal">y</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:&amp;:num
+<span id="L334" class="LineNr">334 </span>  <span class="Comment"># x and y are both cleared when main returns</span>
+<span id="L335" class="LineNr">335 </span>]
+<span id="L336" class="LineNr">336 </span><span class="traceContains">+mem: clearing x:&amp;:num</span>
+<span id="L337" class="LineNr">337 </span><span class="traceContains">+mem: decrementing refcount of 1006: 2 -&gt; 1</span>
+<span id="L338" class="LineNr">338 </span><span class="traceContains">+mem: clearing y:foo</span>
+<span id="L339" class="LineNr">339 </span><span class="traceContains">+mem: decrementing refcount of 1006: 1 -&gt; 0</span>
+<span id="L340" class="LineNr">340 </span><span class="traceContains">+mem: automatically abandoning 1006</span>
+<span id="L341" class="LineNr">341 </span>
+<span id="L342" class="LineNr">342 </span><span class="Delimiter">:(scenario local_scope_returns_addresses_inside_containers)</span>
+<span id="L343" class="LineNr">343 </span><span class="muData">container</span> foo [
+<span id="L344" class="LineNr">344 </span>  <span class="Normal">x</span>:num
+<span id="L345" class="LineNr">345 </span>  <span class="Normal">y</span>:&amp;:num
+<span id="L346" class="LineNr">346 </span>]
+<span id="L347" class="LineNr">347 </span><span class="muRecipe">def</span> f [
+<span id="L348" class="LineNr">348 </span>  local-scope
+<span id="L349" class="LineNr">349 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L350" class="LineNr">350 </span>  *x:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">12</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Normal">y</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:&amp;:num
+<span id="L352" class="LineNr">352 </span>  <span class="Comment"># since y is 'escaping' f, it should not be cleared</span>
+<span id="L353" class="LineNr">353 </span>  <span class="Identifier">return</span> y:foo
+<span id="L354" class="LineNr">354 </span>]
+<span id="L355" class="LineNr">355 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L356" class="LineNr">356 </span>  <span class="Constant">1</span>:foo<span class="Special"> &lt;- </span>f
+<span id="L357" class="LineNr">357 </span>  <span class="Constant">3</span>:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Constant">4</span>:&amp;:num<span class="Special"> &lt;- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">y:offset</span>
+<span id="L359" class="LineNr">359 </span>  <span class="Constant">5</span>:num<span class="Special"> &lt;- </span>copy *<span class="Constant">4</span>:&amp;:num
+<span id="L360" class="LineNr">360 </span>  <span class="Constant">1</span>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L218'>put</a> <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">y:offset</span><span class="Delimiter">,</span> <span class="Constant">0</span>
+<span id="L361" class="LineNr">361 </span>  <span class="Constant">4</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L362" class="LineNr">362 </span>]
+<span id="L363" class="LineNr">363 </span><span class="traceContains">+mem: storing 34 in location 1</span>
+<span id="L364" class="LineNr">364 </span><span class="traceContains">+mem: storing 1006 in location 2</span>
+<span id="L365" class="LineNr">365 </span><span class="traceContains">+mem: storing 34 in location 3</span>
+<span id="L366" class="LineNr">366 </span><span class="Comment"># refcount of 1:foo shouldn't include any stray ones from f</span>
+<span id="L367" class="LineNr">367 </span><span class="traceContains">+run: {4: (&quot;address&quot; &quot;number&quot;)} &lt;- get {1: &quot;foo&quot;}, {y: &quot;offset&quot;}</span>
+<span id="L368" class="LineNr">368 </span><span class="traceContains">+mem: incrementing refcount of 1006: 1 -&gt; 2</span>
+<span id="L369" class="LineNr">369 </span><span class="Comment"># 1:foo wasn't abandoned/cleared</span>
+<span id="L370" class="LineNr">370 </span><span class="traceContains">+run: {5: &quot;number&quot;} &lt;- copy {4: (&quot;address&quot; &quot;number&quot;), &quot;lookup&quot;: ()}</span>
+<span id="L371" class="LineNr">371 </span><span class="traceContains">+mem: storing 12 in location 5</span>
+<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: {1: &quot;foo&quot;} &lt;- <a href='001help.cc.html#L218'>put</a> {1: &quot;foo&quot;}, {y: &quot;offset&quot;}, {0: &quot;literal&quot;}</span>
+<span id="L373" class="LineNr">373 </span><span class="traceContains">+mem: decrementing refcount of 1006: 2 -&gt; 1</span>
+<span id="L374" class="LineNr">374 </span><span class="traceContains">+run: {4: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {0: &quot;literal&quot;}</span>
+<span id="L375" class="LineNr">375 </span><span class="traceContains">+mem: decrementing refcount of 1006: 1 -&gt; 0</span>
+<span id="L376" class="LineNr">376 </span><span class="traceContains">+mem: automatically abandoning 1006</span>
+<span id="L377" class="LineNr">377 </span>
+<span id="L378" class="LineNr">378 </span><span class="Delimiter">:(scenario local_scope_claims_return_values_when_not_saved)</span>
+<span id="L379" class="LineNr">379 </span><span class="muRecipe">def</span> f [
+<span id="L380" class="LineNr">380 </span>  local-scope
+<span id="L381" class="LineNr">381 </span>  <span class="Normal">x</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Identifier">return</span> x:&amp;:num
+<span id="L383" class="LineNr">383 </span>]
+<span id="L384" class="LineNr">384 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L385" class="LineNr">385 </span>  f  <span class="Comment"># doesn't save result</span>
+<span id="L386" class="LineNr">386 </span>]
+<span id="L387" class="LineNr">387 </span><span class="Comment"># x reclaimed</span>
+<span id="L388" class="LineNr">388 </span><span class="traceContains">+mem: automatically abandoning 1004</span>
+<span id="L389" class="LineNr">389 </span><span class="Comment"># f's local scope reclaimed</span>
+<span id="L390" class="LineNr">390 </span><span class="traceContains">+mem: automatically abandoning 1000</span>
+<span id="L391" class="LineNr">391 </span>
+<span id="L392" class="LineNr">392 </span><span class="SalientComment">//:: all recipes must set default-space one way or another</span>
+<span id="L393" class="LineNr">393 </span>
+<span id="L394" class="LineNr">394 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L395" class="LineNr">395 </span><span class="Normal">bool</span> Hide_missing_default_space_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L396" class="LineNr">396 </span><span class="Delimiter">:(before &quot;End Checks&quot;)</span>
+<span id="L397" class="LineNr">397 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>check_default_space<span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
+<span id="L398" class="LineNr">398 </span><span class="Delimiter">:(code)</span>
+<span id="L399" class="LineNr">399 </span><span class="Normal">void</span> check_default_space<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L400" class="LineNr">400 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Hide_missing_default_space_errors<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// skip previous core tests; this is only for Mu code</span>
+<span id="L401" class="LineNr">401 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
+<span id="L402" class="LineNr">402 </span>  <span class="Comment">// End check_default_space Special-cases</span>
+<span id="L403" class="LineNr">403 </span>  <span class="Comment">// assume recipes with only numeric addresses know what they're doing (usually tests)</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_non_special_name<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L405" class="LineNr">405 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check that <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; sets default-space&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L406" class="LineNr">406 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L407" class="LineNr">407 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span>
+<span id="L408" class="LineNr">408 </span>      || caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name != <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L409" class="LineNr">409 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; does not seem to start with default-space or local-scope</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
+<span id="L410" class="LineNr">410 </span>  <span class="Delimiter">}</span>
+<span id="L411" class="LineNr">411 </span><span class="Delimiter">}</span>
+<span id="L412" class="LineNr">412 </span><span class="Delimiter">:(after &quot;Load Mu Prelude&quot;)</span>
+<span id="L413" class="LineNr">413 </span>Hide_missing_default_space_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L414" class="LineNr">414 </span><span class="Delimiter">:(after &quot;Test Runs&quot;)</span>
+<span id="L415" class="LineNr">415 </span>Hide_missing_default_space_errors = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L416" class="LineNr">416 </span><span class="Delimiter">:(after &quot;Running Main&quot;)</span>
+<span id="L417" class="LineNr">417 </span>Hide_missing_default_space_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L418" class="LineNr">418 </span>
+<span id="L419" class="LineNr">419 </span><span class="Delimiter">:(code)</span>
+<span id="L420" class="LineNr">420 </span><span class="Normal">bool</span> contains_non_special_name<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L421" class="LineNr">421 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;::iterator p = Name[r]<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Name[r]<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="L422" class="LineNr">422 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L423" class="LineNr">423 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;stash_&quot;</span><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// generated by rewrite_stashes_to_text (cross-layer)</span>
+<span id="L424" class="LineNr">424 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_special_name<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span>
+<span id="L425" class="LineNr">425 </span>      <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L426" class="LineNr">426 </span>  <span class="Delimiter">}</span>
+<span id="L427" class="LineNr">427 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L428" class="LineNr">428 </span><span class="Delimiter">}</span>
+<span id="L429" class="LineNr">429 </span>
+<span id="L430" class="LineNr">430 </span><span class="Comment">// reagent comparison -- only between reagents in a single recipe</span>
+<span id="L431" class="LineNr">431 </span><span class="Normal">bool</span> <span class="Normal">operator</span>==<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L432" class="LineNr">432 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">.</span>name != b<span class="Delimiter">.</span>name<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L433" class="LineNr">433 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)</span> != property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L434" class="LineNr">434 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L435" class="LineNr">435 </span><span class="Delimiter">}</span>
+<span id="L436" class="LineNr">436 </span>
+<span id="L437" class="LineNr">437 </span><span class="Normal">bool</span> <span class="Normal">operator</span>&lt;<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> reagent&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L438" class="LineNr">438 </span>  <span class="Normal">int</span> aspace = <span class="Constant">0</span><span class="Delimiter">,</span> bspace = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L439" class="LineNr">439 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> aspace = <a href='002test.cc.html#L92'>to_integer</a><span class="Delimiter">(</span>property<span class="Delimiter">(</span>a<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L440" class="LineNr">440 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> bspace = <a href='002test.cc.html#L92'>to_integer</a><span class="Delimiter">(</span>property<span class="Delimiter">(</span>b<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)-&gt;</span>value<span class="Delimiter">);</span>
+<span id="L441" class="LineNr">441 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>aspace != bspace<span class="Delimiter">)</span> <span class="Identifier">return</span> aspace &lt; bspace<span class="Delimiter">;</span>
+<span id="L442" class="LineNr">442 </span>  <span class="Identifier">return</span> a<span class="Delimiter">.</span>name &lt; b<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
+<span id="L443" class="LineNr">443 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html
index e96df0bc..94cfcdae 100644
--- a/html/050scenario.cc.html
+++ b/html/050scenario.cc.html
@@ -155,7 +155,7 @@ if ('onhashchange' in window) {
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(code)</span>
 <span id="L91" class="LineNr"> 91 </span><span class="muScenario"><a href='050scenario.cc.html#L57'>scenario</a></span> <a href='050scenario.cc.html#L91'>parse_scenario</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L92" class="LineNr"> 92 </span>  <a href='050scenario.cc.html#L57'>scenario</a> result<span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span>  result<span class="Delimiter">.</span>name = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>  result<span class="Delimiter">.</span>name = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L94" class="LineNr"> 94 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Scenario_names<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">))</span>
 <span id="L95" class="LineNr"> 95 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;duplicate <a href='050scenario.cc.html#L57'>scenario</a> name: '&quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L96" class="LineNr"> 96 </span>  Scenario_names<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
@@ -164,7 +164,7 @@ if ('onhashchange' in window) {
 <span id="L99" class="LineNr"> 99 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='050scenario.cc.html#L57'>scenario</a> at <a href='003trace.cc.html#L195'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L100" class="LineNr">100 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Delimiter">}</span>
-<span id="L102" class="LineNr">102 </span>  <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L102" class="LineNr">102 </span>  <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L103" class="LineNr">103 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L104" class="LineNr">104 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;Expected '[' after <a href='050scenario.cc.html#L57'>scenario</a> '&quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L105" class="LineNr">105 </span>    exit<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
@@ -462,9 +462,9 @@ if ('onhashchange' in window) {
 <span id="L397" class="LineNr">397 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
 <span id="L398" class="LineNr">398 </span>  set&lt;<span class="Normal">int</span>&gt; locations_checked<span class="Delimiter">;</span>
 <span id="L399" class="LineNr">399 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L400" class="LineNr">400 </span>    <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L400" class="LineNr">400 </span>    <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L401" class="LineNr">401 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L402" class="LineNr">402 </span>    string lhs = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L402" class="LineNr">402 </span>    string lhs = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L403" class="LineNr">403 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>lhs<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L404" class="LineNr">404 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L405" class="LineNr">405 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L195'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -475,10 +475,10 @@ if ('onhashchange' in window) {
 <span id="L410" class="LineNr">410 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L411" class="LineNr">411 </span>    <span class="Delimiter">}</span>
 <span id="L412" class="LineNr">412 </span>    <span class="Normal">int</span> <a href='043space.cc.html#L76'>address</a> = <a href='002test.cc.html#L92'>to_integer</a><span class="Delimiter">(</span>lhs<span class="Delimiter">);</span>
-<span id="L413" class="LineNr">413 </span>    <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L413" class="LineNr">413 </span>    <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L414" class="LineNr">414 </span>    string _assign<span class="Delimiter">;</span>  in &gt;&gt; _assign<span class="Delimiter">;</span>  assert<span class="Delimiter">(</span>_assign == <span class="Constant">&quot;&lt;-&quot;</span><span class="Delimiter">);</span>
-<span id="L415" class="LineNr">415 </span>    <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L416" class="LineNr">416 </span>    string rhs = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L415" class="LineNr">415 </span>    <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L416" class="LineNr">416 </span>    string rhs = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L417" class="LineNr">417 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>rhs<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L418" class="LineNr">418 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L419" class="LineNr">419 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L195'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -517,17 +517,17 @@ if ('onhashchange' in window) {
 <span id="L452" class="LineNr">452 </span><span class="Normal">void</span> <a href='047check_type_by_name.cc.html#L49'>check_type</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; lhs<span class="Delimiter">,</span> istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L453" class="LineNr">453 </span>  reagent x<span class="Delimiter">(</span>lhs<span class="Delimiter">);</span>
 <span id="L454" class="LineNr">454 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_array<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &amp;&amp; is_mu_character<span class="Delimiter">(</span><a href='032array.cc.html#L370'>array_element</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L455" class="LineNr">455 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='002test.cc.html#L92'>to_integer</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
-<span id="L456" class="LineNr">456 </span>    <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L457" class="LineNr">457 </span>    string _assign = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L455" class="LineNr">455 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='002test.cc.html#L92'>to_integer</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
+<span id="L456" class="LineNr">456 </span>    <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L457" class="LineNr">457 </span>    string _assign = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L458" class="LineNr">458 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>_assign<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L459" class="LineNr">459 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L460" class="LineNr">460 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L195'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L461" class="LineNr">461 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L462" class="LineNr">462 </span>    <span class="Delimiter">}</span>
 <span id="L463" class="LineNr">463 </span>    assert<span class="Delimiter">(</span>_assign == <span class="Constant">&quot;&lt;-&quot;</span><span class="Delimiter">);</span>
-<span id="L464" class="LineNr">464 </span>    <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L465" class="LineNr">465 </span>    string literal = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L464" class="LineNr">464 </span>    <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L465" class="LineNr">465 </span>    string literal = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L466" class="LineNr">466 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>literal<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L467" class="LineNr">467 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L468" class="LineNr">468 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L195'>end</a> of file (3)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -905,8 +905,8 @@ if ('onhashchange' in window) {
 <span id="L840" class="LineNr">840 </span>  Scenario_names<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L841" class="LineNr">841 </span>  istringstream in<span class="Delimiter">(</span>form<span class="Delimiter">);</span>
 <span id="L842" class="LineNr">842 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
-<span id="L843" class="LineNr">843 </span>  <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L844" class="LineNr">844 </span>  string _scenario = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L843" class="LineNr">843 </span>  <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L844" class="LineNr">844 </span>  string _scenario = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L845" class="LineNr">845 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>_scenario<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L846" class="LineNr">846 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L847" class="LineNr">847 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;no <a href='050scenario.cc.html#L57'>scenario</a> in string passed into run_mu_scenario()</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
diff --git a/html/052tangle.cc.html b/html/052tangle.cc.html
index add6b6e7..4f0b26a4 100644
--- a/html/052tangle.cc.html
+++ b/html/052tangle.cc.html
@@ -103,7 +103,7 @@ if ('onhashchange' in window) {
 <span id="L41" class="LineNr"> 41 </span>
 <span id="L42" class="LineNr"> 42 </span><span class="Delimiter">:(before &quot;End Command Handlers&quot;)</span>
 <span id="L43" class="LineNr"> 43 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>command == <span class="Constant">&quot;before&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L44" class="LineNr"> 44 </span>  string label = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L44" class="LineNr"> 44 </span>  string label = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L46" class="LineNr"> 46 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L47" class="LineNr"> 47 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'before' block at <a href='003trace.cc.html#L195'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -118,7 +118,7 @@ if ('onhashchange' in window) {
 <span id="L56" class="LineNr"> 56 </span>  <span class="Comment">// End before Command Handler</span>
 <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">}</span>
 <span id="L58" class="LineNr"> 58 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>command == <span class="Constant">&quot;after&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L59" class="LineNr"> 59 </span>  string label = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L59" class="LineNr"> 59 </span>  string label = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L61" class="LineNr"> 61 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L62" class="LineNr"> 62 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'after' block at <a href='003trace.cc.html#L195'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
diff --git a/html/053recipe_header.cc.html b/html/053recipe_header.cc.html
index da12865f..db023d6e 100644
--- a/html/053recipe_header.cc.html
+++ b/html/053recipe_header.cc.html
@@ -96,7 +96,7 @@ if ('onhashchange' in window) {
 <span id="L32" class="LineNr"> 32 </span><span class="Normal">void</span> <a href='053recipe_header.cc.html#L32'>load_recipe_header</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">,</span> recipe&amp; result<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L33" class="LineNr"> 33 </span>  result<span class="Delimiter">.</span>has_header = <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L34" class="LineNr"> 34 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'['</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L35" class="LineNr"> 35 </span>    string s = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L35" class="LineNr"> 35 </span>    string s = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L36" class="LineNr"> 36 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L37" class="LineNr"> 37 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L38" class="LineNr"> 38 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> header at <a href='003trace.cc.html#L195'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -110,7 +110,7 @@ if ('onhashchange' in window) {
 <span id="L46" class="LineNr"> 46 </span>    skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Delimiter">}</span>
 <span id="L48" class="LineNr"> 48 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L235'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'['</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L49" class="LineNr"> 49 </span>    string s = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L49" class="LineNr"> 49 </span>    string s = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L50" class="LineNr"> 50 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L51" class="LineNr"> 51 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L52" class="LineNr"> 52 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> header at <a href='003trace.cc.html#L195'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -355,7 +355,7 @@ if ('onhashchange' in window) {
 <span id="L291" class="LineNr">291 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- type-check calls inside <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L292" class="LineNr">292 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L293" class="LineNr">293 </span>    <span class="Normal">const</span> instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L294" class="LineNr">294 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation &lt; <a href='010vm.cc.html#L192'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L294" class="LineNr">294 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation &lt; <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L295" class="LineNr">295 </span>    <span class="Normal">const</span> recipe&amp; callee = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">);</span>
 <span id="L296" class="LineNr">296 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!callee<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L297" class="LineNr">297 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<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> <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
diff --git a/html/054static_dispatch.cc.html b/html/054static_dispatch.cc.html
index b31daf29..3248f049 100644
--- a/html/054static_dispatch.cc.html
+++ b/html/054static_dispatch.cc.html
@@ -260,7 +260,7 @@ if ('onhashchange' in window) {
 <span id="L197" class="LineNr">197 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> best_variant<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> candidates<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
 <span id="L198" class="LineNr">198 </span>
 <span id="L199" class="LineNr">199 </span>  <span class="Comment">// error messages</span>
-<span id="L200" class="LineNr">200 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &gt;= <a href='010vm.cc.html#L192'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// we currently don't check types for primitive variants</span>
+<span id="L200" class="LineNr">200 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &gt;= <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// we currently don't check types for primitive variants</span>
 <span id="L201" class="LineNr">201 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to find a matching call for '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L202" class="LineNr">202 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>list&lt;call&gt;::iterator p = <span class="Comment">/*</span><span class="Comment">skip</span><span class="Comment">*/</span>++Resolve_stack<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Resolve_stack<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="L203" class="LineNr">203 </span>      <span class="Normal">const</span> recipe&amp; specializer_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">);</span>
diff --git a/html/055shape_shifting_container.cc.html b/html/055shape_shifting_container.cc.html
index fb41b269..d0d61c1d 100644
--- a/html/055shape_shifting_container.cc.html
+++ b/html/055shape_shifting_container.cc.html
@@ -620,11 +620,11 @@ if ('onhashchange' in window) {
 <span id="L556" class="LineNr">556 </span><span class="Delimiter">:(before &quot;End compute_container_sizes Non-atom Special-cases&quot;)</span>
 <span id="L557" class="LineNr">557 </span><span class="Normal">const</span> type_tree* root = get_base_type<span class="Delimiter">(</span>type<span class="Delimiter">);</span>
 <span id="L558" class="LineNr">558 </span>type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> root<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L559" class="LineNr">559 </span><span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L559" class="LineNr">559 </span><span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L560" class="LineNr">560 </span>  compute_container_sizes<span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> pending_metadata<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L561" class="LineNr">561 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L562" class="LineNr">562 </span><span class="Delimiter">}</span>
-<span id="L563" class="LineNr">563 </span><span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L563" class="LineNr">563 </span><span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L564" class="LineNr">564 </span>  <a href='033exclusive_container.cc.html#L44'>compute_exclusive_container_sizes</a><span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> pending_metadata<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L565" class="LineNr">565 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L566" class="LineNr">566 </span><span class="Delimiter">}</span>
@@ -680,12 +680,12 @@ if ('onhashchange' in window) {
 <span id="L616" class="LineNr">616 </span><span class="Delimiter">:(before &quot;End compute_container_address_offsets Non-atom Special-cases&quot;)</span>
 <span id="L617" class="LineNr">617 </span><span class="Normal">const</span> type_tree* root = get_base_type<span class="Delimiter">(</span>type<span class="Delimiter">);</span>
 <span id="L618" class="LineNr">618 </span>type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> root<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
-<span id="L619" class="LineNr">619 </span><span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L619" class="LineNr">619 </span><span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L620" class="LineNr">620 </span>  compute_container_address_offsets<span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L621" class="LineNr">621 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L622" class="LineNr">622 </span><span class="Delimiter">}</span>
-<span id="L623" class="LineNr">623 </span><span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L624" class="LineNr">624 </span>  <a href='036refcount.cc.html#L342'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
+<span id="L623" class="LineNr">623 </span><span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind == <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L624" class="LineNr">624 </span>  <a href='036refcount.cc.html#L348'>compute_exclusive_container_address_offsets</a><span class="Delimiter">(</span>info<span class="Delimiter">,</span> type<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L625" class="LineNr">625 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L626" class="LineNr">626 </span><span class="Delimiter">}</span>
 <span id="L627" class="LineNr">627 </span>
diff --git a/html/056shape_shifting_recipe.cc.html b/html/056shape_shifting_recipe.cc.html
index 2c19f2bb..3896e1e9 100644
--- a/html/056shape_shifting_recipe.cc.html
+++ b/html/056shape_shifting_recipe.cc.html
@@ -147,7 +147,7 @@ if ('onhashchange' in window) {
 <span id="L82" class="LineNr">  82 </span><span class="Comment">//: recipes can be called</span>
 <span id="L83" class="LineNr">  83 </span>
 <span id="L84" class="LineNr">  84 </span><span class="Delimiter">:(before &quot;End Instruction Operation Checks&quot;)</span>
-<span id="L85" class="LineNr">  85 </span><span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">)</span> &amp;&amp; inst<span class="Delimiter">.</span>operation &gt;= <a href='010vm.cc.html#L192'>MAX_PRIMITIVE_RECIPES</a>
+<span id="L85" class="LineNr">  85 </span><span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">)</span> &amp;&amp; inst<span class="Delimiter">.</span>operation &gt;= <a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a>
 <span id="L86" class="LineNr">  86 </span>    &amp;&amp; <a href='056shape_shifting_recipe.cc.html#L157'>any_type_ingredient_in_header</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L87" class="LineNr">  87 </span>  <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has no valid specialization</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L88" class="LineNr">  88 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
diff --git a/html/057immutable.cc.html b/html/057immutable.cc.html
index 94bbc350..9876e93f 100644
--- a/html/057immutable.cc.html
+++ b/html/057immutable.cc.html
@@ -428,7 +428,7 @@ if ('onhashchange' in window) {
 <span id="L366" class="LineNr">366 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L367" class="LineNr">367 </span>    <span class="Comment">// primitive recipe</span>
 <span id="L368" class="LineNr">368 </span>    <span class="Normal">switch</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L369" class="LineNr">369 </span>      <span class="Normal">case</span> <a href='010vm.cc.html#L190'>COPY</a>:
+<span id="L369" class="LineNr">369 </span>      <span class="Normal">case</span> <a href='010vm.cc.html#L189'>COPY</a>:
 <span id="L370" class="LineNr">370 </span>        <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;<span class="Normal">int</span>&gt;::iterator p = current_ingredient_indices<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != current_ingredient_indices<span class="Delimiter">.</span><a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
 <span id="L371" class="LineNr">371 </span>          current_ingredient_and_aliases<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>*p<span class="Delimiter">).</span>name<span class="Delimiter">);</span>
 <span id="L372" class="LineNr">372 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/069hash.cc.html b/html/069hash.cc.html
index ae67a728..1d97969e 100644
--- a/html/069hash.cc.html
+++ b/html/069hash.cc.html
@@ -119,10 +119,10 @@ if ('onhashchange' in window) {
 <span id="L56" class="LineNr"> 56 </span><span class="Normal">size_t</span> <a href='069hash.cc.html#L56'>hash_mu_address</a><span class="Delimiter">(</span><span class="Normal">size_t</span> h<span class="Delimiter">,</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L58" class="LineNr"> 58 </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">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; 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> r<span class="Delimiter">.</span>value<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L59" class="LineNr"> 59 </span>  r<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> r<span class="Delimiter">.</span>value<span class="Delimiter">));</span>
+<span id="L59" class="LineNr"> 59 </span>  r<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> r<span class="Delimiter">.</span>value<span class="Delimiter">));</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>value != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L61" class="LineNr"> 61 </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">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;skipping refcount at &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
-<span id="L62" class="LineNr"> 62 </span>    r<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>value+<span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">// skip refcount</span>
+<span id="L62" class="LineNr"> 62 </span>    r<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>value+<span class="Constant">1</span><span class="Delimiter">);</span>  <span class="Comment">// skip refcount</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Delimiter">}</span>
 <span id="L64" class="LineNr"> 64 </span>  drop_from_type<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">);</span>
 <span id="L65" class="LineNr"> 65 </span>  <span class="Identifier">return</span> <a href='069hash.cc.html#L34'>hash</a><span class="Delimiter">(</span>h<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
@@ -144,7 +144,7 @@ if ('onhashchange' in window) {
 <span id="L81" class="LineNr"> 81 </span>  elem<span class="Delimiter">.</span>type = <a href='032array.cc.html#L366'>copy_array_element</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L82" class="LineNr"> 82 </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> <a href='043space.cc.html#L76'>address</a> = r<span class="Delimiter">.</span>value+<span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; size<span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> <a href='043space.cc.html#L76'>address</a> += size_of<span class="Delimiter">(</span>elem<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L83" class="LineNr"> 83 </span>    reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> tmp = elem<span class="Delimiter">;</span>
-<span id="L84" class="LineNr"> 84 </span>    tmp<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span>    tmp<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a><span class="Delimiter">);</span>
 <span id="L85" class="LineNr"> 85 </span>    h = <a href='069hash.cc.html#L34'>hash</a><span class="Delimiter">(</span>h<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>
 <span id="L86" class="LineNr"> 86 </span><span class="CommentedCode">//?     cerr &lt;&lt; i &lt;&lt; &quot; (&quot; &lt;&lt; address &lt;&lt; &quot;): &quot; &lt;&lt; h &lt;&lt; '\n';</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Delimiter">}</span>
@@ -158,7 +158,7 @@ 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">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L96" class="LineNr"> 96 </span>    reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L430'>element_type</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">,</span> i<span class="Delimiter">);</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>element<span class="Delimiter">,</span> <span class="Constant">&quot;ignore-for-hash&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L98" class="LineNr"> 98 </span>    element<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>address+offset<span class="Delimiter">);</span>
+<span id="L98" class="LineNr"> 98 </span>    element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address+offset<span class="Delimiter">);</span>
 <span id="L99" class="LineNr"> 99 </span>    h = <a href='069hash.cc.html#L34'>hash</a><span class="Delimiter">(</span>h<span class="Delimiter">,</span> element<span class="Delimiter">);</span>
 <span id="L100" class="LineNr">100 </span><span class="CommentedCode">//?     cerr &lt;&lt; i &lt;&lt; &quot;: &quot; &lt;&lt; h &lt;&lt; '\n';</span>
 <span id="L101" class="LineNr">101 </span>    offset += size_of<span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">);</span>
@@ -174,7 +174,7 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span>  <span class="Comment">// todo: move this error to container definition time</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>variant<span class="Delimiter">,</span> <span class="Constant">&quot;ignore-for-hash&quot;</span><span class="Delimiter">))</span>
 <span id="L113" class="LineNr">113 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;: /ignore-for-hash won't work in exclusive containers</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L114" class="LineNr">114 </span>  variant<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>value + <span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span>  variant<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>value + <span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L115" class="LineNr">115 </span>  h = <a href='069hash.cc.html#L34'>hash</a><span class="Delimiter">(</span>h<span class="Delimiter">,</span> variant<span class="Delimiter">);</span>
 <span id="L116" class="LineNr">116 </span>  <span class="Identifier">return</span> h<span class="Delimiter">;</span>
 <span id="L117" class="LineNr">117 </span><span class="Delimiter">}</span>
diff --git a/html/071recipe.cc.html b/html/071recipe.cc.html
index 5ecfdb46..e957e635 100644
--- a/html/071recipe.cc.html
+++ b/html/071recipe.cc.html
@@ -92,7 +92,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before &quot;End Mu Types Initialization&quot;)</span>
 <span id="L31" class="LineNr"> 31 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;recipe-literal&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L32" class="LineNr"> 32 </span><span class="Comment">// 'recipe' variables can store recipe-literal</span>
-<span id="L33" class="LineNr"> 33 </span><a href='010vm.cc.html#L124'>type_ordinal</a> <a href='010vm.cc.html#L19'>recipe</a> = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
+<span id="L33" class="LineNr"> 33 </span><a href='010vm.cc.html#L123'>type_ordinal</a> <a href='010vm.cc.html#L19'>recipe</a> = <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span><a href='001help.cc.html#L225'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> <a href='010vm.cc.html#L19'>recipe</a><span class="Delimiter">).</span>name = <span class="Constant">&quot;recipe&quot;</span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr"> 35 </span>
 <span id="L36" class="LineNr"> 36 </span><span class="Delimiter">:(after &quot;Begin <a href='042name.cc.html#L37'>transform_names</a> Ingredient Special-cases(ingredient, inst, caller)&quot;)</span>
@@ -117,7 +117,7 @@ if ('onhashchange' in window) {
 <span id="L55" class="LineNr"> 55 </span><span class="Delimiter">}</span>
 <span id="L56" class="LineNr"> 56 </span><span class="Normal">void</span> <a href='071recipe.cc.html#L56'>initialize_recipe_literal</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L57" class="LineNr"> 57 </span>  x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;recipe-literal&quot;</span><span class="Delimiter">);</span>
-<span id="L58" class="LineNr"> 58 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
+<span id="L58" class="LineNr"> 58 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
 <span id="L59" class="LineNr"> 59 </span><span class="Delimiter">}</span>
 <span id="L60" class="LineNr"> 60 </span><span class="Normal">bool</span> <a href='071recipe.cc.html#L60'>contains_reagent_with_type</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L61" class="LineNr"> 61 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
diff --git a/html/072scheduler.cc.html b/html/072scheduler.cc.html
index 392eef4c..61e253bb 100644
--- a/html/072scheduler.cc.html
+++ b/html/072scheduler.cc.html
@@ -352,7 +352,7 @@ if ('onhashchange' in window) {
 <span id="L289" class="LineNr">289 </span><a href='036refcount.cc.html#L34'>increment_any_refcounts</a><span class="Delimiter">(</span>ingredient<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L290" class="LineNr">290 </span><span class="Delimiter">:(before &quot;End Populate start-running Ingredient&quot;)</span>
 <span id="L291" class="LineNr">291 </span><a href='036refcount.cc.html#L34'>increment_any_refcounts</a><span class="Delimiter">(</span>ingredient<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L292" class="LineNr">292 </span><span class="Delimiter">:(before &quot;End <a href='043space.cc.html#L285'>should_update_refcounts_in_write_memory</a> Special-cases For Primitives&quot;)</span>
+<span id="L292" class="LineNr">292 </span><span class="Delimiter">:(before &quot;End <a href='043space.cc.html#L294'>should_update_refcounts_in_write_memory</a> Special-cases For Primitives&quot;)</span>
 <span id="L293" class="LineNr">293 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation == NEXT_INGREDIENT || inst<span class="Delimiter">.</span>operation == NEXT_INGREDIENT_WITHOUT_TYPECHECKING<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L294" class="LineNr">294 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='044space_surround.cc.html#L52'>space_index</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L295" class="LineNr">295 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;raw&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
diff --git a/html/073wait.cc.html b/html/073wait.cc.html
index 07a7bb9f..b7348439 100644
--- a/html/073wait.cc.html
+++ b/html/073wait.cc.html
@@ -231,11 +231,11 @@ if ('onhashchange' in window) {
 <span id="L168" class="LineNr">168 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Delimiter">}</span>
 <span id="L170" class="LineNr">170 </span>  <span class="Normal">const</span> type_tree* base_root_type = base<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom ? base<span class="Delimiter">.</span>type : base<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
-<span id="L171" class="LineNr">171 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_root_type<span class="Delimiter">-&gt;</span>atom || base_root_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L174'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L171" class="LineNr">171 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_root_type<span class="Delimiter">-&gt;</span>atom || base_root_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L173'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L172" class="LineNr">172 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <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> &lt;&lt; <span class="Constant">&quot;first ingredient of 'get-location' should be a container, but got '&quot;</span> &lt;&lt; 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 &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L173" class="LineNr">173 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L174" class="LineNr">174 </span>  <span class="Delimiter">}</span>
-<span id="L175" class="LineNr">175 </span>  <a href='010vm.cc.html#L124'>type_ordinal</a> base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">;</span>
+<span id="L175" class="LineNr">175 </span>  <a href='010vm.cc.html#L123'>type_ordinal</a> base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">;</span>
 <span id="L176" class="LineNr">176 </span>  <span class="Normal">const</span> reagent&amp; offset = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L177" class="LineNr">177 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> || !is_mu_scalar<span class="Delimiter">(</span>offset<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L178" class="LineNr">178 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <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> &lt;&lt; <span class="Constant">&quot;second ingredient of 'get-location' should have type 'offset', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
diff --git a/html/074deep_copy.cc.html b/html/074deep_copy.cc.html
index 89490db8..a74b4704 100644
--- a/html/074deep_copy.cc.html
+++ b/html/074deep_copy.cc.html
@@ -276,7 +276,7 @@ if ('onhashchange' in window) {
 <span id="L214" class="LineNr">214 </span>  <span class="Comment">// allocate a tiny bit of temporary space for deep_copy()</span>
 <span id="L215" class="LineNr">215 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: allocating space for temporary&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L216" class="LineNr">216 </span>  reagent tmp<span class="Delimiter">(</span><span class="Constant">&quot;tmp:<a href='043space.cc.html#L76'>address</a>:number&quot;</span><span class="Delimiter">);</span>
-<span id="L217" class="LineNr">217 </span>  tmp<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>allocate<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L217" class="LineNr">217 </span>  tmp<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>allocate<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
 <span id="L218" class="LineNr">218 </span>  products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>deep_copy<span class="Delimiter">(</span>input<span class="Delimiter">,</span> tmp<span class="Delimiter">));</span>
 <span id="L219" class="LineNr">219 </span>  <span class="Comment">// reclaim Mu memory allocated for tmp</span>
 <span id="L220" class="LineNr">220 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: reclaiming temporary&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -323,7 +323,7 @@ if ('onhashchange' in window) {
 <span id="L261" class="LineNr">261 </span>  <span class="Comment">// a temporary location to help copy the payload.</span>
 <span id="L262" class="LineNr">262 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: writing temporary &quot;</span> &lt;&lt; tmp<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; out &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L263" class="LineNr">263 </span>  <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> tmp<span class="Delimiter">.</span>value<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L264" class="LineNr">264 </span>  payload<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>value<span class="Delimiter">);</span>  <span class="Comment">// now modified for output</span>
+<span id="L264" class="LineNr">264 </span>  payload<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>value<span class="Delimiter">);</span>  <span class="Comment">// now modified for output</span>
 <span id="L265" class="LineNr">265 </span>  vector&lt;<span class="Normal">double</span>&gt; old_data = read_memory<span class="Delimiter">(</span>payload<span class="Delimiter">);</span>
 <span id="L266" class="LineNr">266 </span>  <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: really writing to &quot;</span> &lt;&lt; payload<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>payload<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; (old value &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>old_data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; new value &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L267" class="LineNr">267 </span>  write_memory<span class="Delimiter">(</span>payload<span class="Delimiter">,</span> data<span class="Delimiter">);</span>
@@ -349,7 +349,7 @@ if ('onhashchange' in window) {
 <span id="L287" class="LineNr">287 </span>        curr<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;address&quot;</span><span class="Delimiter">),</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Normal">new</span> type_tree<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">-&gt;</span>name<span class="Delimiter">),</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
 <span id="L288" class="LineNr">288 </span>      <span class="Normal">else</span>
 <span id="L289" class="LineNr">289 </span>        curr<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;address&quot;</span><span class="Delimiter">),</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*info<span class="Delimiter">-&gt;</span><a href='030container.cc.html#L238'>payload_type</a><span class="Delimiter">));</span>
-<span id="L290" class="LineNr">290 </span>      curr<span class="Delimiter">.</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">.</span>value + info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">);</span>
+<span id="L290" class="LineNr">290 </span>      curr<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>canonized_in<span class="Delimiter">.</span>value + info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">);</span>
 <span id="L291" class="LineNr">291 </span>      curr<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
 <span id="L292" class="LineNr">292 </span>      <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;deep-copy: copying <a href='043space.cc.html#L76'>address</a> &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L293" class="LineNr">293 </span>      out<span class="Delimiter">.</span>at<span class="Delimiter">(</span>info<span class="Delimiter">-&gt;</span>offset<span class="Delimiter">)</span> = <a href='074deep_copy.cc.html#L243'>deep_copy_address</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> addresses_copied<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>
diff --git a/html/082scenario_screen.cc.html b/html/082scenario_screen.cc.html
index 50abb903..78485464 100644
--- a/html/082scenario_screen.cc.html
+++ b/html/082scenario_screen.cc.html
@@ -232,7 +232,7 @@ if ('onhashchange' in window) {
 <span id="L169" class="LineNr">169 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L170" class="LineNr">170 </span>    assert<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L171" class="LineNr">171 </span>    curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;screen:&amp;:screen/raw&quot;</span><span class="Delimiter">));</span>
-<span id="L172" class="LineNr">172 </span>    curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010vm.cc.html#L66'>set_value</a><span class="Delimiter">(</span>SCREEN<span class="Delimiter">);</span>
+<span id="L172" class="LineNr">172 </span>    curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>SCREEN<span class="Delimiter">);</span>
 <span id="L173" class="LineNr">173 </span>  <span class="Delimiter">}</span>
 <span id="L174" class="LineNr">174 </span><span class="Delimiter">}</span>
 <span id="L175" class="LineNr">175 </span>
@@ -308,7 +308,7 @@ if ('onhashchange' in window) {
 <span id="L245" class="LineNr">245 </span>  <span class="Normal">uint32_t</span> get<span class="Delimiter">();</span>  <span class="Comment">// unicode codepoint</span>
 <span id="L246" class="LineNr">246 </span>  <span class="Normal">uint32_t</span> peek<span class="Delimiter">();</span>  <span class="Comment">// unicode codepoint</span>
 <span id="L247" class="LineNr">247 </span>  <span class="Normal">bool</span> at_end<span class="Delimiter">()</span> <span class="Normal">const</span><span class="Delimiter">;</span>
-<span id="L248" class="LineNr">248 </span>  <span class="Normal">void</span> <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">();</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Normal">void</span> <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">();</span>
 <span id="L249" class="LineNr">249 </span><span class="Delimiter">};</span>
 <span id="L250" class="LineNr">250 </span>
 <span id="L251" class="LineNr">251 </span><span class="Delimiter">:(code)</span>
@@ -326,7 +326,7 @@ if ('onhashchange' in window) {
 <span id="L263" class="LineNr">263 </span>  <span class="Comment">// todo: too-long expected_contents should fail</span>
 <span id="L264" class="LineNr">264 </span>  <span class="Normal">int</span> addr = screen_data_start+<span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L265" class="LineNr">265 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> row = <span class="Constant">0</span><span class="Delimiter">;</span>  row &lt; screen_height<span class="Delimiter">;</span>  ++row<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L266" class="LineNr">266 </span>    cursor<span class="Delimiter">.</span><a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">();</span>
+<span id="L266" class="LineNr">266 </span>    cursor<span class="Delimiter">.</span><a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">();</span>
 <span id="L267" class="LineNr">267 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>cursor<span class="Delimiter">.</span>at_end<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L268" class="LineNr">268 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>cursor<span class="Delimiter">.</span>get<span class="Delimiter">()</span> != <span class="Constant">'.'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L269" class="LineNr">269 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; Current_scenario<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;: each row of the expected screen should start with a '.'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -390,7 +390,7 @@ if ('onhashchange' in window) {
 <span id="L327" class="LineNr">327 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L328" class="LineNr">328 </span>    <span class="Delimiter">}</span>
 <span id="L329" class="LineNr">329 </span>  <span class="Delimiter">}</span>
-<span id="L330" class="LineNr">330 </span>  cursor<span class="Delimiter">.</span><a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">();</span>
+<span id="L330" class="LineNr">330 </span>  cursor<span class="Delimiter">.</span><a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">();</span>
 <span id="L331" class="LineNr">331 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!cursor<span class="Delimiter">.</span>at_end<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L332" class="LineNr">332 </span>    <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; Current_scenario<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;: expected screen has too many rows</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L333" class="LineNr">333 </span>    Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
@@ -425,7 +425,7 @@ if ('onhashchange' in window) {
 <span id="L362" class="LineNr">362 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L363" class="LineNr">363 </span><span class="Delimiter">}</span>
 <span id="L364" class="LineNr">364 </span>
-<span id="L365" class="LineNr">365 </span><span class="Normal">void</span> raw_string_stream::<a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L365" class="LineNr">365 </span><span class="Normal">void</span> raw_string_stream::<a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L366" class="LineNr">366 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>!at_end<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L367" class="LineNr">367 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>peek<span class="Delimiter">()))</span> get<span class="Delimiter">();</span>
 <span id="L368" class="LineNr">368 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
diff --git a/html/089scenario_filesystem.cc.html b/html/089scenario_filesystem.cc.html
index 42f50748..7bbca967 100644
--- a/html/089scenario_filesystem.cc.html
+++ b/html/089scenario_filesystem.cc.html
@@ -172,9 +172,9 @@ if ('onhashchange' in window) {
 <span id="L112" class="LineNr">112 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L114" class="LineNr">114 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L115" class="LineNr">115 </span>    <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span>    <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L116" class="LineNr">116 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L117" class="LineNr">117 </span>    string filename = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>    string filename = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L118" class="LineNr">118 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>filename<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L119" class="LineNr">119 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L120" class="LineNr">120 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'resources' block at <a href='003trace.cc.html#L195'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -194,7 +194,7 @@ if ('onhashchange' in window) {
 <span id="L134" class="LineNr">134 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: no data for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L135" class="LineNr">135 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L136" class="LineNr">136 </span>    <span class="Delimiter">}</span>
-<span id="L137" class="LineNr">137 </span>    string arrow = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L137" class="LineNr">137 </span>    string arrow = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L138" class="LineNr">138 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>arrow<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L139" class="LineNr">139 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L140" class="LineNr">140 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'resources' block at <a href='003trace.cc.html#L195'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -208,7 +208,7 @@ if ('onhashchange' in window) {
 <span id="L148" class="LineNr">148 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: no data for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' after '&lt;-'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
 <span id="L149" class="LineNr">149 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L150" class="LineNr">150 </span>    <span class="Delimiter">}</span>
-<span id="L151" class="LineNr">151 </span>    string contents = <a href='011load.cc.html#L166'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L151" class="LineNr">151 </span>    string contents = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L152" class="LineNr">152 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L153" class="LineNr">153 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
 <span id="L154" class="LineNr">154 </span>      <a href='003trace.cc.html#L178'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'resources' block at <a href='003trace.cc.html#L195'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span>
@@ -232,7 +232,7 @@ if ('onhashchange' in window) {
 <span id="L172" class="LineNr">172 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
 <span id="L173" class="LineNr">173 </span>  istringstream in<span class="Delimiter">(</span>data<span class="Delimiter">);</span>
 <span id="L174" class="LineNr">174 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
-<span id="L175" class="LineNr">175 </span>  <a href='011load.cc.html#L208'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L175" class="LineNr">175 </span>  <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L176" class="LineNr">176 </span>  ostringstream out<span class="Delimiter">;</span>
 <span id="L177" class="LineNr">177 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L178" class="LineNr">178 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/999spaces.cc.html b/html/999spaces.cc.html
index 548f3257..9d3d5b67 100644
--- a/html/999spaces.cc.html
+++ b/html/999spaces.cc.html
@@ -74,7 +74,7 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr">18 </span><span class="Comment">//:</span>
 <span id="L19" class="LineNr">19 </span><span class="Comment">//: 0 - unused (IDLE; do nothing)</span>
 <span id="L20" class="LineNr">20 </span><span class="Comment">//: 1-199 - primitives</span>
-<span id="L21" class="LineNr">21 </span>assert<span class="Delimiter">(</span><a href='010vm.cc.html#L192'>MAX_PRIMITIVE_RECIPES</a> &lt; <span class="Constant">200</span><span class="Delimiter">);</span>
+<span id="L21" class="LineNr">21 </span>assert<span class="Delimiter">(</span><a href='010vm.cc.html#L191'>MAX_PRIMITIVE_RECIPES</a> &lt; <span class="Constant">200</span><span class="Delimiter">);</span>
 <span id="L22" class="LineNr">22 </span><span class="Comment">//: 200-999 - defined in .mu files as sequences of primitives</span>
 <span id="L23" class="LineNr">23 </span>assert<span class="Delimiter">(</span>Next_recipe_ordinal == <span class="Constant">1000</span><span class="Delimiter">);</span>
 <span id="L24" class="LineNr">24 </span><span class="Comment">//: 1000 onwards - reserved for tests, cleared between tests</span>