about summary refs log tree commit diff stats
path: root/html/003trace.cc.html
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2017-03-02 05:48:01 -0800
committerKartik K. Agaram <vc@akkartik.com>2017-03-02 05:48:01 -0800
commitfd7d8138a4ff5515f9b79c584a98d5c26d8ddb8a (patch)
treeea6e8e1c988a67e302d9f6abe6fda46e1648dc72 /html/003trace.cc.html
parenta802f0cedc7b5580d746f46ae62fcf8074ae3c49 (diff)
downloadmu-fd7d8138a4ff5515f9b79c584a98d5c26d8ddb8a.tar.gz
3750
Diffstat (limited to 'html/003trace.cc.html')
-rw-r--r--html/003trace.cc.html738
1 files changed, 365 insertions, 373 deletions
diff --git a/html/003trace.cc.html b/html/003trace.cc.html
index 069cc057..b1999eb4 100644
--- a/html/003trace.cc.html
+++ b/html/003trace.cc.html
@@ -72,400 +72,392 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr"> 13 </span><span class="Comment">//: longer valid. In both cases you end up having to reorganize code as well as</span>
 <span id="L14" class="LineNr"> 14 </span><span class="Comment">//: tests, an error-prone activity.</span>
 <span id="L15" class="LineNr"> 15 </span><span class="Comment">//:</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Comment">//: This file tries to fix this problem by supporting domain-driven testing.</span>
-<span id="L17" class="LineNr"> 17 </span><span class="Comment">//: We try to focus on the domain of inputs the program should work on. All</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment">//: tests invoke the program in a single way: by calling run() with different</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment">//: inputs. The program operates on the input and logs _facts_ it deduces to a</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: trace:</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Comment">//: In response, this layer introduces the notion of *domain-driven* testing.</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Comment">//: We focus on the domain of inputs the whole program needs to handle rather</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Comment">//: than the correctness of individual functions. All tests invoke the program</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment">//: in a single way: by calling run() with some input. As the program operates</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: on the input, it traces out a list of _facts_ deduced about the domain:</span>
 <span id="L21" class="LineNr"> 21 </span><span class="Comment">//:   trace(&quot;label&quot;) &lt;&lt; &quot;fact 1: &quot; &lt;&lt; val;</span>
 <span id="L22" class="LineNr"> 22 </span><span class="Comment">//:</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Comment">//: The tests check for facts:</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Comment">//: Tests can now check these facts:</span>
 <span id="L24" class="LineNr"> 24 </span><span class="Comment">//:   :(scenario foo)</span>
 <span id="L25" class="LineNr"> 25 </span><span class="Comment">//:   34  # call run() with this input</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Comment">//:   +label: fact 1: 34  # trace should have logged this at the end</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Comment">//:   -label: fact 1: 35  # trace should never contain such a line</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Comment">//:   +label: fact 1: 34  # 'run' should have deduced this fact</span>
+<span id="L27" class="LineNr"> 27 </span><span class="Comment">//:   -label: fact 1: 35  # the trace should not contain such a fact</span>
 <span id="L28" class="LineNr"> 28 </span><span class="Comment">//:</span>
 <span id="L29" class="LineNr"> 29 </span><span class="Comment">//: Since we never call anything but the run() function directly, we never have</span>
 <span id="L30" class="LineNr"> 30 </span><span class="Comment">//: to rewrite the tests when we reorganize the internals of the program. We</span>
 <span id="L31" class="LineNr"> 31 </span><span class="Comment">//: just have to make sure our rewrite deduces the same facts about the domain,</span>
 <span id="L32" class="LineNr"> 32 </span><span class="Comment">//: and that's something we're going to have to do anyway.</span>
 <span id="L33" class="LineNr"> 33 </span><span class="Comment">//:</span>
-<span id="L34" class="LineNr"> 34 </span><span class="Comment">//: To avoid the combinatorial explosion of integration tests, each layer logs</span>
-<span id="L35" class="LineNr"> 35 </span><span class="Comment">//: facts to the trace with a common label. Tests in that layer focus on the</span>
-<span id="L36" class="LineNr"> 36 </span><span class="Comment">//: same label. In essence, validating the facts logged with a specific label</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Comment">//: is identical to calling some internal subsystem directly.</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Comment">//: To avoid the combinatorial explosion of integration tests, each layer</span>
+<span id="L35" class="LineNr"> 35 </span><span class="Comment">//: mainly logs facts to the trace with a common *label*. All tests in a layer</span>
+<span id="L36" class="LineNr"> 36 </span><span class="Comment">//: tend to check facts with this label. Validating the facts logged with a</span>
+<span id="L37" class="LineNr"> 37 </span><span class="Comment">//: specific label is like calling functions of that layer directly.</span>
 <span id="L38" class="LineNr"> 38 </span><span class="Comment">//:</span>
-<span id="L39" class="LineNr"> 39 </span><span class="Comment">//: Traces interact salubriously with layers. Thanks to our ordering</span>
-<span id="L40" class="LineNr"> 40 </span><span class="Comment">//: directives, each layer can contain its own tests. They may rely on other</span>
-<span id="L41" class="LineNr"> 41 </span><span class="Comment">//: layers, but when a test fails it's usually due to breakage in the same</span>
-<span id="L42" class="LineNr"> 42 </span><span class="Comment">//: layer. When multiple tests fail, it's usually useful to debug the very</span>
-<span id="L43" class="LineNr"> 43 </span><span class="Comment">//: first test to fail. This is in contrast with the traditional organization</span>
-<span id="L44" class="LineNr"> 44 </span><span class="Comment">//: of code, where changes can cause breakages in faraway subsystems, and</span>
-<span id="L45" class="LineNr"> 45 </span><span class="Comment">//: picking the right test to debug can be an important skill to pick up.</span>
-<span id="L46" class="LineNr"> 46 </span><span class="Comment">//:</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Comment">//: To build robust tests, trace facts about your domain rather than details of</span>
-<span id="L48" class="LineNr"> 48 </span><span class="Comment">//: how you computed them.</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Comment">//:</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Comment">//: More details: <a href="http://akkartik.name/blog/tracing-tests">http://akkartik.name/blog/tracing-tests</a></span>
-<span id="L51" class="LineNr"> 51 </span><span class="Comment">//:</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Comment">//: ---</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Comment">//:</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Comment">//: Between layers and domain-driven testing, programming starts to look like a</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Comment">//: fundamentally different activity. Instead of a) superficial, b) local rules</span>
-<span id="L56" class="LineNr"> 56 </span><span class="Comment">//: on c) code [like say <a href="http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet],">http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet],</a></span>
-<span id="L57" class="LineNr"> 57 </span><span class="Comment">//: we allow programmers to engage with the a) deep, b) global structure of the</span>
-<span id="L58" class="LineNr"> 58 </span><span class="Comment">//: c) domain. If you can systematically track discontinuities in the domain,</span>
-<span id="L59" class="LineNr"> 59 </span><span class="Comment">//: you don't care if the code used gotos as long as it passed the tests. If</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Comment">//: tests become more robust to run it becomes easier to try out radically</span>
-<span id="L61" class="LineNr"> 61 </span><span class="Comment">//: different implementations for the same program. If code is super-easy to</span>
-<span id="L62" class="LineNr"> 62 </span><span class="Comment">//: rewrite, it becomes less important what indentation style it uses, or that</span>
-<span id="L63" class="LineNr"> 63 </span><span class="Comment">//: the objects are appropriately encapsulated, or that the functions are</span>
-<span id="L64" class="LineNr"> 64 </span><span class="Comment">//: referentially transparent.</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Comment">//: To build robust tests, trace facts about your domain rather than details of</span>
+<span id="L40" class="LineNr"> 40 </span><span class="Comment">//: how you computed them.</span>
+<span id="L41" class="LineNr"> 41 </span><span class="Comment">//:</span>
+<span id="L42" class="LineNr"> 42 </span><span class="Comment">//: More details: <a href="http://akkartik.name/blog/tracing-tests">http://akkartik.name/blog/tracing-tests</a></span>
+<span id="L43" class="LineNr"> 43 </span><span class="Comment">//:</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Comment">//: ---</span>
+<span id="L45" class="LineNr"> 45 </span><span class="Comment">//:</span>
+<span id="L46" class="LineNr"> 46 </span><span class="Comment">//: Between layers and domain-driven testing, programming starts to look like a</span>
+<span id="L47" class="LineNr"> 47 </span><span class="Comment">//: fundamentally different activity. Instead of a) superficial, b) local rules</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Comment">//: on c) code [like say <a href="http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet],">http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet],</a></span>
+<span id="L49" class="LineNr"> 49 </span><span class="Comment">//: we allow programmers to engage with the a) deep, b) global structure of the</span>
+<span id="L50" class="LineNr"> 50 </span><span class="Comment">//: c) domain. If you can systematically track discontinuities in the domain,</span>
+<span id="L51" class="LineNr"> 51 </span><span class="Comment">//: you don't care if the code used gotos as long as it passed the tests. If</span>
+<span id="L52" class="LineNr"> 52 </span><span class="Comment">//: tests become more robust to run it becomes easier to try out radically</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Comment">//: different implementations for the same program. If code is super-easy to</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Comment">//: rewrite, it becomes less important what indentation style it uses, or that</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Comment">//: the objects are appropriately encapsulated, or that the functions are</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Comment">//: referentially transparent.</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Comment">//:</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Comment">//: Instead of plumbing, programming becomes building and gradually refining a</span>
+<span id="L59" class="LineNr"> 59 </span><span class="Comment">//: map of the environment the program must operate under. Whether a program is</span>
+<span id="L60" class="LineNr"> 60 </span><span class="Comment">//: 'correct' at a given point in time is a red herring; what matters is</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Comment">//: avoiding regression by monotonically nailing down the more 'eventful' parts</span>
+<span id="L62" class="LineNr"> 62 </span><span class="Comment">//: of the terrain. It helps readers new and old, and rewards curiosity, to</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Comment">//: organize large programs in self-similar hierarchies of example scenarios</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Comment">//: colocated with the code that makes them work.</span>
 <span id="L65" class="LineNr"> 65 </span><span class="Comment">//:</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Comment">//: Instead of plumbing, programming becomes building and gradually refining a</span>
