diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2017-02-07 00:22:08 -0800 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2017-02-07 00:22:08 -0800 |
| commit | 598f1b5362eb799e40836ceeb5452c9ba937fd6c (patch) | |
| tree | 87c60bb17b9a4b5843a7a510c6800150fe6c36d7 /html/031merge.cc.html | |
| parent | fbe0f91376a4f1ed98e95b35d1b9e7629a743c30 (diff) | |
| download | mu-598f1b5362eb799e40836ceeb5452c9ba937fd6c.tar.gz | |
3746
Diffstat (limited to 'html/031merge.cc.html')
| -rw-r--r-- | html/031merge.cc.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/html/031merge.cc.html b/html/031merge.cc.html index 158f4f93..056a7c7a 100644 --- a/html/031merge.cc.html +++ b/html/031merge.cc.html @@ -194,7 +194,7 @@ if ('onhashchange' in window) { <span id="L131" class="LineNr">131 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L132" class="LineNr">132 </span> <span class="Delimiter">}</span> <span id="L133" class="LineNr">133 </span> <span class="Normal">const</span> type_info& info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> product_base_type<span class="Delimiter">-></span>value<span class="Delimiter">);</span> -<span id="L134" class="LineNr">134 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind != <a href='010vm.cc.html#L174'>CONTAINER</a> && info<span class="Delimiter">.</span>kind != <a href='010vm.cc.html#L175'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L134" class="LineNr">134 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind != <a href='010vm.cc.html#L173'>CONTAINER</a> && info<span class="Delimiter">.</span>kind != <a href='010vm.cc.html#L174'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L135" class="LineNr">135 </span> <a href='003trace.cc.html#L178'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> << <span class="Constant">"'merge' should yield a container in '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span> <span id="L136" class="LineNr">136 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L137" class="LineNr">137 </span> <span class="Delimiter">}</span> @@ -219,7 +219,7 @@ if ('onhashchange' in window) { <span id="L156" class="LineNr">156 </span> assert<span class="Delimiter">(</span>top_root_type<span class="Delimiter">-></span>atom<span class="Delimiter">);</span> <span id="L157" class="LineNr">157 </span> type_info& container_info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> top_root_type<span class="Delimiter">-></span>value<span class="Delimiter">);</span> <span id="L158" class="LineNr">158 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>container_info<span class="Delimiter">.</span>kind<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L159" class="LineNr">159 </span> <span class="Normal">case</span> <a href='010vm.cc.html#L174'>CONTAINER</a>: <span class="Delimiter">{</span> +<span id="L159" class="LineNr">159 </span> <span class="Normal">case</span> <a href='010vm.cc.html#L173'>CONTAINER</a>: <span class="Delimiter">{</span> <span id="L160" class="LineNr">160 </span> <span class="Comment">// degenerate case: merge with the same type always succeeds</span> <span id="L161" class="LineNr">161 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index == <span class="Constant">0</span> && <a href='021check_instruction.cc.html#L100'>types_coercible</a><span class="Delimiter">(</span>container<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">)))</span> <span id="L162" class="LineNr">162 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> |