about summary refs log tree commit diff stats
path: root/html/036refcount.cc.html
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2017-09-23 19:30:00 -0700
committerKartik K. Agaram <vc@akkartik.com>2017-09-23 19:30:00 -0700
commit615f4a970a2fa5c91766ee585a7d531b083f4bff (patch)
tree5fce7848b60fe7e0dae089c94ca228ad74067ce1 /html/036refcount.cc.html
parent72cf994869e19f6bdc4678e1122f0082d07d4a11 (diff)
downloadmu-615f4a970a2fa5c91766ee585a7d531b083f4bff.tar.gz
4003
Diffstat (limited to 'html/036refcount.cc.html')
-rw-r--r--html/036refcount.cc.html250
1 files changed, 125 insertions, 125 deletions
diff --git a/html/036refcount.cc.html b/html/036refcount.cc.html
index 5beda908..a630e068 100644
--- a/html/036refcount.cc.html
+++ b/html/036refcount.cc.html
@@ -68,10 +68,10 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">   3 </span>
 <span id="L4" class="LineNr">   4 </span><span class="Delimiter">:(scenario refcounts)</span>
 <span id="L5" class="LineNr">   5 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L6" class="LineNr">   6 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
-<span id="L7" class="LineNr">   7 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L8" class="LineNr">   8 </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="L9" class="LineNr">   9 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L6" class="LineNr">   6 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">1000</span>/unsafe
+<span id="L7" class="LineNr">   7 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
+<span id="L8" class="LineNr">   8 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L9" class="LineNr">   9 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L10" class="LineNr">  10 </span>]
 <span id="L11" class="LineNr">  11 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- copy {1000: &quot;literal&quot;, &quot;unsafe&quot;: ()}</span>
 <span id="L12" class="LineNr">  12 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -162,9 +162,9 @@ if ('onhashchange' in window) {
 <span id="L97" class="LineNr">  97 </span>
 <span id="L98" class="LineNr">  98 </span><span class="Delimiter">:(scenario refcounts_reflexive)</span>
 <span id="L99" class="LineNr">  99 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L100" class="LineNr"> 100 </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="L100" class="LineNr"> 100 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L101" class="LineNr"> 101 </span>  <span class="Comment"># idempotent copies leave refcount unchanged</span>
-<span id="L102" class="LineNr"> 102 </span>  <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L102" class="LineNr"> 102 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">1</span>:address:num
 <span id="L103" class="LineNr"> 103 </span>]
 <span id="L104" class="LineNr"> 104 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L105" class="LineNr"> 105 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -174,14 +174,14 @@ if ('onhashchange' in window) {
 <span id="L109" class="LineNr"> 109 </span>
 <span id="L110" class="LineNr"> 110 </span><span class="Delimiter">:(scenario refcounts_call)</span>
 <span id="L111" class="LineNr"> 111 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L112" class="LineNr"> 112 </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="L112" class="LineNr"> 112 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L113" class="LineNr"> 113 </span>  <span class="Comment"># passing in addresses to recipes increments refcount</span>
-<span id="L114" class="LineNr"> 114 </span>  foo <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L114" class="LineNr"> 114 </span>  foo <span class="Constant">1</span>:address:num
 <span id="L115" class="LineNr"> 115 </span>  <span class="Comment"># return does NOT yet decrement refcount; memory must be explicitly managed</span>
-<span id="L116" class="LineNr"> 116 </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="L116" class="LineNr"> 116 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L117" class="LineNr"> 117 </span>]
 <span id="L118" class="LineNr"> 118 </span><span class="muRecipe">def</span> foo [
-<span id="L119" class="LineNr"> 119 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>next-ingredient
+<span id="L119" class="LineNr"> 119 </span>  <span class="Constant">2</span>:address:num<span class="Special"> &lt;- </span>next-ingredient
 <span id="L120" class="LineNr"> 120 </span>]
 <span id="L121" class="LineNr"> 121 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L122" class="LineNr"> 122 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -196,12 +196,12 @@ if ('onhashchange' in window) {
 <span id="L131" class="LineNr"> 131 </span>
 <span id="L132" class="LineNr"> 132 </span><span class="Delimiter">:(scenario refcounts_put)</span>
 <span id="L133" class="LineNr"> 133 </span><span class="muData">container</span> foo [
-<span id="L134" class="LineNr"> 134 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L134" class="LineNr"> 134 </span>  <span class="Normal">x</span>:address:num
 <span id="L135" class="LineNr"> 135 </span>]
 <span id="L136" class="LineNr"> 136 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L137" class="LineNr"> 137 </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="L138" class="LineNr"> 138 </span>  <span class="Constant">2</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="L139" class="LineNr"> 139 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L137" class="LineNr"> 137 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L138" class="LineNr"> 138 </span>  <span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L139" class="LineNr"> 139 </span>  *<span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
 <span id="L140" class="LineNr"> 140 </span>]
 <span id="L141" class="LineNr"> 141 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L142" class="LineNr"> 142 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -214,14 +214,14 @@ if ('onhashchange' in window) {
 <span id="L149" class="LineNr"> 149 </span><span class="Delimiter">:(after &quot;Write Memory in PUT in Run&quot;)</span>
 <span id="L150" class="LineNr"> 150 </span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L429'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> offset<span class="Delimiter">);</span>
 <span id="L151" class="LineNr"> 151 </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="L152" class="LineNr"> 152 </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="L152" class="LineNr"> 152 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address<span class="Delimiter">);</span>
 <span id="L153" class="LineNr"> 153 </span><a href='036refcount.cc.html#L31'>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="L154" class="LineNr"> 154 </span>
 <span id="L155" class="LineNr"> 155 </span><span class="Delimiter">:(scenario refcounts_put_index)</span>
 <span id="L156" class="LineNr"> 156 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L157" class="LineNr"> 157 </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="L158" class="LineNr"> 158 </span>  <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:array:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span><a href='043space.cc.html#L76'>address</a> number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span>