-<span id="L67" class="LineNr"> 67 </span><span class="Comment">//: map of the environment the program must operate under. Whether a program is</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Comment">//: 'correct' at a given point in time is a red herring; what matters is</span>
-<span id="L69" class="LineNr"> 69 </span><span class="Comment">//: avoiding regression by monotonically nailing down the more 'eventful' parts</span>
-<span id="L70" class="LineNr"> 70 </span><span class="Comment">//: of the terrain. It helps readers new and old, and rewards curiosity, to</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Comment">//: organize large programs in self-similar hierarchies of example scenarios</span>
-<span id="L72" class="LineNr"> 72 </span><span class="Comment">//: colocated with the code that makes them work.</span>
-<span id="L73" class="LineNr"> 73 </span><span class="Comment">//:</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Comment">//:   &quot;Programming properly should be regarded as an activity by which</span>
-<span id="L75" class="LineNr"> 75 </span><span class="Comment">//:   programmers form a mental model, rather than as production of a program.&quot;</span>
-<span id="L76" class="LineNr"> 76 </span><span class="Comment">//:   -- Peter Naur (<a href="http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22)">http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22)</a></span>
-<span id="L77" class="LineNr"> 77 </span>
-<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L79" class="LineNr"> 79 </span><span class="Normal">struct</span> trace_line <span class="Delimiter">{</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Normal">int</span> depth<span class="Delimiter">;</span>  <span class="Comment">// optional field just to help browse traces later</span>
-<span id="L81" class="LineNr"> 81 </span>  string label<span class="Delimiter">;</span>
-<span id="L82" class="LineNr"> 82 </span>  string contents<span class="Delimiter">;</span>
-<span id="L83" class="LineNr"> 83 </span>  trace_line<span class="Delimiter">(</span>string l<span class="Delimiter">,</span> string c<span class="Delimiter">)</span> :depth<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> label<span class="Delimiter">(</span>l<span class="Delimiter">),</span> contents<span class="Delimiter">(</span>c<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L84" class="LineNr"> 84 </span>  trace_line<span class="Delimiter">(</span><span class="Normal">int</span> d<span class="Delimiter">,</span> string l<span class="Delimiter">,</span> string c<span class="Delimiter">)</span> :depth<span class="Delimiter">(</span>d<span class="Delimiter">),</span> label<span class="Delimiter">(</span>l<span class="Delimiter">),</span> contents<span class="Delimiter">(</span>c<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L85" class="LineNr"> 85 </span><span class="Delimiter">};</span>
-<span id="L86" class="LineNr"> 86 </span>
-<span id="L87" class="LineNr"> 87 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L88" class="LineNr"> 88 </span><span class="Normal">bool</span> Hide_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Normal">bool</span> Dump_trace = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L90" class="LineNr"> 90 </span>string Dump_label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Delimiter">:(before &quot;End Setup&quot;)</span>
-<span id="L92" class="LineNr"> 92 </span>Hide_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span>Dump_trace = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L94" class="LineNr"> 94 </span>Dump_label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Comment">//:   &quot;Programming properly should be regarded as an activity by which</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Comment">//:   programmers form a mental model, rather than as production of a program.&quot;</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Comment">//:   -- Peter Naur (<a href="http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22)">http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22)</a></span>
+<span id="L69" class="LineNr"> 69 </span>
+<span id="L70" class="LineNr"> 70 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Normal">struct</span> trace_line <span class="Delimiter">{</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">int</span> depth<span class="Delimiter">;</span>  <span class="Comment">// optional field just to help browse traces later</span>
+<span id="L73" class="LineNr"> 73 </span>  string label<span class="Delimiter">;</span>
+<span id="L74" class="LineNr"> 74 </span>  string contents<span class="Delimiter">;</span>
+<span id="L75" class="LineNr"> 75 </span>  trace_line<span class="Delimiter">(</span>string l<span class="Delimiter">,</span> string c<span class="Delimiter">)</span> :depth<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> label<span class="Delimiter">(</span>l<span class="Delimiter">),</span> contents<span class="Delimiter">(</span>c<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L76" class="LineNr"> 76 </span>  trace_line<span class="Delimiter">(</span><span class="Normal">int</span> d<span class="Delimiter">,</span> string l<span class="Delimiter">,</span> string c<span class="Delimiter">)</span> :depth<span class="Delimiter">(</span>d<span class="Delimiter">),</span> label<span class="Delimiter">(</span>l<span class="Delimiter">),</span> contents<span class="Delimiter">(</span>c<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L77" class="LineNr"> 77 </span><span class="Delimiter">};</span>
+<span id="L78" class="LineNr"> 78 </span>
+<span id="L79" class="LineNr"> 79 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L80" class="LineNr"> 80 </span><span class="Normal">bool</span> Hide_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Normal">bool</span> Dump_trace = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L82" class="LineNr"> 82 </span>string Dump_label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L83" class="LineNr"> 83 </span><span class="Delimiter">:(before &quot;End Setup&quot;)</span>
+<span id="L84" class="LineNr"> 84 </span>Hide_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L85" class="LineNr"> 85 </span>Dump_trace = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L86" class="LineNr"> 86 </span>Dump_label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L87" class="LineNr"> 87 </span>
+<span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Comment">// Pre-define some global constants that trace_stream needs to know about.</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Comment">// Since they're in the Types section, they'll be included in any cleaved</span>
+<span id="L91" class="LineNr"> 91 </span><span class="Comment">// compilation units. So no extern linkage.</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Normal">const</span> <span class="Normal">int</span> Max_depth = <span class="Constant">9999</span><span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span><span class="Normal">const</span> <span class="Normal">int</span> Error_depth = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// definitely always print errors</span>
+<span id="L94" class="LineNr"> 94 </span><span class="Normal">const</span> <span class="Normal">int</span> App_depth = <span class="Constant">2</span><span class="Delimiter">;</span>  <span class="Comment">// temporarily where all Mu code will trace to</span>
 <span id="L95" class="LineNr"> 95 </span>
