<!DOCTYPE html>
<html>
  <head>
  </head>
  <body>
    <dl style="line-height: 1.5; margin-left: 2em">
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
      <dd style="margin-left: 8.5em">susumu.yata &lt;susum****@gmail*****&gt;</dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
      <dd style="margin-left: 8.5em">2014-06-23 14:59:34 +0900 (Mon, 23 Jun 2014)</dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
      <dd style="margin-left: 8.5em"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c">1c2e4e934a447e0a4b35e4a45f1cd60be702526c</a></dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
      <dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">Change arguments of PipelineBuilder::push_*().</pre></dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
      <dd style="margin-left: 8.5em">
        <ul>
          <li><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#diff-0">new-interface/pipeline-builder.hpp</a></li>
        </ul>
      </dd>
    </dl>

    <div class="diff-section" style="clear: both">
      <table style="border-collapse: collapse; border: 1px solid #aaa">
        <thead>
          <tr class="diff-header" style="border: 1px solid #aaa">
            <td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">  Modified: new-interface/pipeline-builder.hpp (+7 -7)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
            </td>
          </tr>
        </thead>
        <tbody>
          <tr>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L34">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L35">35</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L36">36</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L37">37</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L38">38</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L39">39</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L40">40</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L41">41</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L47">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L48">48</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L49">49</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L50">50</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L51">51</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L52">52</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L53">53</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L54">54</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L74">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L75">75</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L76">76</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L77">77</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L78">78</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L79">79</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L80">80</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L81">81</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L82">82</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L83">83</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L84">84</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L85">85</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L91">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L92">92</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L93">93</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L94">94</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L95">95</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L96">96</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L97">97</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0L98">98</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R34">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R35">35</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R36">36</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R37">37</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R38">38</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R39">39</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R40">40</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R41">41</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R42">42</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R48">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R49">49</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R50">50</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R51">51</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R52">52</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R53">53</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R54">54</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R55">55</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R56">56</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R76">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R77">77</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R78">78</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R79">79</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R80">80</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R81">81</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R82">82</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R83">83</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R84">84</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R85">85</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R91">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R92">92</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R93">93</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R94">94</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R95">95</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R96">96</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R97">97</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grnxx/commit/1c2e4e934a447e0a4b35e4a45f1cd60be702526c#L0R98">98</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -35,7 +35,8 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class PipelineBuilder {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // - 入力が存在しない.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // - リソースを確保できない.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   virtual bool push_filter(Error *error,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                           std::unique_ptr&lt;Filter&gt; &amp;&amp;filter) = 0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                           std::unique_ptr&lt;Expression&gt; &amp;&amp;expression,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                           const FilterOptions &amp;options) = 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // 入力をスタックから降ろし,代わりにスコアの Adjuster を積む.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // 成功すれば true を返す.</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -48,7 +49,8 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class PipelineBuilder {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // - 入力が存在しない.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // - リソースを確保できない.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   virtual bool push_adjuster(Error *error,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                             std::unique_ptr&lt;Adjuster&gt; &amp;&amp;adjuster) = 0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                             std::unique_ptr&lt;Expression&gt; &amp;&amp;expression,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                             const AdjusterOptions &amp;options) = 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // TODO: 将来的な検討案.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   //</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -75,11 +77,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class PipelineBuilder {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // - 指定された整列器が不正である.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // - 入力が存在しない.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // - リソースを確保できない.</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  //</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  // TODO: 将来的な検討案.</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  //       スタックに積まれている入力から preconditions を生成する.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   virtual bool push_sorter(Error *error,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                           std::unique_ptr&lt;Sorter&gt; &amp;&amp;sorter) = 0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                           std::unique_ptr&lt;Order&gt; &amp;&amp;order,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                           const SorterOptions &amp;options) = 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // 二つの入力をスタックから降ろし,代わりに合成器を積む.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // 成功すれば true を返す.</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -92,7 +92,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class PipelineBuilder {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // - 入力が存在しない.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // - リソースを確保できない.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   virtual bool push_merger(Error *error,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-                           std::unique_ptr&lt;Merger&gt; &amp;&amp;sorter) = 0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                           const MergerOptions &amp;options) = 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre">   // 保持しているノードやスタックを破棄する.</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   virtual void clear() = 0;</span>
</pre>
            </td>
          </tr>
        </tbody>
      </table>
    </div>
  </body>
</html>