-<span id="L159" class="LineNr"> 159 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:array:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:array:<a href='043space.cc.html#L76'>address</a>:num<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L157" class="LineNr"> 157 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L158" class="LineNr"> 158 </span>  <span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span>
+<span id="L159" class="LineNr"> 159 </span>  *<span class="Constant">2</span>:address:array:address:num<span class="Special"> &lt;- </span>put-index *<span class="Constant">2</span>:address:array:address:num<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
 <span id="L160" class="LineNr"> 160 </span>]
 <span id="L161" class="LineNr"> 161 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L162" class="LineNr"> 162 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -233,19 +233,19 @@ if ('onhashchange' in window) {
 <span id="L168" class="LineNr"> 168 </span>
 <span id="L169" class="LineNr"> 169 </span><span class="Delimiter">:(after &quot;Write Memory in PUT_INDEX in Run&quot;)</span>
 <span id="L170" class="LineNr"> 170 </span>reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">;</span>
-<span id="L171" class="LineNr"> 171 </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="L171" class="LineNr"> 171 </span>element<span class="Delimiter">.</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>address<span class="Delimiter">);</span>
 <span id="L172" class="LineNr"> 172 </span>element<span class="Delimiter">.</span>type = <a href='032array.cc.html#L377'>copy_array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
 <span id="L173" class="LineNr"> 173 </span><a href='036refcount.cc.html#L31'>update_any_refcounts</a><span class="Delimiter">(</span>element<span class="Delimiter">,</span> value<span class="Delimiter">);</span>
 <span id="L174" class="LineNr"> 174 </span>
 <span id="L175" class="LineNr"> 175 </span><span class="Delimiter">:(scenario refcounts_maybe_convert)</span>
 <span id="L176" class="LineNr"> 176 </span><span class="muData">exclusive-container</span> foo [
 <span id="L177" class="LineNr"> 177 </span>  <span class="Normal">x</span>:num
-<span id="L178" class="LineNr"> 178 </span>  <span class="Normal">p</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L178" class="LineNr"> 178 </span>  <span class="Normal">p</span>:address:num
 <span id="L179" class="LineNr"> 179 </span>]
 <span id="L180" class="LineNr"> 180 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L181" class="LineNr"> 181 </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="L182" class="LineNr"> 182 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/p<span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L183" class="LineNr"> 183 </span>  <span class="Constant">4</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Delimiter">,</span> <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">2</span>:foo<span class="Delimiter">,</span> <span class="Constant">1:variant/p</span>
+<span id="L181" class="LineNr"> 181 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L182" class="LineNr"> 182 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>/p<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
+<span id="L183" class="LineNr"> 183 </span>  <span class="Constant">4</span>:address:num<span class="Delimiter">,</span> <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>maybe-convert <span class="Constant">2</span>:foo<span class="Delimiter">,</span> <span class="Constant">1:variant/p</span>
 <span id="L184" class="LineNr"> 184 </span>]
 <span id="L185" class="LineNr"> 185 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L186" class="LineNr"> 186 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -267,17 +267,17 @@ if ('onhashchange' in window) {
 <span id="L202" class="LineNr"> 202 </span>
 <span id="L203" class="LineNr"> 203 </span><span class="Delimiter">:(scenario refcounts_copy_nested)</span>
 <span id="L204" class="LineNr"> 204 </span><span class="muData">container</span> foo [
-<span id="L205" class="LineNr"> 205 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num  <span class="Comment"># address inside container</span>
+<span id="L205" class="LineNr"> 205 </span>  <span class="Normal">x</span>:address:num  <span class="Comment"># address inside container</span>
 <span id="L206" class="LineNr"> 206 </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>:<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="L209" class="LineNr"> 209 </span>  <span class="Constant">2</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="L210" class="LineNr"> 210 </span>  *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num
-<span id="L211" class="LineNr"> 211 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:foo
+<span id="L208" class="LineNr"> 208 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L209" class="LineNr"> 209 </span>  <span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L210" class="LineNr"> 210 </span>  *<span class="Constant">2</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
+<span id="L211" class="LineNr"> 211 </span>  <span class="Constant">3</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">2</span>:address:foo
 <span id="L212" class="LineNr"> 212 </span>]
-<span id="L213" class="LineNr"> 213 </span><span class="traceContains">+transform: compute <a href='043space.cc.html#L76'>address</a> offsets for container foo</span>
+<span id="L213" class="LineNr"> 213 </span><span class="traceContains">+transform: compute address offsets for container foo</span>
 <span id="L214" class="LineNr"> 214 </span><span class="traceContains">+transform: checking container foo, element 0</span>
-<span id="L215" class="LineNr"> 215 </span><span class="traceContains">+transform: <a href='043space.cc.html#L76'>address</a> at offset 0</span>
+<span id="L215" class="LineNr"> 215 </span><span class="traceContains">+transform: address at offset 0</span>
 <span id="L216" class="LineNr"> 216 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L217" class="LineNr"> 217 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
 <span id="L218" class="LineNr"> 218 </span><span class="traceContains">+run: {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()} &lt;- <a href='001help.cc.html#L221'>put</a> {2: (&quot;address&quot; &quot;foo&quot;), &quot;lookup&quot;: ()}, {x: &quot;offset&quot;}, {1: (&quot;address&quot; &quot;number&quot;)}</span>