-<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Comment">// Pre-define some global constants that trace_stream needs to know about.</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Comment">// Since they're in the Types section, they'll be included in any cleaved</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Comment">// compilation units. So no extern linkage.</span>
-<span id="L100" class="LineNr">100 </span><span class="Normal">const</span> <span class="Normal">int</span> Max_depth = <span class="Constant">9999</span><span class="Delimiter">;</span>
-<span id="L101" class="LineNr">101 </span><span class="Normal">const</span> <span class="Normal">int</span> Error_depth = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// definitely always print errors</span>
-<span id="L102" class="LineNr">102 </span><span class="Normal">const</span> <span class="Normal">int</span> App_depth = <span class="Constant">2</span><span class="Delimiter">;</span>  <span class="Comment">// temporarily where all Mu code will trace to</span>
-<span id="L103" class="LineNr">103 </span>
-<span id="L104" class="LineNr">104 </span><span class="Normal">struct</span> trace_stream <span class="Delimiter">{</span>
-<span id="L105" class="LineNr">105 </span>  vector&lt;trace_line&gt; past_lines<span class="Delimiter">;</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Comment">// accumulator for current line</span>
-<span id="L107" class="LineNr">107 </span>  ostringstream* curr_stream<span class="Delimiter">;</span>
-<span id="L108" class="LineNr">108 </span>  string curr_label<span class="Delimiter">;</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Normal">int</span> curr_depth<span class="Delimiter">;</span>
-<span id="L110" class="LineNr">110 </span>  <span class="Normal">int</span> callstack_depth<span class="Delimiter">;</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Normal">int</span> collect_depth<span class="Delimiter">;</span>
-<span id="L112" class="LineNr">112 </span>  ofstream null_stream<span class="Delimiter">;</span>  <span class="Comment">// never opens a file, so writes silently fail</span>
-<span id="L113" class="LineNr">113 </span>  trace_stream<span class="Delimiter">()</span> :curr_stream<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> curr_depth<span class="Delimiter">(</span>Max_depth<span class="Delimiter">),</span> callstack_depth<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> collect_depth<span class="Delimiter">(</span>Max_depth<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L114" class="LineNr">114 </span>  <a href='003trace.cc.html#L114'>~trace_stream</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_stream<span class="Delimiter">)</span> <span class="Normal">delete</span> curr_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
-<span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span>  ostream&amp; stream<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L117" class="LineNr">117 </span>    <span class="Identifier">return</span> stream<span class="Delimiter">(</span>Max_depth<span class="Delimiter">,</span> label<span class="Delimiter">);</span>
+<span id="L96" class="LineNr"> 96 </span><span class="Normal">struct</span> trace_stream <span class="Delimiter">{</span>
+<span id="L97" class="LineNr"> 97 </span>  vector&lt;trace_line&gt; past_lines<span class="Delimiter">;</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Comment">// accumulator for current line</span>
+<span id="L99" class="LineNr"> 99 </span>  ostringstream* curr_stream<span class="Delimiter">;</span>
+<span id="L100" class="LineNr">100 </span>  string curr_label<span class="Delimiter">;</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Normal">int</span> curr_depth<span class="Delimiter">;</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Normal">int</span> callstack_depth<span class="Delimiter">;</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">int</span> collect_depth<span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span>  ofstream null_stream<span class="Delimiter">;</span>  <span class="Comment">// never opens a file, so writes silently fail</span>
+<span id="L105" class="LineNr">105 </span>  trace_stream<span class="Delimiter">()</span> :curr_stream<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> curr_depth<span class="Delimiter">(</span>Max_depth<span class="Delimiter">),</span> callstack_depth<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> collect_depth<span class="Delimiter">(</span>Max_depth<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L106" class="LineNr">106 </span>  <a href='003trace.cc.html#L106'>~trace_stream</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_stream<span class="Delimiter">)</span> <span class="Normal">delete</span> curr_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L107" class="LineNr">107 </span>
+<span id="L108" class="LineNr">108 </span>  ostream&amp; stream<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L109" class="LineNr">109 </span>    <span class="Identifier">return</span> stream<span class="Delimiter">(</span>Max_depth<span class="Delimiter">,</span> label<span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Delimiter">}</span>
+<span id="L111" class="LineNr">111 </span>
+<span id="L112" class="LineNr">112 </span>  ostream&amp; stream<span class="Delimiter">(</span><span class="Normal">int</span> depth<span class="Delimiter">,</span> string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L113" class="LineNr">113 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>depth &gt; collect_depth<span class="Delimiter">)</span> <span class="Identifier">return</span> null_stream<span class="Delimiter">;</span>
+<span id="L114" class="LineNr">114 </span>    curr_stream = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span>    curr_label = label<span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span>    curr_depth = depth<span class="Delimiter">;</span>
+<span id="L117" class="LineNr">117 </span>    <span class="Identifier">return</span> *curr_stream<span class="Delimiter">;</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Delimiter">}</span>
 <span id="L119" class="LineNr">119 </span>
-<span id="L120" class="LineNr">120 </span>  ostream&amp; stream<span class="Delimiter">(</span><span class="Normal">int</span> depth<span class="Delimiter">,</span> string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L121" class="LineNr">121 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>depth &gt; collect_depth<span class="Delimiter">)</span> <span class="Identifier">return</span> null_stream<span class="Delimiter">;</span>
-<span id="L122" class="LineNr">122 </span>    curr_stream = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span>
-<span id="L123" class="LineNr">123 </span>    curr_label = label<span class="Delimiter">;</span>
-<span id="L124" class="LineNr">124 </span>    curr_depth = depth<span class="Delimiter">;</span>
-<span id="L125" class="LineNr">125 </span>    <span class="Identifier">return</span> *curr_stream<span class="Delimiter">;</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Delimiter">}</span>
-<span id="L127" class="LineNr">127 </span>
-<span id="L128" class="LineNr">128 </span>  <span class="Comment">// be sure to call this before messing with curr_stream or curr_label</span>
-<span id="L129" class="LineNr">129 </span>  <span class="Normal">void</span> <a href='003trace.cc.html#L135'>newline</a><span class="Delimiter">();</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Comment">// useful for debugging</span>
-<span id="L131" class="LineNr">131 </span>  string <a href='003trace.cc.html#L151'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">);</span>  <span class="Comment">// empty label = show everything</span>
-<span id="L132" class="LineNr">132 </span><span class="Delimiter">};</span>
-<span id="L133" class="LineNr">133 </span>
-<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(code)</span>
-<span id="L135" class="LineNr">135 </span><span class="Normal">void</span> trace_stream::<a href='003trace.cc.html#L135'>newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L137" class="LineNr">137 </span>  string curr_contents = curr_stream<span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L139" class="LineNr">139 </span>    past_lines<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span>curr_depth<span class="Delimiter">,</span> <a href='003trace.cc.html#L363'>trim</a><span class="Delimiter">(</span>curr_label<span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
-<span id="L140" class="LineNr">140 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors &amp;&amp; curr_label == <span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span>
-<span id="L141" class="LineNr">141 </span>        || Dump_trace
-<span id="L142" class="LineNr">142 </span>        || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; curr_label == Dump_label<span class="Delimiter">))</span>
-<span id="L143" class="LineNr">143 </span>      cerr &lt;&lt; curr_label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; curr_contents &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Delimiter">}</span>
-<span id="L145" class="LineNr">145 </span>  <span class="Normal">delete</span> curr_stream<span class="Delimiter">;</span>
-<span id="L146" class="LineNr">146 </span>  curr_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L147" class="LineNr">147 </span>  curr_label<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L148" class="LineNr">148 </span>  curr_depth = Max_depth<span class="Delimiter">;</span>
-<span id="L149" class="LineNr">149 </span><span class="Delimiter">}</span>
-<span id="L150" class="LineNr">150 </span>
-<span id="L151" class="LineNr">151 </span>string trace_stream::<a href='003trace.cc.html#L151'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L152" class="LineNr">152 </span>  ostringstream output<span class="Delimiter">;</span>
-<span id="L153" class="LineNr">153 </span>  label = <a href='003trace.cc.html#L363'>trim</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L193'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L155" class="LineNr">155 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L156" class="LineNr">156 </span>      output &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>depth &lt;&lt; <span class="Constant">' '</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>contents &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L157" class="LineNr">157 </span>    <span class="Delimiter">}</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L159" class="LineNr">159 </span><span class="Delimiter">}</span>
-<span id="L160" class="LineNr">160 </span>
-<span id="L161" class="LineNr">161 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L162" class="LineNr">162 </span>trace_stream* Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L163" class="LineNr">163 </span><span class="Normal">int</span> Trace_errors = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
-<span id="L164" class="LineNr">164 </span>
-<span id="L165" class="LineNr">165 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L166" class="LineNr">166 </span><span class="PreProc">#define CLEAR_TRACE  </span><span class="Normal">delete</span><span class="PreProc"> Trace_stream</span><span class="Delimiter">,</span><span class="PreProc"> Trace_stream = </span><span class="Normal">new</span><span class="PreProc"> trace_stream</span><span class="Delimiter">;</span>
-<span id="L167" class="LineNr">167 </span>
-<span id="L168" class="LineNr">168 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
-<span id="L169" class="LineNr">169 </span><span class="PreProc">#define trace(</span><span class="Delimiter">...</span><span class="PreProc">)  !Trace_stream ? cerr </span><span class="Comment">/*</span><span class="Comment">print nothing</span><span class="Comment">*/</span><span class="PreProc"> : Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(__VA_ARGS__)</span>
-<span id="L170" class="LineNr">170 </span>
-<span id="L171" class="LineNr">171 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
-<span id="L172" class="LineNr">172 </span><span class="PreProc">#define dbg trace(</span><span class="Constant">0</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;a&quot;</span><span class="PreProc">)</span>
-<span id="L173" class="LineNr">173 </span><span class="PreProc">#define DUMP(label)  </span><span class="Normal">if</span><span class="PreProc"> (Trace_stream) cerr &lt;&lt; Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">readable_contents(label)</span><span class="Delimiter">;</span>
-<span id="L174" class="LineNr">174 </span>
-<span id="L175" class="LineNr">175 </span><span class="Comment">// Errors are a special layer.</span>
-<span id="L176" class="LineNr">176 </span><span class="PreProc">#define raise  (!Trace_stream ? (tb_shutdown()</span><span class="Delimiter">,</span><span class="PreProc">++Trace_errors</span><span class="Delimiter">,</span><span class="PreProc">cerr) </span><span class="Comment">/*</span><span class="Comment">do print</span><span class="Comment">*/</span><span class="PreProc"> : Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(Error_depth</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;error&quot;</span><span class="PreProc">))</span>
-<span id="L177" class="LineNr">177 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
-<span id="L178" class="LineNr">178 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
-<span id="L179" class="LineNr">179 </span><span class="PreProc">#define assert_for_now assert</span>
-<span id="L180" class="LineNr">180 </span>
-<span id="L181" class="LineNr">181 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span>
-<span id="L182" class="LineNr">182 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span>
-<span id="L183" class="LineNr">183 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
-<span id="L184" class="LineNr">184 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Passed &amp;&amp; !Hide_errors &amp;&amp; <a href='003trace.cc.html#L188'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L185" class="LineNr">185 </span>  Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L186" class="LineNr">186 </span><span class="Delimiter">}</span>
-<span id="L187" class="LineNr">187 </span><span class="Delimiter">:(code)</span>
-<span id="L188" class="LineNr">188 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L188'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Identifier">return</span> Trace_errors &gt; <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span> &gt; <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Comment">// be sure to call this before messing with curr_stream or curr_label</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Normal">void</span> <a href='003trace.cc.html#L127'>newline</a><span class="Delimiter">();</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Comment">// useful for debugging</span>
+<span id="L123" class="LineNr">123 </span>  string <a href='003trace.cc.html#L143'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">);</span>  <span class="Comment">// empty label = show everything</span>
+<span id="L124" class="LineNr">124 </span><span class="Delimiter">};</span>
+<span id="L125" class="LineNr">125 </span>
+<span id="L126" class="LineNr">126 </span><span class="Delimiter">:(code)</span>
+<span id="L127" class="LineNr">127 </span><span class="Normal">void</span> trace_stream::<a href='003trace.cc.html#L127'>newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L128" class="LineNr">128 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L129" class="LineNr">129 </span>  string curr_contents = curr_stream<span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
+<span id="L130" class="LineNr">130 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L131" class="LineNr">131 </span>    past_lines<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span>curr_depth<span class="Delimiter">,</span> <a href='003trace.cc.html#L355'>trim</a><span class="Delimiter">(</span>curr_label<span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
+<span id="L132" class="LineNr">132 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors &amp;&amp; curr_label == <span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span>
+<span id="L133" class="LineNr">133 </span>        || Dump_trace
+<span id="L134" class="LineNr">134 </span>        || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; curr_label == Dump_label<span class="Delimiter">))</span>
+<span id="L135" class="LineNr">135 </span>      cerr &lt;&lt; curr_label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; curr_contents &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L136" class="LineNr">136 </span>  <span class="Delimiter">}</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Normal">delete</span> curr_stream<span class="Delimiter">;</span>
+<span id="L138" class="LineNr">138 </span>  curr_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>  curr_label<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
+<span id="L140" class="LineNr">140 </span>  curr_depth = Max_depth<span class="Delimiter">;</span>
+<span id="L141" class="LineNr">141 </span><span class="Delimiter">}</span>
+<span id="L142" class="LineNr">142 </span>
+<span id="L143" class="LineNr">143 </span>string trace_stream::<a href='003trace.cc.html#L143'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L144" class="LineNr">144 </span>  ostringstream output<span class="Delimiter">;</span>
+<span id="L145" class="LineNr">145 </span>  label = <a href='003trace.cc.html#L355'>trim</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L147" class="LineNr">147 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L148" class="LineNr">148 </span>      output &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>depth &lt;&lt; <span class="Constant">' '</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>contents &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L149" class="LineNr">149 </span>    <span class="Delimiter">}</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L151" class="LineNr">151 </span><span class="Delimiter">}</span>
+<span id="L152" class="LineNr">152 </span>
+<span id="L153" class="LineNr">153 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L154" class="LineNr">154 </span>trace_stream* Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L155" class="LineNr">155 </span><span class="Normal">int</span> Trace_errors = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
+<span id="L156" class="LineNr">156 </span>
+<span id="L157" class="LineNr">157 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L158" class="LineNr">158 </span><span class="PreProc">#define CLEAR_TRACE  </span><span class="Normal">delete</span><span class="PreProc"> Trace_stream</span><span class="Delimiter">,</span><span class="PreProc"> Trace_stream = </span><span class="Normal">new</span><span class="PreProc"> trace_stream</span><span class="Delimiter">;</span>
+<span id="L159" class="LineNr">159 </span>
+<span id="L160" class="LineNr">160 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
+<span id="L161" class="LineNr">161 </span><span class="PreProc">#define trace(</span><span class="Delimiter">...</span><span class="PreProc">)  !Trace_stream ? cerr </span><span class="Comment">/*</span><span class="Comment">print nothing</span><span class="Comment">*/</span><span class="PreProc"> : Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(__VA_ARGS__)</span>
+<span id="L162" class="LineNr">162 </span>
+<span id="L163" class="LineNr">163 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
+<span id="L164" class="LineNr">164 </span><span class="PreProc">#define dbg trace(</span><span class="Constant">0</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;a&quot;</span><span class="PreProc">)</span>
+<span id="L165" class="LineNr">165 </span><span class="PreProc">#define DUMP(label)  </span><span class="Normal">if</span><span class="PreProc"> (Trace_stream) cerr &lt;&lt; Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">readable_contents(label)</span><span class="Delimiter">;</span>
+<span id="L166" class="LineNr">166 </span>
+<span id="L167" class="LineNr">167 </span><span class="Comment">// Errors are a special layer.</span>
+<span id="L168" class="LineNr">168 </span><span class="PreProc">#define raise  (!Trace_stream ? (tb_shutdown()</span><span class="Delimiter">,</span><span class="PreProc">++Trace_errors</span><span class="Delimiter">,</span><span class="PreProc">cerr) </span><span class="Comment">/*</span><span class="Comment">do print</span><span class="Comment">*/</span><span class="PreProc"> : Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(Error_depth</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;error&quot;</span><span class="PreProc">))</span>
+<span id="L169" class="LineNr">169 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
+<span id="L170" class="LineNr">170 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
+<span id="L171" class="LineNr">171 </span><span class="PreProc">#define assert_for_now assert</span>
+<span id="L172" class="LineNr">172 </span>
+<span id="L173" class="LineNr">173 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span>
+<span id="L174" class="LineNr">174 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span>
+<span id="L175" class="LineNr">175 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
+<span id="L176" class="LineNr">176 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Passed &amp;&amp; !Hide_errors &amp;&amp; <a href='003trace.cc.html#L180'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L177" class="LineNr">177 </span>  Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L178" class="LineNr">178 </span><span class="Delimiter">}</span>
+<span id="L179" class="LineNr">179 </span><span class="Delimiter">:(code)</span>
+<span id="L180" class="LineNr">180 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L180'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Identifier">return</span> Trace_errors &gt; <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span> &gt; <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L182" class="LineNr">182 </span><span class="Delimiter">}</span>
+<span id="L183" class="LineNr">183 </span>
+<span id="L184" class="LineNr">184 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L185" class="LineNr">185 </span><span class="Normal">struct</span> <a href='003trace.cc.html#L185'>end</a> <span class="Delimiter">{};</span>
+<span id="L186" class="LineNr">186 </span><span class="Delimiter">:(code)</span>
+<span id="L187" class="LineNr">187 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='001help.cc.html#L255'>unused</a> <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L188" class="LineNr">188 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L127'>newline</a><span class="Delimiter">();</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
 <span id="L190" class="LineNr">190 </span><span class="Delimiter">}</span>
 <span id="L191" class="LineNr">191 </span>
