diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2016-12-27 22:20:43 -0800 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2016-12-27 22:20:43 -0800 |
| commit | 97eb971b7574b3f283d7111a567a301faec9912d (patch) | |
| tree | 4a1f9d1987ca601efba78865c8b3d1766d23af92 /html/031merge.cc.html | |
| parent | df0c0babff599b0ab85f56cd50ee0b4143f12886 (diff) | |
| download | mu-97eb971b7574b3f283d7111a567a301faec9912d.tar.gz | |
3725
More improvements to cross-linking example programs. Include their own functions as well in the tags for each program, even as you share the core .mu files everywhere.
Diffstat (limited to 'html/031merge.cc.html')
| -rw-r--r-- | html/031merge.cc.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/html/031merge.cc.html b/html/031merge.cc.html index f6b3bb4e..158f4f93 100644 --- a/html/031merge.cc.html +++ b/html/031merge.cc.html @@ -223,7 +223,7 @@ if ('onhashchange' in window) { <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> -<span id="L163" class="LineNr">163 </span> <span class="Normal">const</span> reagent& expected_ingredient = <a href='030container.cc.html#L431'>element_type</a><span class="Delimiter">(</span>container<span class="Delimiter">.</span>type<span class="Delimiter">,</span> state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index<span class="Delimiter">);</span> +<span id="L163" class="LineNr">163 </span> <span class="Normal">const</span> reagent& expected_ingredient = <a href='030container.cc.html#L430'>element_type</a><span class="Delimiter">(</span>container<span class="Delimiter">.</span>type<span class="Delimiter">,</span> state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index<span class="Delimiter">);</span> <span id="L164" class="LineNr">164 </span> <a href='003trace.cc.html#L171'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"checking container "</span> << <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>container<span class="Delimiter">)</span> << <span class="Constant">" || "</span> << <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>expected_ingredient<span class="Delimiter">)</span> << <span class="Constant">" vs ingredient "</span> << ingredient_index << <a href='003trace.cc.html#L195'>end</a><span class="Delimiter">();</span> <span id="L165" class="LineNr">165 </span> <span class="Comment">// if the current element is the ingredient we expect, move on to the next element/ingredient</span> <span id="L166" class="LineNr">166 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='021check_instruction.cc.html#L100'>types_coercible</a><span class="Delimiter">(</span>expected_ingredient<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">)))</span> <span class="Delimiter">{</span> |