@@ -342,7 +342,7 @@ if ('onhashchange' in window) {
 <span id="L277" class="LineNr"> 277 </span><span class="Comment">//  IF offset o1 has tag t2 AND offset o2 has tag t2 AND .., THEN</span>
 <span id="L278" class="LineNr"> 278 </span><span class="Comment">//    for all address_element_infos:</span>
 <span id="L279" class="LineNr"> 279 </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="L280" class="LineNr"> 280 </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="L280" class="LineNr"> 280 </span>map&lt;set&lt;tag_condition_info&gt;<span class="Delimiter">,</span> set&lt;address_element_info&gt; &gt; address<span class="Delimiter">;</span>
 <span id="L281" class="LineNr"> 281 </span><span class="Delimiter">:(code)</span>
 <span id="L282" class="LineNr"> 282 </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="L283" class="LineNr"> 283 </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>
@@ -377,10 +377,10 @@ if ('onhashchange' in window) {
 <span id="L312" class="LineNr"> 312 </span><span class="Delimiter">:(code)</span>
 <span id="L313" class="LineNr"> 313 </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="L314" class="LineNr"> 314 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L315" class="LineNr"> 315 </span>  <a href='003trace.cc.html#L161'>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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L315" class="LineNr"> 315 </span>  <a href='003trace.cc.html#L161'>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 address offsets for &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L316" class="LineNr"> 316 </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#L141'>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="L317" class="LineNr"> 317 </span>  <span class="Conceal">¦</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="L318" class="LineNr"> 318 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L318" class="LineNr"> 318 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>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 address 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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L319" class="LineNr"> 319 </span>  <span class="Conceal">¦</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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L320" class="LineNr"> 320 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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>+inst<span class="Delimiter">.</span>original_string+<span class="Constant">&quot;'&quot;</span><span class="Delimiter">);</span>
 <span id="L321" class="LineNr"> 321 </span>  <span class="Conceal">¦</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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
@@ -424,18 +424,18 @@ if ('onhashchange' in window) {
 <span id="L359" class="LineNr"> 359 </span>
 <span id="L360" class="LineNr"> 360 </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="L361" class="LineNr"> 361 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
-<span id="L362" class="LineNr"> 362 </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="L363" class="LineNr"> 363 </span>  <a href='003trace.cc.html#L161'>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#L197'>end</a><span class="Delimiter">();</span>
-<span id="L364" class="LineNr"> 364 </span>  <a href='036refcount.cc.html#L377'>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="L362" class="LineNr"> 362 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L363" class="LineNr"> 363 </span>  <a href='003trace.cc.html#L161'>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 address offsets for container &quot;</span> &lt;&lt; container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
+<span id="L364" class="LineNr"> 364 </span>  <a href='036refcount.cc.html#L377'>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>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">(),</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L365" class="LineNr"> 365 </span><span class="Delimiter">}</span>
 <span id="L366" class="LineNr"> 366 </span>
 <span id="L367" class="LineNr"> 367 </span><span class="Normal">void</span> <a href='036refcount.cc.html#L367'>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="L368" class="LineNr"> 368 </span>  container_metadata&amp; metadata = get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> full_type<span class="Delimiter">);</span>
-<span id="L369" class="LineNr"> 369 </span>  <a href='003trace.cc.html#L161'>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#L197'>end</a><span class="Delimiter">();</span>
+<span id="L369" class="LineNr"> 369 </span>  <a href='003trace.cc.html#L161'>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 address offsets for exclusive container &quot;</span> &lt;&lt; exclusive_container_info<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>
 <span id="L370" class="LineNr"> 370 </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#L141'>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="L371" class="LineNr"> 371 </span>  <span class="Conceal">¦</span> set&lt;tag_condition_info&gt; key<span class="Delimiter">;</span>
 <span id="L372" class="LineNr"> 372 </span>  <span class="Conceal">¦</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="L373" class="LineNr"> 373 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L377'>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="L373" class="LineNr"> 373 </span>  <span class="Conceal">¦</span> <a href='036refcount.cc.html#L377'>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>address<span class="Delimiter">,</span> key<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L374" class="LineNr"> 374 </span>  <span class="Delimiter">}</span>
 <span id="L375" class="LineNr"> 375 </span><span class="Delimiter">}</span>
 <span id="L376" class="LineNr"> 376 </span>
@@ -512,10 +512,10 @@ if ('onhashchange' in window) {
 <span id="L447" class="LineNr"> 447 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
 <span id="L448" class="LineNr"> 448 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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="L449" class="LineNr"> 449 </span>  <span class="Comment">// the reagent we scanned knows it has no addresses</span>
-<span id="L450" class="LineNr"> 450 </span>  <a href='002test.cc.html#L24'>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="L450" class="LineNr"> 450 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L451" class="LineNr"> 451 </span>  <span class="Comment">// the global table contains an identical entry</span>
 <span id="L452" class="LineNr"> 452 </span>  <a href='002test.cc.html#L24'>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="L453" class="LineNr"> 453 </span>  <a href='002test.cc.html#L24'>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="L453" class="LineNr"> 453 </span>  <a href='002test.cc.html#L24'>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>address<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L454" class="LineNr"> 454 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
 <span id="L455" class="LineNr"> 455 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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="L456" class="LineNr"> 456 </span><span class="Delimiter">}</span>