-<span id="L192" class="LineNr">192 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L193" class="LineNr">193 </span><span class="Normal">struct</span> <a href='003trace.cc.html#L193'>end</a> <span class="Delimiter">{};</span>
-<span id="L194" class="LineNr">194 </span><span class="Delimiter">:(code)</span>
-<span id="L195" class="LineNr">195 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='001help.cc.html#L255'>unused</a> <a href='003trace.cc.html#L193'>end</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L135'>newline</a><span class="Delimiter">();</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
-<span id="L198" class="LineNr">198 </span><span class="Delimiter">}</span>
-<span id="L199" class="LineNr">199 </span>
-<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L201" class="LineNr">201 </span><span class="Normal">bool</span> Save_trace = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L202" class="LineNr">202 </span>
-<span id="L203" class="LineNr">203 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
-<span id="L204" class="LineNr">204 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L205" class="LineNr">205 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>  lease_tracer<span class="Delimiter">();</span>
-<span id="L207" class="LineNr">207 </span>  <a href='003trace.cc.html#L211'>~lease_tracer</a><span class="Delimiter">();</span>
-<span id="L208" class="LineNr">208 </span><span class="Delimiter">};</span>
-<span id="L209" class="LineNr">209 </span><span class="Delimiter">:(code)</span>
-<span id="L210" class="LineNr">210 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
-<span id="L211" class="LineNr">211 </span>lease_tracer::<a href='003trace.cc.html#L211'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L212" class="LineNr">212 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// in case tests close Trace_stream</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L214" class="LineNr">214 </span>    ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_trace&quot;</span><span class="Delimiter">);</span>
-<span id="L215" class="LineNr">215 </span>    fout &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L151'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L216" class="LineNr">216 </span>    fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Delimiter">}</span>
-<span id="L218" class="LineNr">218 </span>  <span class="Normal">delete</span> Trace_stream<span class="Delimiter">,</span> Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L219" class="LineNr">219 </span><span class="Delimiter">}</span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L221" class="LineNr">221 </span><span class="PreProc">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer</span><span class="Delimiter">;</span>
-<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
-<span id="L223" class="LineNr">223 </span><a href='003trace.cc.html#L221'>START_TRACING_UNTIL_END_OF_SCOPE</a>
-<span id="L224" class="LineNr">224 </span>
-<span id="L225" class="LineNr">225 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L226" class="LineNr">226 </span><span class="PreProc">#define CHECK_TRACE_CONTENTS(</span><span class="Delimiter">...</span><span class="PreProc">)  check_trace_contents(__FUNCTION__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__FILE__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__LINE__</span><span class="Delimiter">,</span><span class="PreProc"> __VA_ARGS__)</span>
-<span id="L227" class="LineNr">227 </span>
-<span id="L228" class="LineNr">228 </span><span class="PreProc">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
-<span id="L229" class="LineNr">229 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
-<span id="L230" class="LineNr">230 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; trace_contains_errors()) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
-<span id="L231" class="LineNr">231 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): unexpected errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L232" class="LineNr">232 </span><span class="PreProc">    DUMP(</span><span class="Constant">&quot;error&quot;</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L233" class="LineNr">233 </span><span class="PreProc">    Passed = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L234" class="LineNr">234 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L235" class="LineNr">235 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
-<span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="PreProc">#define CHECK_TRACE_COUNT(label</span><span class="Delimiter">,</span><span class="PreProc"> count) \</span>
-<span id="L238" class="LineNr">238 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; trace_count(label) != (count)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
-<span id="L239" class="LineNr">239 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): trace_count of &quot;</span><span class="PreProc"> &lt;&lt; label &lt;&lt; </span><span class="Constant">&quot; should be &quot;</span><span class="PreProc"> &lt;&lt; count &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L240" class="LineNr">240 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;  got &quot;</span><span class="PreProc"> &lt;&lt; trace_count(label) &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> multiple eval </span><span class="Comment">*/</span><span class="PreProc"> \</span>
-<span id="L241" class="LineNr">241 </span><span class="PreProc">    DUMP(label)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L242" class="LineNr">242 </span><span class="PreProc">    Passed = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L243" class="LineNr">243 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
-<span id="L244" class="LineNr">244 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
-<span id="L245" class="LineNr">245 </span>
-<span id="L246" class="LineNr">246 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN(</span><span class="Delimiter">...</span><span class="PreProc">)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
-<span id="L247" class="LineNr">247 </span>
-<span id="L248" class="LineNr">248 </span><span class="Delimiter">:(code)</span>
-<span id="L249" class="LineNr">249 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L249'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L250" class="LineNr">250 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L252" class="LineNr">252 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L339'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
-<span id="L253" class="LineNr">253 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
-<span id="L255" class="LineNr">255 </span>    ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L256" class="LineNr">256 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L257" class="LineNr">257 </span>  string label<span class="Delimiter">,</span> contents<span class="Delimiter">;</span>
-<span id="L258" class="LineNr">258 </span>  <a href='003trace.cc.html#L281'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
-<span id="L259" class="LineNr">259 </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#L193'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L260" class="LineNr">260 </span>    <span class="Normal">if</span> <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="L261" class="LineNr">261 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contents != <a href='003trace.cc.html#L363'>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="L262" class="LineNr">262 </span>    ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L263" class="LineNr">263 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
-<span id="L264" class="LineNr">264 </span>      ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L265" class="LineNr">265 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L266" class="LineNr">266 </span>    <a href='003trace.cc.html#L281'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Delimiter">}</span>
-<span id="L268" class="LineNr">268 </span>
-<span id="L269" class="LineNr">269 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L294'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> contents<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L270" class="LineNr">270 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): line [&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; contents &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L169'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L271" class="LineNr">271 </span>    <a href='003trace.cc.html#L173'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Delimiter">}</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L274" class="LineNr">274 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): missing [&quot;</span> &lt;&lt; contents &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L169'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L275" class="LineNr">275 </span>    <a href='003trace.cc.html#L173'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Delimiter">}</span>
-<span id="L277" class="LineNr">277 </span>  Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L278" class="LineNr">278 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L279" class="LineNr">279 </span><span class="Delimiter">}</span>
-<span id="L280" class="LineNr">280 </span>
-<span id="L281" class="LineNr">281 </span><span class="Normal">void</span> <a href='003trace.cc.html#L281'>split_label_contents</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> string* label<span class="Delimiter">,</span> string* contents<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Normal">static</span> <span class="Normal">const</span> string delim<span class="Delimiter">(</span><span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
-<span id="L283" class="LineNr">283 </span>  <span class="Normal">size_t</span> pos = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L285" class="LineNr">285 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L286" class="LineNr">286 </span>    *contents = <a href='003trace.cc.html#L363'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Delimiter">}</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L289" class="LineNr">289 </span>    *label = <a href='003trace.cc.html#L363'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> pos<span class="Delimiter">));</span>
-<span id="L290" class="LineNr">290 </span>    *contents = <a href='003trace.cc.html#L363'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">)));</span>
-<span id="L291" class="LineNr">291 </span>  <span class="Delimiter">}</span>
+<span id="L192" class="LineNr">192 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L193" class="LineNr">193 </span><span class="Normal">bool</span> Save_trace = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L194" class="LineNr">194 </span>
+<span id="L195" class="LineNr">195 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
+<span id="L196" class="LineNr">196 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L197" class="LineNr">197 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
+<span id="L198" class="LineNr">198 </span>  lease_tracer<span class="Delimiter">();</span>
+<span id="L199" class="LineNr">199 </span>  <a href='003trace.cc.html#L203'>~lease_tracer</a><span class="Delimiter">();</span>
+<span id="L200" class="LineNr">200 </span><span class="Delimiter">};</span>
+<span id="L201" class="LineNr">201 </span><span class="Delimiter">:(code)</span>
+<span id="L202" class="LineNr">202 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L203" class="LineNr">203 </span>lease_tracer::<a href='003trace.cc.html#L203'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// in case tests close Trace_stream</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L206" class="LineNr">206 </span>    ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_trace&quot;</span><span class="Delimiter">);</span>
+<span id="L207" class="LineNr">207 </span>    fout &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L143'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L208" class="LineNr">208 </span>    fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L209" class="LineNr">209 </span>  <span class="Delimiter">}</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Normal">delete</span> Trace_stream<span class="Delimiter">,</span> Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L211" class="LineNr">211 </span><span class="Delimiter">}</span>
+<span id="L212" class="LineNr">212 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L213" class="LineNr">213 </span><span class="PreProc">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer</span><span class="Delimiter">;</span>
+<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
+<span id="L215" class="LineNr">215 </span><a href='003trace.cc.html#L213'>START_TRACING_UNTIL_END_OF_SCOPE</a>
+<span id="L216" class="LineNr">216 </span>
+<span id="L217" class="LineNr">217 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L218" class="LineNr">218 </span><span class="PreProc">#define CHECK_TRACE_CONTENTS(</span><span class="Delimiter">...</span><span class="PreProc">)  check_trace_contents(__FUNCTION__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__FILE__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__LINE__</span><span class="Delimiter">,</span><span class="PreProc"> __VA_ARGS__)</span>
+<span id="L219" class="LineNr">219 </span>
+<span id="L220" class="LineNr">220 </span><span class="PreProc">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
+<span id="L221" class="LineNr">221 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
+<span id="L222" class="LineNr">222 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; trace_contains_errors()) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L223" class="LineNr">223 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): unexpected errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L224" class="LineNr">224 </span><span class="PreProc">    DUMP(</span><span class="Constant">&quot;error&quot;</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L225" class="LineNr">225 </span><span class="PreProc">    Passed = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L226" class="LineNr">226 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L227" class="LineNr">227 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
+<span id="L228" class="LineNr">228 </span>
+<span id="L229" class="LineNr">229 </span><span class="PreProc">#define CHECK_TRACE_COUNT(label</span><span class="Delimiter">,</span><span class="PreProc"> count) \</span>
+<span id="L230" class="LineNr">230 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; trace_count(label) != (count)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L231" class="LineNr">231 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): trace_count of &quot;</span><span class="PreProc"> &lt;&lt; label &lt;&lt; </span><span class="Constant">&quot; should be &quot;</span><span class="PreProc"> &lt;&lt; count &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L232" class="LineNr">232 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;  got &quot;</span><span class="PreProc"> &lt;&lt; trace_count(label) &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> multiple eval </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L233" class="LineNr">233 </span><span class="PreProc">    DUMP(label)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L234" class="LineNr">234 </span><span class="PreProc">    Passed = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L235" class="LineNr">235 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L236" class="LineNr">236 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
+<span id="L237" class="LineNr">237 </span>
+<span id="L238" class="LineNr">238 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN(</span><span class="Delimiter">...</span><span class="PreProc">)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
+<span id="L239" class="LineNr">239 </span>
+<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(code)</span>
+<span id="L241" class="LineNr">241 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L241'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L242" class="LineNr">242 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L244" class="LineNr">244 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L331'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L246" class="LineNr">246 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
+<span id="L247" class="LineNr">247 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L249" class="LineNr">249 </span>  string label<span class="Delimiter">,</span> contents<span class="Delimiter">;</span>
+<span id="L250" class="LineNr">250 </span>  <a href='003trace.cc.html#L273'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
+<span id="L251" class="LineNr">251 </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#L185'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L252" class="LineNr">252 </span>    <span class="Normal">if</span> <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="L253" class="LineNr">253 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contents != <a href='003trace.cc.html#L355'>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="L254" class="LineNr">254 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L255" class="LineNr">255 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
+<span id="L256" class="LineNr">256 </span>      ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L257" class="LineNr">257 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L258" class="LineNr">258 </span>    <a href='003trace.cc.html#L273'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
+<span id="L259" class="LineNr">259 </span>  <span class="Delimiter">}</span>
+<span id="L260" class="LineNr">260 </span>
+<span id="L261" class="LineNr">261 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L286'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> contents<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L262" class="LineNr">262 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): line [&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; contents &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L161'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L263" class="LineNr">263 </span>    <a href='003trace.cc.html#L165'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Delimiter">}</span>
+<span id="L265" class="LineNr">265 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L266" class="LineNr">266 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): missing [&quot;</span> &lt;&lt; contents &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L161'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L267" class="LineNr">267 </span>    <a href='003trace.cc.html#L165'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Delimiter">}</span>
+<span id="L269" class="LineNr">269 </span>  Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L271" class="LineNr">271 </span><span class="Delimiter">}</span>
+<span id="L272" class="LineNr">272 </span>
+<span id="L273" class="LineNr">273 </span><span class="Normal">void</span> <a href='003trace.cc.html#L273'>split_label_contents</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> string* label<span class="Delimiter">,</span> string* contents<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Normal">static</span> <span class="Normal">const</span> string delim<span class="Delimiter">(</span><span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Normal">size_t</span> pos = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L277" class="LineNr">277 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L278" class="LineNr">278 </span>    *contents = <a href='003trace.cc.html#L355'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Delimiter">}</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L281" class="LineNr">281 </span>    *label = <a href='003trace.cc.html#L355'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> pos<span class="Delimiter">));</span>
+<span id="L282" class="LineNr">282 </span>    *contents = <a href='003trace.cc.html#L355'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">)));</span>
+<span id="L283" class="LineNr">283 </span>  <span class="Delimiter">}</span>
+<span id="L284" class="LineNr">284 </span><span class="Delimiter">}</span>
+<span id="L285" class="LineNr">285 </span>
+<span id="L286" class="LineNr">286 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L286'>line_exists_anywhere</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; label<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; contents<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L287" class="LineNr">287 </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#L185'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L288" class="LineNr">288 </span>    <span class="Normal">if</span> <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="L289" class="LineNr">289 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contents == <a href='003trace.cc.html#L355'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L290" class="LineNr">290 </span>  <span class="Delimiter">}</span>
+<span id="L291" class="LineNr">291 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L292" class="LineNr">292 </span><span class="Delimiter">}</span>
 <span id="L293" class="LineNr">293 </span>
