4588

1 files changed, 7 insertions, 7 deletions

diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html
index f456a19d..f95c5644 100644
--- a/html/050scenario.cc.html
+++ b/html/050scenario.cc.html
@@ -291,7 +291,7 @@ if ('onhashchange' in window) {
 <span id="L225" class="LineNr">225 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors &amp;&amp; <a href='003trace.cc.html#L221'>trace_contains_errors</a><span class="Delimiter">()</span> &amp;&amp; !Scenario_testing_scenario<span class="Delimiter">)</span>
 <span id="L226" class="LineNr">226 </span>    Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L227" class="LineNr">227 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>not_already_inside_test &amp;&amp; Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L228" class="LineNr">228 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L142'>save</a><span class="Delimiter">();</span>
+<span id="L228" class="LineNr">228 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span>
 <span id="L229" class="LineNr">229 </span>    <span class="Normal">delete</span> Trace_stream<span class="Delimiter">;</span>
 <span id="L230" class="LineNr">230 </span>    Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
 <span id="L231" class="LineNr">231 </span>  <span class="Delimiter">}</span>
@@ -664,13 +664,13 @@ if ('onhashchange' in window) {
 <span id="L598" class="LineNr">598 </span><span class="Comment">// simplified version of check_trace_contents() that emits errors rather</span>
 <span id="L599" class="LineNr">599 </span><span class="Comment">// than just printing to stderr</span>
 <span id="L600" class="LineNr">600 </span><span class="Normal">void</span> check_trace<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L601" class="LineNr">601 </span>  Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L156'>newline</a><span class="Delimiter">();</span>
+<span id="L601" class="LineNr">601 </span>  Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
 <span id="L602" class="LineNr">602 </span>  vector&lt;trace_line&gt; expected_lines = parse_trace<span class="Delimiter">(</span>expected<span class="Delimiter">);</span>
 <span id="L603" class="LineNr">603 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L604" class="LineNr">604 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L605" class="LineNr">605 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L606" class="LineNr">606 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>label != p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L607" class="LineNr">607 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>contents != <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L607" class="LineNr">607 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>contents != <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L608" class="LineNr">608 </span>    <span class="Comment">// match</span>
 <span id="L609" class="LineNr">609 </span>    ++curr_expected_line<span class="Delimiter">;</span>
 <span id="L610" class="LineNr">610 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
@@ -684,10 +684,10 @@ if ('onhashchange' in window) {
 <span id="L618" class="LineNr">618 </span><span class="Delimiter">}</span>
 <span id="L619" class="LineNr">619 </span>
 <span id="L620" class="LineNr">620 </span>vector&lt;trace_line&gt; parse_trace<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L621" class="LineNr">621 </span>  vector&lt;string&gt; buf = <a href='003trace.cc.html#L367'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L621" class="LineNr">621 </span>  vector&lt;string&gt; buf = <a href='003trace.cc.html#L371'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L622" class="LineNr">622 </span>  vector&lt;trace_line&gt; result<span class="Delimiter">;</span>
 <span id="L623" class="LineNr">623 </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>buf<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L624" class="LineNr">624 </span>    buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> = <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L624" class="LineNr">624 </span>    buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> = <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L625" class="LineNr">625 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L626" class="LineNr">626 </span>    <span class="Normal">int</span> delim = buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>find<span class="Delimiter">(</span><span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
 <span id="L627" class="LineNr">627 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>delim == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -695,7 +695,7 @@ if ('onhashchange' in window) {
 <span id="L629" class="LineNr">629 </span>      result<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L630" class="LineNr">630 </span>      <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L631" class="LineNr">631 </span>    <span class="Delimiter">}</span>
-<span id="L632" class="LineNr">632 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> delim<span class="Delimiter">)),</span>  <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>substr<span class="Delimiter">(</span>delim+<span class="Constant">2</span><span class="Delimiter">))));</span>
+<span id="L632" class="LineNr">632 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> delim<span class="Delimiter">)),</span>  <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>substr<span class="Delimiter">(</span>delim+<span class="Constant">2</span><span class="Delimiter">))));</span>
 <span id="L633" class="LineNr">633 </span>  <span class="Delimiter">}</span>
 <span id="L634" class="LineNr">634 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L635" class="LineNr">635 </span><span class="Delimiter">}</span>
@@ -763,7 +763,7 @@ if ('onhashchange' in window) {
 <span id="L697" class="LineNr">697 </span><span class="Comment">// simplified version of check_trace_contents() that emits errors rather</span>
 <span id="L698" class="LineNr">698 </span><span class="Comment">// than just printing to stderr</span>
 <span id="L699" class="LineNr">699 </span><span class="Normal">bool</span> check_trace_missing<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L700" class="LineNr">700 </span>  Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L156'>newline</a><span class="Delimiter">();</span>
+<span id="L700" class="LineNr">700 </span>  Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
 <span id="L701" class="LineNr">701 </span>  vector&lt;trace_line&gt; lines = parse_trace<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L702" class="LineNr">702 </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>lines<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L703" class="LineNr">703 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>label<span class="Delimiter">,</span> lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>contents<span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>