@@ -524,7 +524,7 @@ if ('onhashchange' in window) {
 <span id="L459" class="LineNr"> 459 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L460" class="LineNr"> 460 </span>  <span class="Comment">// define a container with an address at offset 0 that we have the size for</span>
 <span id="L461" class="LineNr"> 461 </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="L462" class="LineNr"> 462 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L462" class="LineNr"> 462 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L463" class="LineNr"> 463 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L464" class="LineNr"> 464 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L465" class="LineNr"> 465 </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>
@@ -534,16 +534,16 @@ if ('onhashchange' in window) {
 <span id="L469" class="LineNr"> 469 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
 <span id="L470" class="LineNr"> 470 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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="L471" class="LineNr"> 471 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 0</span>
-<span id="L472" class="LineNr"> 472 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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="L473" class="LineNr"> 473 </span>  <a href='002test.cc.html#L24'>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="L474" class="LineNr"> 474 </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="L472" class="LineNr"> 472 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L473" class="LineNr"> 473 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L474" class="LineNr"> 474 </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>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>  <span class="Comment">// unconditional for containers</span>
 <span id="L475" class="LineNr"> 475 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L476" class="LineNr"> 476 </span>  <a href='002test.cc.html#L31'>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="L477" class="LineNr"> 477 </span>  <a href='002test.cc.html#L24'>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="L478" class="LineNr"> 478 </span>  <a href='002test.cc.html#L31'>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="L479" class="LineNr"> 479 </span>  <span class="Comment">// the global table contains an identical entry</span>
 <span id="L480" class="LineNr"> 480 </span>  <a href='002test.cc.html#L24'>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="L481" class="LineNr"> 481 </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="L481" class="LineNr"> 481 </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>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L482" class="LineNr"> 482 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<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#L31'>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="L484" class="LineNr"> 484 </span>  <a href='002test.cc.html#L24'>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>
@@ -557,7 +557,7 @@ if ('onhashchange' in window) {
 <span id="L492" class="LineNr"> 492 </span>  <span class="Comment">// define a container with an address at offset 1 that we have the size for</span>
 <span id="L493" class="LineNr"> 493 </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="L494" class="LineNr"> 494 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L495" class="LineNr"> 495 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L495" class="LineNr"> 495 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L496" class="LineNr"> 496 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L497" class="LineNr"> 497 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L498" class="LineNr"> 498 </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>
@@ -569,16 +569,16 @@ if ('onhashchange' in window) {
 <span id="L504" class="LineNr"> 504 </span>  <span class="Comment">// compute_container_address_offsets creates no new entries</span>
 <span id="L505" class="LineNr"> 505 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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="L506" class="LineNr"> 506 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 1</span>
-<span id="L507" class="LineNr"> 507 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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="L508" class="LineNr"> 508 </span>  <a href='002test.cc.html#L24'>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="L509" class="LineNr"> 509 </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="L507" class="LineNr"> 507 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L508" class="LineNr"> 508 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L509" class="LineNr"> 509 </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>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L510" class="LineNr"> 510 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L511" class="LineNr"> 511 </span>  <a href='002test.cc.html#L31'>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="L512" class="LineNr"> 512 </span>  <a href='002test.cc.html#L24'>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="L513" class="LineNr"> 513 </span>  <a href='002test.cc.html#L31'>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="L514" class="LineNr"> 514 </span>  <span class="Comment">// the global table contains an identical entry</span>
 <span id="L515" class="LineNr"> 515 </span>  <a href='002test.cc.html#L24'>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="L516" class="LineNr"> 516 </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="L516" class="LineNr"> 516 </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>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L517" class="LineNr"> 517 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<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#L31'>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="L519" class="LineNr"> 519 </span>  <a href='002test.cc.html#L24'>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>
@@ -589,7 +589,7 @@ if ('onhashchange' in window) {
 <span id="L524" class="LineNr"> 524 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L525" class="LineNr"> 525 </span>  <span class="Comment">// define a container with a nested container containing an address</span>
 <span id="L526" class="LineNr"> 526 </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="L527" class="LineNr"> 527 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L527" class="LineNr"> 527 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L528" class="LineNr"> 528 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  y:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L529" class="LineNr"> 529 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L530" class="LineNr"> 530 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;container bar [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -604,16 +604,16 @@ if ('onhashchange' in window) {
 <span id="L539" class="LineNr"> 539 </span>  <span class="Comment">// scan</span>
 <span id="L540" class="LineNr"> 540 </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="L541" class="LineNr"> 541 </span>  <span class="Comment">// the reagent we scanned knows it has an address at offset 2</span>
-<span id="L542" class="LineNr"> 542 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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="L543" class="LineNr"> 543 </span>  <a href='002test.cc.html#L24'>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="L544" class="LineNr"> 544 </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="L542" class="LineNr"> 542 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L543" class="LineNr"> 543 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">()));</span>
+<span id="L544" class="LineNr"> 544 </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>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L545" class="LineNr"> 545 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L546" class="LineNr"> 546 </span>  <a href='002test.cc.html#L31'>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="L547" class="LineNr"> 547 </span>  <a href='002test.cc.html#L24'>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="L548" class="LineNr"> 548 </span>  <a href='002test.cc.html#L31'>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="L549" class="LineNr"> 549 </span>  <span class="Comment">// the global table also knows its address offset</span>
 <span id="L550" class="LineNr"> 550 </span>  <a href='002test.cc.html#L24'>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="L551" class="LineNr"> 551 </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="L551" class="LineNr"> 551 </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>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L552" class="LineNr"> 552 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L553" class="LineNr"> 553 </span>  <a href='002test.cc.html#L31'>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="L554" class="LineNr"> 554 </span>  <a href='002test.cc.html#L24'>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>
@@ -626,9 +626,9 @@ if ('onhashchange' in window) {
 <span id="L561" class="LineNr"> 561 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>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="Conceal">¦</span> <span class="Conceal">¦</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="L564" class="LineNr"> 564 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L565" class="LineNr"> 565 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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:<a href='043space.cc.html#L76'>address</a>:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L566" class="LineNr"> 566 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address: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>
@@ -640,7 +640,7 @@ if ('onhashchange' in window) {
 <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#L24'>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="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>address<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#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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#L31'>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#L24'>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>
@@ -651,7 +651,7 @@ if ('onhashchange' in window) {
 <span id="L586" class="LineNr"> 586 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>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="Conceal">¦</span> <span class="Conceal">¦</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="L589" class="LineNr"> 589 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L590" class="LineNr"> 590 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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: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>
@@ -665,7 +665,7 @@ if ('onhashchange' in window) {
 <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#L24'>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="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>address<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#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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#L31'>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#L24'>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>
@@ -676,9 +676,9 @@ if ('onhashchange' in window) {
 <span id="L611" class="LineNr"> 611 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>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="Conceal">¦</span> <span class="Conceal">¦</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="L614" class="LineNr"> 614 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L615" class="LineNr"> 615 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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:<a href='043space.cc.html#L76'>address</a>:array:foo&quot;</span><span class="Delimiter">);</span>
+<span id="L616" class="LineNr"> 616 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:foo&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>
@@ -690,7 +690,7 @@ if ('onhashchange' in window) {
 <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#L24'>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="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>address<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#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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#L31'>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#L24'>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>
@@ -701,7 +701,7 @@ if ('onhashchange' in window) {
 <span id="L636" class="LineNr"> 636 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>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="Conceal">¦</span> <span class="Conceal">¦</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="L639" class="LineNr"> 639 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L640" class="LineNr"> 640 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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: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>
@@ -715,7 +715,7 @@ if ('onhashchange' in window) {
 <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#L24'>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="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>address<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#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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#L31'>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#L24'>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>
@@ -726,9 +726,9 @@ if ('onhashchange' in window) {
 <span id="L661" class="LineNr"> 661 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>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="Conceal">¦</span> <span class="Conceal">¦</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="L664" class="LineNr"> 664 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L665" class="LineNr"> 665 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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>  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="L666" class="LineNr"> 666 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:foo:10&quot;</span><span class="Delimiter">);</span>
 <span id="L667" class="LineNr"> 667 </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="L668" class="LineNr"> 668 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
 <span id="L669" class="LineNr"> 669 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
@@ -740,7 +740,7 @@ if ('onhashchange' in window) {
 <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#L24'>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="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>address<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#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>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#L31'>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#L24'>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>
@@ -751,10 +751,10 @@ if ('onhashchange' in window) {
 <span id="L686" class="LineNr"> 686 </span>  <span class="Normal">int</span> old_size = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span>
 <span id="L687" class="LineNr"> 687 </span>  <span class="Comment">// define a container with an address at offset 0</span>
 <span id="L688" class="LineNr"> 688 </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="L689" class="LineNr"> 689 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L689" class="LineNr"> 689 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;  x:address:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L690" class="LineNr"> 690 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L691" class="LineNr"> 691 </span>  <span class="Comment">// scan a deep nest of 'address' and 'array' types modifying a container</span>
-<span id="L692" class="LineNr"> 692 </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="L692" class="LineNr"> 692 </span>  reagent r<span class="Delimiter">(</span><span class="Constant">&quot;x:address:array:address:address:array:foo:10&quot;</span><span class="Delimiter">);</span>
 <span id="L693" class="LineNr"> 693 </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="L694" class="LineNr"> 694 </span>  <span class="Comment">// global metadata contains just the entry for foo</span>
 <span id="L695" class="LineNr"> 695 </span>  <span class="Comment">// no entries for non-container types or other junk</span>
@@ -765,7 +765,7 @@ if ('onhashchange' in window) {
 <span id="L700" class="LineNr"> 700 </span>  <span class="Comment">// scanning precomputed metadata for the container</span>
 <span id="L701" class="LineNr"> 701 </span>  reagent container<span class="Delimiter">(</span><span class="Constant">&quot;x:foo&quot;</span><span class="Delimiter">);</span>
 <span id="L702" class="LineNr"> 702 </span>  <a href='002test.cc.html#L24'>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="L703" class="LineNr"> 703 </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="L703" class="LineNr"> 703 </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>address<span class="Delimiter">,</span> set&lt;tag_condition_info&gt;<span class="Delimiter">());</span>
 <span id="L704" class="LineNr"> 704 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>address_offsets2<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L705" class="LineNr"> 705 </span>  <a href='002test.cc.html#L31'>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="L706" class="LineNr"> 706 </span>  <a href='002test.cc.html#L24'>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>
@@ -778,7 +778,7 @@ if ('onhashchange' in window) {
 <span id="L713" class="LineNr"> 713 </span><span class="Delimiter">:(before &quot;End Increment Refcounts(canonized_x)&quot;)</span>
 <span id="L714" class="LineNr"> 714 </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="L715" class="LineNr"> 715 </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="L716" class="LineNr"> 716 </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#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L716" class="LineNr"> 716 </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>address<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L717" class="LineNr"> 717 </span>  <span class="Conceal">¦</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="L718" class="LineNr"> 718 </span>  <span class="Conceal">¦</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#L197'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span>
 <span id="L719" class="LineNr"> 719 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='036refcount.cc.html#L53'>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>
@@ -794,7 +794,7 @@ if ('onhashchange' in window) {
 <span id="L729" class="LineNr"> 729 </span>  vector&lt;<span class="Normal">double</span>&gt; data = read_memory<span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
 <span id="L730" class="LineNr"> 730 </span>  <a href='003trace.cc.html#L161'>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#L197'>end</a><span class="Delimiter">();</span>
 <span id="L731" class="LineNr"> 731 </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="L732" class="LineNr"> 732 </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#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L732" class="LineNr"> 732 </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>address<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != metadata<span class="Delimiter">.</span>address<span class="Delimiter">.</span><a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L733" class="LineNr"> 733 </span>  <span class="Conceal">¦</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="L734" class="LineNr"> 734 </span>  <span class="Conceal">¦</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#L197'>end</a><span class="Delimiter">();</span>  ++info<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L735" class="LineNr"> 735 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int</span> element_address = <a href='001help.cc.html#L228'>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>
@@ -820,13 +820,13 @@ if ('onhashchange' in window) {
 <span id="L755" class="LineNr"> 755 </span>  <span class="Normal">a</span>:bar  <span class="Comment"># contains an address</span>
 <span id="L756" class="LineNr"> 756 </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="L758" class="LineNr"> 758 </span>  <span class="Normal">x</span>:address:num
 <span id="L759" class="LineNr"> 759 </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>:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
-<span id="L764" class="LineNr"> 764 </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#L221'>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="L761" class="LineNr"> 761 </span>  <span class="Constant">1</span>:address: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>:address:num
+<span id="L763" class="LineNr"> 763 </span>  <span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L764" class="LineNr"> 764 </span>  *<span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">3</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">a:offset</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>
@@ -838,13 +838,13 @@ if ('onhashchange' in window) {
 <span id="L773" class="LineNr"> 773 </span>
 <span id="L774" class="LineNr"> 774 </span><span class="Delimiter">:(scenario refcounts_put_index_array)</span>
 <span id="L775" class="LineNr"> 775 </span><span class="muData">container</span> bar [
-<span id="L776" class="LineNr"> 776 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L776" class="LineNr"> 776 </span>  <span class="Normal">x</span>:address:num
 <span id="L777" class="LineNr"> 777 </span>]
 <span id="L778" class="LineNr"> 778 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L779" class="LineNr"> 779 </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="L780" class="LineNr"> 780 </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="L781" class="LineNr"> 781 </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="L782" class="LineNr"> 782 </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="L779" class="LineNr"> 779 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L780" class="LineNr"> 780 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:num
+<span id="L781" class="LineNr"> 781 </span>  <span class="Constant">3</span>:address: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="L782" class="LineNr"> 782 </span>  *<span class="Constant">3</span>:address:array:bar<span class="Special"> &lt;- </span>put-index *<span class="Constant">3</span>:address:array:bar<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar
 <span id="L783" class="LineNr"> 783 </span>]
 <span id="L784" class="LineNr"> 784 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L785" class="LineNr"> 785 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -860,11 +860,11 @@ if ('onhashchange' in window) {
 <span id="L795" class="LineNr"> 795 </span>  <span class="Normal">b</span>:bar  <span class="Comment"># contains an address</span>
 <span id="L796" class="LineNr"> 796 </span>]
 <span id="L797" class="LineNr"> 797 </span><span class="muData">container</span> bar [
-<span id="L798" class="LineNr"> 798 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L798" class="LineNr"> 798 </span>  <span class="Normal">x</span>:address:num
 <span id="L799" class="LineNr"> 799 </span>]
 <span id="L800" class="LineNr"> 800 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L801" class="LineNr"> 801 </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="L802" class="LineNr"> 802 </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="L801" class="LineNr"> 801 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L802" class="LineNr"> 802 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:num
 <span id="L803" class="LineNr"> 803 </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="L804" class="LineNr"> 804 </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="L805" class="LineNr"> 805 </span>]
@@ -888,19 +888,19 @@ if ('onhashchange' in window) {
 <span id="L823" class="LineNr"> 823 </span>]
 <span id="L824" class="LineNr"> 824 </span><span class="muData">container</span> curr [
 <span id="L825" class="LineNr"> 825 </span>  <span class="Normal">x</span>:num
-<span id="L826" class="LineNr"> 826 </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="L826" class="LineNr"> 826 </span>  <span class="Normal">y</span>:address:num  <span class="Comment"># address inside container inside container</span>
 <span id="L827" class="LineNr"> 827 </span>]
 <span id="L828" class="LineNr"> 828 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L829" class="LineNr"> 829 </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="L830" class="LineNr"> 830 </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="L831" class="LineNr"> 831 </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#L221'>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="L832" class="LineNr"> 832 </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="L833" class="LineNr"> 833 </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#L221'>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="L834" class="LineNr"> 834 </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="L829" class="LineNr"> 829 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L830" class="LineNr"> 830 </span>  <span class="Constant">2</span>:address:curr<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">curr:type</span>
+<span id="L831" class="LineNr"> 831 </span>  *<span class="Constant">2</span>:address:curr<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">2</span>:address:curr<span class="Delimiter">,</span> <span class="Constant">1:offset/y</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num
+<span id="L832" class="LineNr"> 832 </span>  <span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">foo:type</span>
+<span id="L833" class="LineNr"> 833 </span>  *<span class="Constant">3</span>:address:foo<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> *<span class="Constant">3</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">1:offset/b</span><span class="Delimiter">,</span> *<span class="Constant">2</span>:address:curr
+<span id="L834" class="LineNr"> 834 </span>  <span class="Constant">4</span>:foo<span class="Special"> &lt;- </span>copy *<span class="Constant">3</span>:address:foo
 <span id="L835" class="LineNr"> 835 </span>]
-<span id="L836" class="LineNr"> 836 </span><span class="traceContains">+transform: compute <a href='043space.cc.html#L76'>address</a> offsets for container foo</span>
+<span id="L836" class="LineNr"> 836 </span><span class="traceContains">+transform: compute address offsets for container foo</span>
 <span id="L837" class="LineNr"> 837 </span><span class="traceContains">+transform: checking container foo, element 1</span>
-<span id="L838" class="LineNr"> 838 </span><span class="traceContains">+transform: <a href='043space.cc.html#L76'>address</a> at offset 3</span>
+<span id="L838" class="LineNr"> 838 </span><span class="traceContains">+transform: address at offset 3</span>
 <span id="L839" class="LineNr"> 839 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L840" class="LineNr"> 840 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
 <span id="L841" class="LineNr"> 841 </span><span class="Comment"># storing an address in a container updates its refcount</span>
@@ -921,15 +921,15 @@ if ('onhashchange' in window) {
 <span id="L856" class="LineNr"> 856 </span><span class="muData">exclusive-container</span> bar [
 <span id="L857" class="LineNr"> 857 </span>  <span class="Normal">x</span>:num
 <span id="L858" class="LineNr"> 858 </span>  <span class="Normal">y</span>:num
-<span id="L859" class="LineNr"> 859 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L859" class="LineNr"> 859 </span>  <span class="Normal">z</span>:address:num
 <span id="L860" class="LineNr"> 860 </span>]
 <span id="L861" class="LineNr"> 861 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L862" class="LineNr"> 862 </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="L862" class="LineNr"> 862 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L863" class="LineNr"> 863 </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="L864" class="LineNr"> 864 </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="L865" class="LineNr"> 865 </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="L866" class="LineNr"> 866 </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="L867" class="LineNr"> 867 </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="L867" class="LineNr"> 867 </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>:address:num
 <span id="L868" class="LineNr"> 868 </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="L869" class="LineNr"> 869 </span>  <span class="Constant">11</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">9</span>:foo
 <span id="L870" class="LineNr"> 870 </span>]
@@ -951,13 +951,13 @@ if ('onhashchange' in window) {
 <span id="L886" class="LineNr"> 886 </span><span class="muData">container</span> bar [
 <span id="L887" class="LineNr"> 887 </span>  <span class="Normal">x</span>:num
 <span id="L888" class="LineNr"> 888 </span>  <span class="Normal">y</span>:num
-<span id="L889" class="LineNr"> 889 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L889" class="LineNr"> 889 </span>  <span class="Normal">z</span>:address:num
 <span id="L890" class="LineNr"> 890 </span>]
 <span id="L891" class="LineNr"> 891 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L892" class="LineNr"> 892 </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="L892" class="LineNr"> 892 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
 <span id="L893" class="LineNr"> 893 </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="L894" class="LineNr"> 894 </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="L895" class="LineNr"> 895 </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="L895" class="LineNr"> 895 </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>:address:num
 <span id="L896" class="LineNr"> 896 </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="L897" class="LineNr"> 897 </span>  <span class="Constant">17</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">13</span>:foo
 <span id="L898" class="LineNr"> 898 </span>]
@@ -978,11 +978,11 @@ if ('onhashchange' in window) {
 <span id="L913" class="LineNr"> 913 </span>]
 <span id="L914" class="LineNr"> 914 </span><span class="muData">exclusive-container</span> bar [
 <span id="L915" class="LineNr"> 915 </span>  <span class="Normal">x</span>:num
-<span id="L916" class="LineNr"> 916 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L916" class="LineNr"> 916 </span>  <span class="Normal">y</span>:address:num
 <span id="L917" class="LineNr"> 917 </span>]
 <span id="L918" class="LineNr"> 918 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L919" class="LineNr"> 919 </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="L920" class="LineNr"> 920 </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="L919" class="LineNr"> 919 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L920" class="LineNr"> 920 </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>:address:num
 <span id="L921" class="LineNr"> 921 </span>  <span class="Constant">20</span>:foo<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:foo
 <span id="L922" class="LineNr"> 922 </span>]
 <span id="L923" class="LineNr"> 923 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
@@ -995,13 +995,13 @@ if ('onhashchange' in window) {
 <span id="L930" class="LineNr"> 930 </span>
 <span id="L931" class="LineNr"> 931 </span><span class="Delimiter">:(scenario refcounts_copy_array_within_container)</span>
 <span id="L932" class="LineNr"> 932 </span><span class="muData">container</span> foo [
-<span id="L933" class="LineNr"> 933 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:array:num
+<span id="L933" class="LineNr"> 933 </span>  <span class="Normal">x</span>:address:array:num
 <span id="L934" class="LineNr"> 934 </span>]
 <span id="L935" class="LineNr"> 935 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L936" class="LineNr"> 936 </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="L937" class="LineNr"> 937 </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="L938" class="LineNr"> 938 </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="L939" class="LineNr"> 939 </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="L936" class="LineNr"> 936 </span>  <span class="Constant">1</span>:address: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="L937" class="LineNr"> 937 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">1</span>:address:array:num
+<span id="L938" class="LineNr"> 938 </span>  <span class="Constant">3</span>:address: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="L939" class="LineNr"> 939 </span>  <span class="Constant">2</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>:address:array:num
 <span id="L940" class="LineNr"> 940 </span>]
 <span id="L941" class="LineNr"> 941 </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="L942" class="LineNr"> 942 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -1013,22 +1013,22 @@ if ('onhashchange' in window) {
 <span id="L948" class="LineNr"> 948 </span><span class="Delimiter">:(scenario refcounts_copy_address_within_static_array_within_container)</span>
 <span id="L949" class="LineNr"> 949 </span><span class="muData">container</span> foo [
 <span id="L950" class="LineNr"> 950 </span>  <span class="Normal">a</span>:array:bar:<span class="Constant">3</span>
-<span id="L951" class="LineNr"> 951 </span>  <span class="Normal">b</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L951" class="LineNr"> 951 </span>  <span class="Normal">b</span>:address:num
 <span id="L952" class="LineNr"> 952 </span>]
 <span id="L953" class="LineNr"> 953 </span><span class="muData">container</span> bar [
 <span id="L954" class="LineNr"> 954 </span>  <span class="Normal">y</span>:num
-<span id="L955" class="LineNr"> 955 </span>  <span class="Normal">z</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L955" class="LineNr"> 955 </span>  <span class="Normal">z</span>:address:num
 <span id="L956" class="LineNr"> 956 </span>]
 <span id="L957" class="LineNr"> 957 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L958" class="LineNr"> 958 </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="L959" class="LineNr"> 959 </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="L958" class="LineNr"> 958 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">number:type</span>
+<span id="L959" class="LineNr"> 959 </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>:address:num
 <span id="L960" class="LineNr"> 960 </span>  <span class="Constant">10</span>:array:bar:<span class="Constant">3</span><span class="Special"> &lt;- </span>create-array
 <span id="L961" class="LineNr"> 961 </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="L962" class="LineNr"> 962 </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="L963" class="LineNr"> 963 </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="L964" class="LineNr"> 964 </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="L962" class="LineNr"> 962 </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>:address:num
+<span id="L963" class="LineNr"> 963 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L964" class="LineNr"> 964 </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>:address:num
 <span id="L965" class="LineNr"> 965 </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="L966" class="LineNr"> 966 </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="L966" class="LineNr"> 966 </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>:address:num
 <span id="L967" class="LineNr"> 967 </span>]
 <span id="L968" class="LineNr"> 968 </span><span class="traceContains">+run: {1: (&quot;address&quot; &quot;number&quot;)} &lt;- new {number: &quot;type&quot;}</span>
 <span id="L969" class="LineNr"> 969 </span><span class="traceContains">+mem: incrementing refcount of 1000: 0 -&gt; 1</span>
@@ -1051,24 +1051,24 @@ if ('onhashchange' in window) {
 <span id="L986" class="LineNr"> 986 </span>
 <span id="L987" class="LineNr"> 987 </span><span class="Delimiter">:(scenario refcounts_handle_exclusive_containers_with_different_tags)</span>
 <span id="L988" class="LineNr"> 988 </span><span class="muData">container</span> foo1 [
-<span id="L989" class="LineNr"> 989 </span>  <span class="Normal">x</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L989" class="LineNr"> 989 </span>  <span class="Normal">x</span>:address:num
 <span id="L990" class="LineNr"> 990 </span>  <span class="Normal">y</span>:num
 <span id="L991" class="LineNr"> 991 </span>]
 <span id="L992" class="LineNr"> 992 </span><span class="muData">container</span> foo2 [
 <span id="L993" class="LineNr"> 993 </span>  <span class="Normal">x</span>:num
-<span id="L994" class="LineNr"> 994 </span>  <span class="Normal">y</span>:<a href='043space.cc.html#L76'>address</a>:num
+<span id="L994" class="LineNr"> 994 </span>  <span class="Normal">y</span>:address:num
 <span id="L995" class="LineNr"> 995 </span>]
 <span id="L996" class="LineNr"> 996 </span><span class="muData">exclusive-container</span> bar [
 <span id="L997" class="LineNr"> 997 </span>  <span class="Normal">a</span>:foo1
 <span id="L998" class="LineNr"> 998 </span>  <span class="Normal">b</span>:foo2
 <span id="L999" class="LineNr"> 999 </span>]
 <span id="L1000" class="LineNr">1000 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L1001" class="LineNr">1001 </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="L1002" class="LineNr">1002 </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="L1003" class="LineNr">1003 </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="L1004" class="LineNr">1004 </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="L1005" class="LineNr">1005 </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="L1006" class="LineNr">1006 </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="L1001" class="LineNr">1001 </span>  <span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">12000</span>/unsafe  <span class="Comment"># pretend allocation</span>
+<span id="L1002" class="LineNr">1002 </span>  *<span class="Constant">1</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
+<span id="L1003" class="LineNr">1003 </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>:address:num<span class="Delimiter">,</span> <span class="Constant">97</span>
+<span id="L1004" class="LineNr">1004 </span>  <span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">13000</span>/unsafe  <span class="Comment"># pretend allocation</span>
+<span id="L1005" class="LineNr">1005 </span>  *<span class="Constant">5</span>:address:num<span class="Special"> &lt;- </span>copy <span class="Constant">35</span>
+<span id="L1006" class="LineNr">1006 </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>:address:num
 <span id="L1007" class="LineNr">1007 </span>  <span class="Constant">2</span>:bar<span class="Special"> &lt;- </span>copy <span class="Constant">6</span>:bar
 <span id="L1008" class="LineNr">1008 </span>]
 <span id="L1009" class="LineNr">1009 </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>