-<span id="L294" class="LineNr">294 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L294'>line_exists_anywhere</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; label<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; contents<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L295" class="LineNr">295 </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#L193'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L296" class="LineNr">296 </span>    <span class="Normal">if</span> <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="L297" class="LineNr">297 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contents == <a href='003trace.cc.html#L363'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Delimiter">}</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L300" class="LineNr">300 </span><span class="Delimiter">}</span>
-<span id="L301" class="LineNr">301 </span>
-<span id="L302" class="LineNr">302 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L304" class="LineNr">304 </span><span class="Delimiter">}</span>
-<span id="L305" class="LineNr">305 </span>
-<span id="L306" class="LineNr">306 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L309" class="LineNr">309 </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#L193'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L310" class="LineNr">310 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L311" class="LineNr">311 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>line == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L363'>trim</a><span class="Delimiter">(</span>line<span class="Delimiter">)</span> == <a href='003trace.cc.html#L363'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span>
-<span id="L312" class="LineNr">312 </span>        ++result<span class="Delimiter">;</span>
-<span id="L313" class="LineNr">313 </span>    <span class="Delimiter">}</span>
-<span id="L314" class="LineNr">314 </span>  <span class="Delimiter">}</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L316" class="LineNr">316 </span><span class="Delimiter">}</span>
-<span id="L317" class="LineNr">317 </span>
-<span id="L318" class="LineNr">318 </span><span class="Normal">int</span> <a href='003trace.cc.html#L318'>trace_count_prefix</a><span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string prefix<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L319" class="LineNr">319 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L320" class="LineNr">320 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L321" class="LineNr">321 </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#L193'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L322" class="LineNr">322 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L323" class="LineNr">323 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L74'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L363'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">),</span> <a href='003trace.cc.html#L363'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
-<span id="L324" class="LineNr">324 </span>        ++result<span class="Delimiter">;</span>
-<span id="L325" class="LineNr">325 </span>    <span class="Delimiter">}</span>
-<span id="L326" class="LineNr">326 </span>  <span class="Delimiter">}</span>
-<span id="L327" class="LineNr">327 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L328" class="LineNr">328 </span><span class="Delimiter">}</span>
-<span id="L329" class="LineNr">329 </span>
-<span id="L330" class="LineNr">330 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L331" class="LineNr">331 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> line<span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L332" class="LineNr">332 </span><span class="Delimiter">}</span>
-<span id="L333" class="LineNr">333 </span>
-<span id="L334" class="LineNr">334 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L335" class="LineNr">335 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L354'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Identifier">return</span> trace_doesnt_contain<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L337" class="LineNr">337 </span><span class="Delimiter">}</span>
-<span id="L338" class="LineNr">338 </span>
-<span id="L339" class="LineNr">339 </span>vector&lt;string&gt; <a href='003trace.cc.html#L339'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L340" class="LineNr">340 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Normal">size_t</span> begin=<span class="Constant">0</span><span class="Delimiter">,</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L343" class="LineNr">343 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L193'>end</a> == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L344" class="LineNr">344 </span>      result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> string::npos<span class="Delimiter">));</span>
-<span id="L345" class="LineNr">345 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L346" class="LineNr">346 </span>    <span class="Delimiter">}</span>
-<span id="L347" class="LineNr">347 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> end-begin<span class="Delimiter">));</span>
-<span id="L348" class="LineNr">348 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L349" class="LineNr">349 </span>    <a href='003trace.cc.html#L193'>end</a> = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Delimiter">}</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L352" class="LineNr">352 </span><span class="Delimiter">}</span>
-<span id="L353" class="LineNr">353 </span>
-<span id="L354" class="LineNr">354 </span>vector&lt;string&gt; <a href='003trace.cc.html#L354'>split_first</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L355" class="LineNr">355 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Normal">size_t</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L357" class="LineNr">357 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <a href='003trace.cc.html#L193'>end</a><span class="Delimiter">));</span>
-<span id="L358" class="LineNr">358 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L193'>end</a> != string::npos<span class="Delimiter">)</span>
-<span id="L359" class="LineNr">359 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">),</span> string::npos<span class="Delimiter">));</span>
-<span id="L360" class="LineNr">360 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L361" class="LineNr">361 </span><span class="Delimiter">}</span>
-<span id="L362" class="LineNr">362 </span>
-<span id="L363" class="LineNr">363 </span>string <a href='003trace.cc.html#L363'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L364" class="LineNr">364 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L365" class="LineNr">365 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span><a href='003trace.cc.html#L193'>end</a><span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span>
-<span id="L366" class="LineNr">366 </span>    ++first<span class="Delimiter">;</span>
-<span id="L367" class="LineNr">367 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span><a href='003trace.cc.html#L193'>end</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L368" class="LineNr">368 </span>
-<span id="L369" class="LineNr">369 </span>  string::const_iterator last = --s<span class="Delimiter">.</span><a href='003trace.cc.html#L193'>end</a><span class="Delimiter">();</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>last != s<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*last<span class="Delimiter">))</span>
-<span id="L371" class="LineNr">371 </span>    --last<span class="Delimiter">;</span>
-<span id="L372" class="LineNr">372 </span>  ++last<span class="Delimiter">;</span>
-<span id="L373" class="LineNr">373 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<span class="Delimiter">);</span>
-<span id="L374" class="LineNr">374 </span><span class="Delimiter">}</span>
-<span id="L375" class="LineNr">375 </span>
-<span id="L376" class="LineNr">376 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L377" class="LineNr">377 </span><span class="PreProc">#include </span><span class="Constant">&lt;vector&gt;</span>
-<span id="L378" class="LineNr">378 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
-<span id="L379" class="LineNr">379 </span><span class="PreProc">#include </span><span class="Constant">&lt;list&gt;</span>
-<span id="L380" class="LineNr">380 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
-<span id="L381" class="LineNr">381 </span><span class="PreProc">#include </span><span class="Constant">&lt;map&gt;</span>
-<span id="L382" class="LineNr">382 </span><span class="Normal">using</span> std::map<span class="Delimiter">;</span>
-<span id="L383" class="LineNr">383 </span><span class="PreProc">#include </span><span class="Constant">&lt;set&gt;</span>
-<span id="L384" class="LineNr">384 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
-<span id="L385" class="LineNr">385 </span><span class="PreProc">#include </span><span class="Constant">&lt;algorithm&gt;</span>
+<span id="L294" class="LineNr">294 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L296" class="LineNr">296 </span><span class="Delimiter">}</span>
+<span id="L297" class="LineNr">297 </span>
+<span id="L298" class="LineNr">298 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L301" class="LineNr">301 </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#L185'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L302" class="LineNr">302 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L303" class="LineNr">303 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>line == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L355'>trim</a><span class="Delimiter">(</span>line<span class="Delimiter">)</span> == <a href='003trace.cc.html#L355'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span>
+<span id="L304" class="LineNr">304 </span>        ++result<span class="Delimiter">;</span>
+<span id="L305" class="LineNr">305 </span>    <span class="Delimiter">}</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Delimiter">}</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L308" class="LineNr">308 </span><span class="Delimiter">}</span>
+<span id="L309" class="LineNr">309 </span>
+<span id="L310" class="LineNr">310 </span><span class="Normal">int</span> <a href='003trace.cc.html#L310'>trace_count_prefix</a><span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string prefix<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L313" class="LineNr">313 </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#L185'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L314" class="LineNr">314 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L315" class="LineNr">315 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L74'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L355'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">),</span> <a href='003trace.cc.html#L355'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
+<span id="L316" class="LineNr">316 </span>        ++result<span class="Delimiter">;</span>
+<span id="L317" class="LineNr">317 </span>    <span class="Delimiter">}</span>
+<span id="L318" class="LineNr">318 </span>  <span class="Delimiter">}</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L320" class="LineNr">320 </span><span class="Delimiter">}</span>
+<span id="L321" class="LineNr">321 </span>
+<span id="L322" class="LineNr">322 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L323" class="LineNr">323 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> line<span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L324" class="LineNr">324 </span><span class="Delimiter">}</span>
+<span id="L325" class="LineNr">325 </span>
+<span id="L326" class="LineNr">326 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L327" class="LineNr">327 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L346'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
+<span id="L328" class="LineNr">328 </span>  <span class="Identifier">return</span> trace_doesnt_contain<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L329" class="LineNr">329 </span><span class="Delimiter">}</span>
+<span id="L330" class="LineNr">330 </span>
+<span id="L331" class="LineNr">331 </span>vector&lt;string&gt; <a href='003trace.cc.html#L331'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L332" class="LineNr">332 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L333" class="LineNr">333 </span>  <span class="Normal">size_t</span> begin=<span class="Constant">0</span><span class="Delimiter">,</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L335" class="LineNr">335 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L185'>end</a> == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L336" class="LineNr">336 </span>      result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> string::npos<span class="Delimiter">));</span>
+<span id="L337" class="LineNr">337 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L338" class="LineNr">338 </span>    <span class="Delimiter">}</span>
+<span id="L339" class="LineNr">339 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> end-begin<span class="Delimiter">));</span>
+<span id="L340" class="LineNr">340 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L341" class="LineNr">341 </span>    <a href='003trace.cc.html#L185'>end</a> = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
+<span id="L342" class="LineNr">342 </span>  <span class="Delimiter">}</span>
+<span id="L343" class="LineNr">343 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L344" class="LineNr">344 </span><span class="Delimiter">}</span>
+<span id="L345" class="LineNr">345 </span>
+<span id="L346" class="LineNr">346 </span>vector&lt;string&gt; <a href='003trace.cc.html#L346'>split_first</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L347" class="LineNr">347 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Normal">size_t</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L349" class="LineNr">349 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">));</span>
+<span id="L350" class="LineNr">350 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L185'>end</a> != string::npos<span class="Delimiter">)</span>
+<span id="L351" class="LineNr">351 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">),</span> string::npos<span class="Delimiter">));</span>
+<span id="L352" class="LineNr">352 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L353" class="LineNr">353 </span><span class="Delimiter">}</span>
+<span id="L354" class="LineNr">354 </span>
+<span id="L355" class="LineNr">355 </span>string <a href='003trace.cc.html#L355'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L356" class="LineNr">356 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
+<span id="L357" class="LineNr">357 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span><a href='003trace.cc.html#L185'>end</a><span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span>
+<span id="L358" class="LineNr">358 </span>    ++first<span class="Delimiter">;</span>
+<span id="L359" class="LineNr">359 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span><a href='003trace.cc.html#L185'>end</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L360" class="LineNr">360 </span>
+<span id="L361" class="LineNr">361 </span>  string::const_iterator last = --s<span class="Delimiter">.</span><a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>last != s<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*last<span class="Delimiter">))</span>
+<span id="L363" class="LineNr">363 </span>    --last<span class="Delimiter">;</span>
+<span id="L364" class="LineNr">364 </span>  ++last<span class="Delimiter">;</span>
+<span id="L365" class="LineNr">365 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<span class="Delimiter">);</span>
+<span id="L366" class="LineNr">366 </span><span class="Delimiter">}</span>
+<span id="L367" class="LineNr">367 </span>
+<span id="L368" class="LineNr">368 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L369" class="LineNr">369 </span><span class="PreProc">#include </span><span class="Constant">&lt;vector&gt;</span>
+<span id="L370" class="LineNr">370 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
+<span id="L371" class="LineNr">371 </span><span class="PreProc">#include </span><span class="Constant">&lt;list&gt;</span>
+<span id="L372" class="LineNr">372 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
+<span id="L373" class="LineNr">373 </span><span class="PreProc">#include </span><span class="Constant">&lt;map&gt;</span>
+<span id="L374" class="LineNr">374 </span><span class="Normal">using</span> std::map<span class="Delimiter">;</span>
+<span id="L375" class="LineNr">375 </span><span class="PreProc">#include </span><span class="Constant">&lt;set&gt;</span>
+<span id="L376" class="LineNr">376 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
+<span id="L377" class="LineNr">377 </span><span class="PreProc">#include </span><span class="Constant">&lt;algorithm&gt;</span>
+<span id="L378" class="LineNr">378 </span>
+<span id="L379" class="LineNr">379 </span><span class="PreProc">#include </span><span class="Constant">&lt;sstream&gt;</span>
+<span id="L380" class="LineNr">380 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
+<span id="L381" class="LineNr">381 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
+<span id="L382" class="LineNr">382 </span>
+<span id="L383" class="LineNr">383 </span><span class="PreProc">#include </span><span class="Constant">&lt;fstream&gt;</span>
+<span id="L384" class="LineNr">384 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
+<span id="L385" class="LineNr">385 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
 <span id="L386" class="LineNr">386 </span>
-<span id="L387" class="LineNr">387 </span><span class="PreProc">#include </span><span class="Constant">&lt;sstream&gt;</span>
-<span id="L388" class="LineNr">388 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
-<span id="L389" class="LineNr">389 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
-<span id="L390" class="LineNr">390 </span>
-<span id="L391" class="LineNr">391 </span><span class="PreProc">#include </span><span class="Constant">&lt;fstream&gt;</span>
-<span id="L392" class="LineNr">392 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
-<span id="L393" class="LineNr">393 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
-<span id="L394" class="LineNr">394 </span>
-<span id="L395" class="LineNr">395 </span><span class="PreProc">#include </span><span class="Constant">&quot;termbox/termbox.h&quot;</span>
-<span id="L396" class="LineNr">396 </span>
-<span id="L397" class="LineNr">397 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L398" class="LineNr">398 </span><span class="Comment">//: In future layers we'll use the depth field as follows:</span>
+<span id="L387" class="LineNr">387 </span><span class="PreProc">#include </span><span class="Constant">&quot;termbox/termbox.h&quot;</span>
+<span id="L388" class="LineNr">388 </span>
+<span id="L389" class="LineNr">389 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L390" class="LineNr">390 </span><span class="Comment">//: In future layers we'll use the depth field as follows:</span>
+<span id="L391" class="LineNr">391 </span><span class="Comment">//:</span>
+<span id="L392" class="LineNr">392 </span><span class="Comment">//: Errors will be depth 0.</span>
+<span id="L393" class="LineNr">393 </span><span class="Comment">//: Mu 'applications' will be able to use depths 1-100 as they like.</span>
+<span id="L394" class="LineNr">394 </span><span class="Comment">//: Primitive statements will occupy 101-9989</span>
+<span id="L395" class="LineNr">395 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Initial_callstack_depth = <span class="Constant">101</span><span class="Delimiter">;</span>
+<span id="L396" class="LineNr">396 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Max_callstack_depth = <span class="Constant">9989</span><span class="Delimiter">;</span>
+<span id="L397" class="LineNr">397 </span><span class="Comment">//: Finally, details of primitive Mu statements will occupy depth 9990-9999</span>
+<span id="L398" class="LineNr">398 </span><span class="Comment">//: (more on that later as well)</span>
 <span id="L399" class="LineNr">399 </span><span class="Comment">//:</span>
-<span id="L400" class="LineNr">400 </span><span class="Comment">//: Errors will be depth 0.</span>
-<span id="L401" class="LineNr">401 </span><span class="Comment">//: Mu 'applications' will be able to use depths 1-100 as they like.</span>
-<span id="L402" class="LineNr">402 </span><span class="Comment">//: Primitive statements will occupy 101-9989</span>
-<span id="L403" class="LineNr">403 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Initial_callstack_depth = <span class="Constant">101</span><span class="Delimiter">;</span>
-<span id="L404" class="LineNr">404 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Max_callstack_depth = <span class="Constant">9989</span><span class="Delimiter">;</span>
-<span id="L405" class="LineNr">405 </span><span class="Comment">//: Finally, details of primitive Mu statements will occupy depth 9990-9999</span>
-<span id="L406" class="LineNr">406 </span><span class="Comment">//: (more on that later as well)</span>
-<span id="L407" class="LineNr">407 </span><span class="Comment">//:</span>
-<span id="L408" class="LineNr">408 </span><span class="Comment">//: This framework should help us hide some details at each level, mixing</span>
-<span id="L409" class="LineNr">409 </span><span class="Comment">//: static ideas like layers with the dynamic notion of call-stack depth.</span>
+<span id="L400" class="LineNr">400 </span><span class="Comment">//: This framework should help us hide some details at each level, mixing</span>
+<span id="L401" class="LineNr">401 </span><span class="Comment">//: static ideas like layers with the dynamic notion of call-stack depth.</span>
 </pre>
 </body>
 </html>