diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2017-10-12 23:55:19 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2017-10-12 23:55:19 -0700 |
| commit | 7a219c68bae6dbe214aec69a051015e851e32400 (patch) | |
| tree | 40210836b68dcc2a3b84db487e30ccd7b199835b /html/subx/003trace.cc.html | |
| parent | f829120a621b539dfef0d8c5605c8825aa998d7b (diff) | |
| download | mu-7a219c68bae6dbe214aec69a051015e851e32400.tar.gz | |
4054
Diffstat (limited to 'html/subx/003trace.cc.html')
| -rw-r--r-- | html/subx/003trace.cc.html | 232 |
1 files changed, 116 insertions, 116 deletions
diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html index 9fca7be6..81d543b6 100644 --- a/html/subx/003trace.cc.html +++ b/html/subx/003trace.cc.html @@ -130,89 +130,89 @@ if ('onhashchange' in window) { <span id="L69" class="LineNr"> 69 </span> <span id="L70" class="LineNr"> 70 </span><span class="Delimiter">:(before "End Types")</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="L72" class="LineNr"> 72 </span> <span class="Normal">int</span> <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">;</span> <span class="Comment">// optional field just to help browse traces later</span> +<span id="L73" class="LineNr"> 73 </span> string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">;</span> +<span id="L74" class="LineNr"> 74 </span> string <a href='003trace.cc.html#L74'>contents</a><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> :<a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">(</span>l<span class="Delimiter">),</span> <a href='003trace.cc.html#L74'>contents</a><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> :<a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">(</span>d<span class="Delimiter">),</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">(</span>l<span class="Delimiter">),</span> <a href='003trace.cc.html#L74'>contents</a><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 "End Globals")</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">""</span><span class="Delimiter">;</span> +<span id="L81" class="LineNr"> 81 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L81'>Dump_trace</a> = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L82" class="LineNr"> 82 </span>string <a href='003trace.cc.html#L82'>Dump_label</a> = <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L83" class="LineNr"> 83 </span><span class="Delimiter">:(before "End Reset")</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">""</span><span class="Delimiter">;</span> +<span id="L85" class="LineNr"> 85 </span><a href='003trace.cc.html#L81'>Dump_trace</a> = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L86" class="LineNr"> 86 </span><a href='003trace.cc.html#L82'>Dump_label</a> = <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L87" class="LineNr"> 87 </span> <span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(before "End Types")</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="L92" class="LineNr"> 92 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L92'>Max_depth</a> = <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> <a href='003trace.cc.html#L93'>Error_depth</a> = <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 id="L95" class="LineNr"> 95 </span><span class="Normal">struct</span> trace_stream <span class="Delimiter">{</span> -<span id="L96" class="LineNr"> 96 </span> vector<trace_line> past_lines<span class="Delimiter">;</span> +<span id="L96" class="LineNr"> 96 </span> vector<trace_line> <a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">;</span> <span id="L97" class="LineNr"> 97 </span> <span class="Comment">// accumulator for current line</span> -<span id="L98" class="LineNr"> 98 </span> ostringstream* curr_stream<span class="Delimiter">;</span> -<span id="L99" class="LineNr"> 99 </span> string curr_label<span class="Delimiter">;</span> -<span id="L100" class="LineNr">100 </span> <span class="Normal">int</span> curr_depth<span class="Delimiter">;</span> -<span id="L101" class="LineNr">101 </span> <span class="Normal">int</span> callstack_depth<span class="Delimiter">;</span> -<span id="L102" class="LineNr">102 </span> <span class="Normal">int</span> collect_depth<span class="Delimiter">;</span> -<span id="L103" class="LineNr">103 </span> ofstream null_stream<span class="Delimiter">;</span> <span class="Comment">// never opens a file, so writes silently fail</span> -<span id="L104" class="LineNr">104 </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="L105" class="LineNr">105 </span> ~trace_stream<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="L98" class="LineNr"> 98 </span> ostringstream* <a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">;</span> +<span id="L99" class="LineNr"> 99 </span> string <a href='003trace.cc.html#L99'>curr_label</a><span class="Delimiter">;</span> +<span id="L100" class="LineNr">100 </span> <span class="Normal">int</span> <a href='003trace.cc.html#L100'>curr_depth</a><span class="Delimiter">;</span> +<span id="L101" class="LineNr">101 </span> <span class="Normal">int</span> <a href='003trace.cc.html#L101'>callstack_depth</a><span class="Delimiter">;</span> +<span id="L102" class="LineNr">102 </span> <span class="Normal">int</span> <a href='003trace.cc.html#L102'>collect_depth</a><span class="Delimiter">;</span> +<span id="L103" class="LineNr">103 </span> ofstream <a href='003trace.cc.html#L103'>null_stream</a><span class="Delimiter">;</span> <span class="Comment">// never opens a file, so writes silently fail</span> +<span id="L104" class="LineNr">104 </span> trace_stream<span class="Delimiter">()</span> :<a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L100'>curr_depth</a><span class="Delimiter">(</span><a href='003trace.cc.html#L92'>Max_depth</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L101'>callstack_depth</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L102'>collect_depth</a><span class="Delimiter">(</span><a href='003trace.cc.html#L92'>Max_depth</a><span class="Delimiter">)</span> <span class="Delimiter">{}</span> +<span id="L105" class="LineNr">105 </span> <a href='003trace.cc.html#L105'>~trace_stream</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">;</span> <span class="Delimiter">}</span> <span id="L106" class="LineNr">106 </span> -<span id="L107" class="LineNr">107 </span> ostream& stream<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L108" class="LineNr">108 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span> stream<span class="Delimiter">(</span>Max_depth<span class="Delimiter">,</span> label<span class="Delimiter">);</span> +<span id="L107" class="LineNr">107 </span> ostream& stream<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L108" class="LineNr">108 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span> stream<span class="Delimiter">(</span><a href='003trace.cc.html#L92'>Max_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span> <span id="L109" class="LineNr">109 </span> <span class="Delimiter">}</span> <span id="L110" class="LineNr">110 </span> -<span id="L111" class="LineNr">111 </span> ostream& 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="L112" class="LineNr">112 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>depth > collect_depth<span class="Delimiter">)</span> <span class="Identifier">return</span> null_stream<span class="Delimiter">;</span> -<span id="L113" class="LineNr">113 </span> <span class="Conceal">¦</span> curr_stream = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span> -<span id="L114" class="LineNr">114 </span> <span class="Conceal">¦</span> curr_label = label<span class="Delimiter">;</span> -<span id="L115" class="LineNr">115 </span> <span class="Conceal">¦</span> curr_depth = depth<span class="Delimiter">;</span> +<span id="L111" class="LineNr">111 </span> ostream& stream<span class="Delimiter">(</span><span class="Normal">int</span> <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">,</span> string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L112" class="LineNr">112 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L72'>depth</a> > <a href='003trace.cc.html#L102'>collect_depth</a><span class="Delimiter">)</span> <span class="Identifier">return</span> <a href='003trace.cc.html#L103'>null_stream</a><span class="Delimiter">;</span> +<span id="L113" class="LineNr">113 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L98'>curr_stream</a> = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span> +<span id="L114" class="LineNr">114 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L99'>curr_label</a> = <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">;</span> +<span id="L115" class="LineNr">115 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L100'>curr_depth</a> = <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">;</span> <span id="L116" class="LineNr">116 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span> *curr_stream<span class="Delimiter">;</span> <span id="L117" class="LineNr">117 </span> <span class="Delimiter">}</span> <span id="L118" class="LineNr">118 </span> <span id="L119" class="LineNr">119 </span> <span class="Comment">// be sure to call this before messing with curr_stream or curr_label</span> -<span id="L120" class="LineNr">120 </span> <span class="Normal">void</span> newline<span class="Delimiter">();</span> +<span id="L120" class="LineNr">120 </span> <span class="Normal">void</span> <a href='003trace.cc.html#L126'>newline</a><span class="Delimiter">();</span> <span id="L121" class="LineNr">121 </span> <span class="Comment">// useful for debugging</span> -<span id="L122" class="LineNr">122 </span> string readable_contents<span class="Delimiter">(</span>string label<span class="Delimiter">);</span> <span class="Comment">// empty label = show everything</span> +<span id="L122" class="LineNr">122 </span> string <a href='003trace.cc.html#L142'>readable_contents</a><span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span> <span class="Comment">// empty label = show everything</span> <span id="L123" class="LineNr">123 </span><span class="Delimiter">};</span> <span id="L124" class="LineNr">124 </span> <span id="L125" class="LineNr">125 </span><span class="Delimiter">:(code)</span> -<span id="L126" class="LineNr">126 </span><span class="Normal">void</span> trace_stream::newline<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L126" class="LineNr">126 </span><span class="Normal">void</span> trace_stream::<a href='003trace.cc.html#L126'>newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L127" class="LineNr">127 </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="L128" class="LineNr">128 </span> string curr_contents = curr_stream<span class="Delimiter">-></span>str<span class="Delimiter">();</span> +<span id="L128" class="LineNr">128 </span> string curr_contents = <a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">-></span>str<span class="Delimiter">();</span> <span id="L129" class="LineNr">129 </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="L130" class="LineNr">130 </span> <span class="Conceal">¦</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> trim<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="L131" class="LineNr">131 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors && curr_label == <span class="Constant">"error"</span><span class="Delimiter">)</span> -<span id="L132" class="LineNr">132 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> || Dump_trace -<span id="L133" class="LineNr">133 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> && curr_label == Dump_label<span class="Delimiter">))</span> -<span id="L134" class="LineNr">134 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr << curr_label << <span class="Constant">": "</span> << curr_contents << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L130" class="LineNr">130 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L100'>curr_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L99'>curr_label</a><span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span> <span class="Comment">// preserve indent in contents</span> +<span id="L131" class="LineNr">131 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors && <a href='003trace.cc.html#L99'>curr_label</a> == <span class="Constant">"error"</span><span class="Delimiter">)</span> +<span id="L132" class="LineNr">132 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> || <a href='003trace.cc.html#L81'>Dump_trace</a> +<span id="L133" class="LineNr">133 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> && <a href='003trace.cc.html#L99'>curr_label</a> == <a href='003trace.cc.html#L82'>Dump_label</a><span class="Delimiter">))</span> +<span id="L134" class="LineNr">134 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr << <a href='003trace.cc.html#L99'>curr_label</a> << <span class="Constant">": "</span> << curr_contents << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L135" class="LineNr">135 </span> <span class="Delimiter">}</span> -<span id="L136" class="LineNr">136 </span> <span class="Normal">delete</span> curr_stream<span class="Delimiter">;</span> -<span id="L137" class="LineNr">137 </span> curr_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span> -<span id="L138" class="LineNr">138 </span> curr_label<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L139" class="LineNr">139 </span> curr_depth = Max_depth<span class="Delimiter">;</span> +<span id="L136" class="LineNr">136 </span> <span class="Normal">delete</span> <a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">;</span> +<span id="L137" class="LineNr">137 </span> <a href='003trace.cc.html#L98'>curr_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span> +<span id="L138" class="LineNr">138 </span> <a href='003trace.cc.html#L99'>curr_label</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span> +<span id="L139" class="LineNr">139 </span> <a href='003trace.cc.html#L100'>curr_depth</a> = <a href='003trace.cc.html#L92'>Max_depth</a><span class="Delimiter">;</span> <span id="L140" class="LineNr">140 </span><span class="Delimiter">}</span> <span id="L141" class="LineNr">141 </span> -<span id="L142" class="LineNr">142 </span>string trace_stream::readable_contents<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L142" class="LineNr">142 </span>string trace_stream::<a href='003trace.cc.html#L142'>readable_contents</a><span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L143" class="LineNr">143 </span> ostringstream output<span class="Delimiter">;</span> -<span id="L144" class="LineNr">144 </span> label = trim<span class="Delimiter">(</span>label<span class="Delimiter">);</span> -<span id="L145" class="LineNr">145 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != past_lines<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> -<span id="L146" class="LineNr">146 </span> <span class="Conceal">¦</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">-></span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L147" class="LineNr">147 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> output << std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> << p<span class="Delimiter">-></span>depth << <span class="Constant">' '</span> << p<span class="Delimiter">-></span>label << <span class="Constant">": "</span> << p<span class="Delimiter">-></span>contents << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L144" class="LineNr">144 </span> <a href='003trace.cc.html#L73'>label</a> = <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span> +<span id="L145" class="LineNr">145 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> +<span id="L146" class="LineNr">146 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || <a href='003trace.cc.html#L73'>label</a> == p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L147" class="LineNr">147 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> output << std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> << p<span class="Delimiter">-></span><a href='003trace.cc.html#L72'>depth</a> << <span class="Constant">' '</span> << p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a> << <span class="Constant">": "</span> << p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L148" class="LineNr">148 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> <span id="L149" class="LineNr">149 </span> <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span> <span id="L151" class="LineNr">151 </span> <span id="L152" class="LineNr">152 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L153" class="LineNr">153 </span>trace_stream* Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span> -<span id="L154" class="LineNr">154 </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="L153" class="LineNr">153 </span>trace_stream* <a href='003trace.cc.html#L153'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span> +<span id="L154" class="LineNr">154 </span><span class="Normal">int</span> <a href='003trace.cc.html#L154'>Trace_errors</a> = <span class="Constant">0</span><span class="Delimiter">;</span> <span class="Comment">// used only when Trace_stream is NULL</span> <span id="L155" class="LineNr">155 </span> <span id="L156" class="LineNr">156 </span><span class="Delimiter">:(before "End Includes")</span> <span id="L157" class="LineNr">157 </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> @@ -233,46 +233,46 @@ if ('onhashchange' in window) { <span id="L172" class="LineNr">172 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span> <span id="L173" class="LineNr">173 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span> <span id="L174" class="LineNr">174 </span><span class="Delimiter">:(before "End Test Teardown")</span> -<span id="L175" class="LineNr">175 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Passed && !Hide_errors && trace_contains_errors<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L176" class="LineNr">176 </span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L175" class="LineNr">175 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> && !Hide_errors && <a href='003trace.cc.html#L179'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L176" class="LineNr">176 </span> <a href='002test.cc.html#L21'>Passed</a> = <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L177" class="LineNr">177 </span><span class="Delimiter">}</span> <span id="L178" class="LineNr">178 </span><span class="Delimiter">:(code)</span> -<span id="L179" class="LineNr">179 </span><span class="Normal">bool</span> trace_contains_errors<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L180" class="LineNr">180 </span> <span class="Identifier">return</span> Trace_errors > <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">"error"</span><span class="Delimiter">)</span> > <span class="Constant">0</span><span class="Delimiter">;</span> +<span id="L179" class="LineNr">179 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L179'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L180" class="LineNr">180 </span> <span class="Identifier">return</span> <a href='003trace.cc.html#L154'>Trace_errors</a> > <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">"error"</span><span class="Delimiter">)</span> > <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L181" class="LineNr">181 </span><span class="Delimiter">}</span> <span id="L182" class="LineNr">182 </span> <span id="L183" class="LineNr">183 </span><span class="Delimiter">:(before "End Types")</span> -<span id="L184" class="LineNr">184 </span><span class="Normal">struct</span> end <span class="Delimiter">{};</span> +<span id="L184" class="LineNr">184 </span><span class="Normal">struct</span> <a href='003trace.cc.html#L184'>end</a> <span class="Delimiter">{};</span> <span id="L185" class="LineNr">185 </span><span class="Delimiter">:(code)</span> -<span id="L186" class="LineNr">186 </span>ostream& <span class="Normal">operator</span><<<span class="Delimiter">(</span>ostream& os<span class="Delimiter">,</span> unused end<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L187" class="LineNr">187 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-></span>newline<span class="Delimiter">();</span> +<span id="L186" class="LineNr">186 </span>ostream& <span class="Normal">operator</span><<<span class="Delimiter">(</span>ostream& os<span class="Delimiter">,</span> <a href='001help.cc.html#L208'>unused</a> <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L187" class="LineNr">187 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L126'>newline</a><span class="Delimiter">();</span> <span id="L188" class="LineNr">188 </span> <span class="Identifier">return</span> os<span class="Delimiter">;</span> <span id="L189" class="LineNr">189 </span><span class="Delimiter">}</span> <span id="L190" class="LineNr">190 </span> <span id="L191" class="LineNr">191 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L192" class="LineNr">192 </span><span class="Normal">bool</span> Save_trace = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L192" class="LineNr">192 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L192'>Save_trace</a> = <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L193" class="LineNr">193 </span> <span id="L194" class="LineNr">194 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span> <span id="L195" class="LineNr">195 </span><span class="Delimiter">:(before "End Types")</span> <span id="L196" class="LineNr">196 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span> <span id="L197" class="LineNr">197 </span> lease_tracer<span class="Delimiter">();</span> -<span id="L198" class="LineNr">198 </span> ~lease_tracer<span class="Delimiter">();</span> +<span id="L198" class="LineNr">198 </span> <a href='003trace.cc.html#L202'>~lease_tracer</a><span class="Delimiter">();</span> <span id="L199" class="LineNr">199 </span><span class="Delimiter">};</span> <span id="L200" class="LineNr">200 </span><span class="Delimiter">:(code)</span> -<span id="L201" class="LineNr">201 </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="L202" class="LineNr">202 </span>lease_tracer::~lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L201" class="LineNr">201 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <a href='003trace.cc.html#L153'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span> +<span id="L202" class="LineNr">202 </span>lease_tracer::<a href='003trace.cc.html#L202'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L203" class="LineNr">203 </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="L204" class="LineNr">204 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L204" class="LineNr">204 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L192'>Save_trace</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L205" class="LineNr">205 </span> <span class="Conceal">¦</span> ofstream fout<span class="Delimiter">(</span><span class="Constant">"last_trace"</span><span class="Delimiter">);</span> -<span id="L206" class="LineNr">206 </span> <span class="Conceal">¦</span> fout << Trace_stream<span class="Delimiter">-></span>readable_contents<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L206" class="LineNr">206 </span> <span class="Conceal">¦</span> fout << <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L142'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L207" class="LineNr">207 </span> <span class="Conceal">¦</span> fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span> <span id="L208" class="LineNr">208 </span> <span class="Delimiter">}</span> -<span id="L209" class="LineNr">209 </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="L209" class="LineNr">209 </span> <span class="Normal">delete</span> <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L153'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span> <span id="L210" class="LineNr">210 </span><span class="Delimiter">}</span> <span id="L211" class="LineNr">211 </span><span class="Delimiter">:(before "End Includes")</span> <span id="L212" class="LineNr">212 </span><span class="PreProc">#define START_TRACING_UNTIL_END_OF_SCOPE lease_tracer leased_tracer</span><span class="Delimiter">;</span> <span id="L213" class="LineNr">213 </span><span class="Delimiter">:(before "End Test Setup")</span> -<span id="L214" class="LineNr">214 </span>START_TRACING_UNTIL_END_OF_SCOPE +<span id="L214" class="LineNr">214 </span><a href='003trace.cc.html#L212'>START_TRACING_UNTIL_END_OF_SCOPE</a> <span id="L215" class="LineNr">215 </span> <span id="L216" class="LineNr">216 </span><span class="Delimiter">:(before "End Includes")</span> <span id="L217" class="LineNr">217 </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> @@ -282,143 +282,143 @@ if ('onhashchange' in window) { <span id="L221" class="LineNr">221 </span><span class="PreProc"> </span><span class="Normal">if</span><span class="PreProc"> (Passed && trace_contains_errors()) </span><span class="Delimiter">{</span><span class="PreProc"> \</span> <span id="L222" class="LineNr">222 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> cerr << </span><span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span><span class="PreProc"> << __FUNCTION__ << </span><span class="Constant">"("</span><span class="PreProc"> << </span><span class="Constant">__FILE__</span><span class="PreProc"> << </span><span class="Constant">":"</span><span class="PreProc"> << </span><span class="Constant">__LINE__</span><span class="PreProc"> << </span><span class="Constant">"): unexpected errors</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span><span class="PreProc"> \</span> <span id="L223" class="LineNr">223 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> DUMP(</span><span class="Constant">"error"</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span> -<span id="L224" class="LineNr">224 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> Passed = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span> +<span id="L224" class="LineNr">224 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> <a href='002test.cc.html#L21'>Passed</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span> <span id="L225" class="LineNr">225 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc"> \</span> <span id="L226" class="LineNr">226 </span><span class="PreProc"> </span><span class="Delimiter">}</span> <span id="L227" class="LineNr">227 </span> <span id="L228" class="LineNr">228 </span><span class="PreProc">#define CHECK_TRACE_COUNT(label</span><span class="Delimiter">,</span><span class="PreProc"> count) \</span> <span id="L229" class="LineNr">229 </span><span class="PreProc"> </span><span class="Normal">if</span><span class="PreProc"> (Passed && trace_count(label) != (count)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span> -<span id="L230" class="LineNr">230 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> cerr << </span><span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span><span class="PreProc"> << __FUNCTION__ << </span><span class="Constant">"("</span><span class="PreProc"> << </span><span class="Constant">__FILE__</span><span class="PreProc"> << </span><span class="Constant">":"</span><span class="PreProc"> << </span><span class="Constant">__LINE__</span><span class="PreProc"> << </span><span class="Constant">"): trace_count of "</span><span class="PreProc"> << label << </span><span class="Constant">" should be "</span><span class="PreProc"> << count << </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span> +<span id="L230" class="LineNr">230 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> cerr << </span><span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span><span class="PreProc"> << __FUNCTION__ << </span><span class="Constant">"("</span><span class="PreProc"> << </span><span class="Constant">__FILE__</span><span class="PreProc"> << </span><span class="Constant">":"</span><span class="PreProc"> << </span><span class="Constant">__LINE__</span><span class="PreProc"> << </span><span class="Constant">"): trace_count of "</span><span class="PreProc"> << <a href='003trace.cc.html#L73'>label</a> << </span><span class="Constant">" should be "</span><span class="PreProc"> << count << </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span> <span id="L231" class="LineNr">231 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> cerr << </span><span class="Constant">" got "</span><span class="PreProc"> << trace_count(label) << </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="L232" class="LineNr">232 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> DUMP(label)</span><span class="Delimiter">;</span><span class="PreProc"> \</span> -<span id="L233" class="LineNr">233 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> Passed = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span> +<span id="L233" class="LineNr">233 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> <a href='002test.cc.html#L21'>Passed</a> = </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="Conceal">¦</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="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_DOESNT_CONTAIN(</span><span class="Delimiter">...</span><span class="PreProc">) CHECK(trace_doesnt_contain(__VA_ARGS__))</span> <span id="L238" class="LineNr">238 </span> <span id="L239" class="LineNr">239 </span><span class="Delimiter">:(code)</span> -<span id="L240" class="LineNr">240 </span><span class="Normal">bool</span> check_trace_contents<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="L240" class="LineNr">240 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L240'>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="L241" class="LineNr">241 </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="L242" class="LineNr">242 </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="L243" class="LineNr">243 </span> vector<string> expected_lines = split<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">"^D"</span><span class="Delimiter">);</span> +<span id="L243" class="LineNr">243 </span> vector<string> expected_lines = <a href='003trace.cc.html#L330'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">"^D"</span><span class="Delimiter">);</span> <span id="L244" class="LineNr">244 </span> <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L245" class="LineNr">245 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line < SIZE<span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> && 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="L245" class="LineNr">245 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line < <a href='001help.cc.html#L91'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> && 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="L246" class="LineNr">246 </span> <span class="Conceal">¦</span> ++curr_expected_line<span class="Delimiter">;</span> -<span id="L247" class="LineNr">247 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == SIZE<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="L248" class="LineNr">248 </span> string label<span class="Delimiter">,</span> contents<span class="Delimiter">;</span> -<span id="L249" class="LineNr">249 </span> split_label_contents<span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &label<span class="Delimiter">,</span> &contents<span class="Delimiter">);</span> -<span id="L250" class="LineNr">250 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L251" class="LineNr">251 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> -<span id="L252" class="LineNr">252 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contents != trim<span class="Delimiter">(</span>p<span class="Delimiter">-></span>contents<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> +<span id="L247" class="LineNr">247 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L91'>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="L248" class="LineNr">248 </span> string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">;</span> +<span id="L249" class="LineNr">249 </span> <a href='003trace.cc.html#L272'>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> &label<span class="Delimiter">,</span> &contents<span class="Delimiter">);</span> +<span id="L250" class="LineNr">250 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L251" class="LineNr">251 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a> != p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> +<span id="L252" class="LineNr">252 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> != <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L253" class="LineNr">253 </span> <span class="Conceal">¦</span> ++curr_expected_line<span class="Delimiter">;</span> -<span id="L254" class="LineNr">254 </span> <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line < SIZE<span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> && 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="L254" class="LineNr">254 </span> <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line < <a href='001help.cc.html#L91'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> && 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> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++curr_expected_line<span class="Delimiter">;</span> -<span id="L256" class="LineNr">256 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == SIZE<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> <span class="Conceal">¦</span> split_label_contents<span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &label<span class="Delimiter">,</span> &contents<span class="Delimiter">);</span> +<span id="L256" class="LineNr">256 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L91'>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> <span class="Conceal">¦</span> <a href='003trace.cc.html#L272'>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> &label<span class="Delimiter">,</span> &contents<span class="Delimiter">);</span> <span id="L258" class="LineNr">258 </span> <span class="Delimiter">}</span> <span id="L259" class="LineNr">259 </span> -<span id="L260" class="LineNr">260 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>line_exists_anywhere<span class="Delimiter">(</span>label<span class="Delimiter">,</span> contents<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L261" class="LineNr">261 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << FUNCTION << <span class="Constant">"("</span> << <span class="Normal">FILE</span> << <span class="Constant">":"</span> << LINE << <span class="Constant">"): line ["</span> << label << <span class="Constant">": "</span> << contents << <span class="Constant">"] out of order in trace:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> -<span id="L262" class="LineNr">262 </span> <span class="Conceal">¦</span> DUMP<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L260" class="LineNr">260 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L285'>line_exists_anywhere</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L261" class="LineNr">261 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << FUNCTION << <span class="Constant">"("</span> << <span class="Normal">FILE</span> << <span class="Constant">":"</span> << LINE << <span class="Constant">"): line ["</span> << <a href='003trace.cc.html#L73'>label</a> << <span class="Constant">": "</span> << <a href='003trace.cc.html#L74'>contents</a> << <span class="Constant">"] out of order in <a href='003trace.cc.html#L160'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L262" class="LineNr">262 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L164'>DUMP</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L263" class="LineNr">263 </span> <span class="Delimiter">}</span> <span id="L264" class="LineNr">264 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L265" class="LineNr">265 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << FUNCTION << <span class="Constant">"("</span> << <span class="Normal">FILE</span> << <span class="Constant">":"</span> << LINE << <span class="Constant">"): missing ["</span> << contents << <span class="Constant">"] in trace:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> -<span id="L266" class="LineNr">266 </span> <span class="Conceal">¦</span> DUMP<span class="Delimiter">(</span>label<span class="Delimiter">);</span> +<span id="L265" class="LineNr">265 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << FUNCTION << <span class="Constant">"("</span> << <span class="Normal">FILE</span> << <span class="Constant">":"</span> << LINE << <span class="Constant">"): missing ["</span> << <a href='003trace.cc.html#L74'>contents</a> << <span class="Constant">"] in <a href='003trace.cc.html#L160'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L266" class="LineNr">266 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L164'>DUMP</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span> <span id="L267" class="LineNr">267 </span> <span class="Delimiter">}</span> -<span id="L268" class="LineNr">268 </span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L268" class="LineNr">268 </span> <a href='002test.cc.html#L21'>Passed</a> = <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L269" class="LineNr">269 </span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L270" class="LineNr">270 </span><span class="Delimiter">}</span> <span id="L271" class="LineNr">271 </span> -<span id="L272" class="LineNr">272 </span><span class="Normal">void</span> split_label_contents<span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">,</span> string* label<span class="Delimiter">,</span> string* contents<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L272" class="LineNr">272 </span><span class="Normal">void</span> <a href='003trace.cc.html#L272'>split_label_contents</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">,</span> string* <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string* <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L273" class="LineNr">273 </span> <span class="Normal">static</span> <span class="Normal">const</span> string delim<span class="Delimiter">(</span><span class="Constant">": "</span><span class="Delimiter">);</span> <span id="L274" class="LineNr">274 </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="L275" class="LineNr">275 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L276" class="LineNr">276 </span> <span class="Conceal">¦</span> *label = <span class="Constant">""</span><span class="Delimiter">;</span> -<span id="L277" class="LineNr">277 </span> <span class="Conceal">¦</span> *contents = trim<span class="Delimiter">(</span>s<span class="Delimiter">);</span> +<span id="L277" class="LineNr">277 </span> <span class="Conceal">¦</span> *contents = <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span> <span id="L278" class="LineNr">278 </span> <span class="Delimiter">}</span> <span id="L279" class="LineNr">279 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L280" class="LineNr">280 </span> <span class="Conceal">¦</span> *label = trim<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="L281" class="LineNr">281 </span> <span class="Conceal">¦</span> *contents = trim<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="L280" class="LineNr">280 </span> <span class="Conceal">¦</span> *label = <a href='003trace.cc.html#L354'>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="L281" class="LineNr">281 </span> <span class="Conceal">¦</span> *contents = <a href='003trace.cc.html#L354'>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="L282" class="LineNr">282 </span> <span class="Delimiter">}</span> <span id="L283" class="LineNr">283 </span><span class="Delimiter">}</span> <span id="L284" class="LineNr">284 </span> -<span id="L285" class="LineNr">285 </span><span class="Normal">bool</span> line_exists_anywhere<span class="Delimiter">(</span><span class="Normal">const</span> string& label<span class="Delimiter">,</span> <span class="Normal">const</span> string& contents<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L286" class="LineNr">286 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L287" class="LineNr">287 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> -<span id="L288" class="LineNr">288 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contents == trim<span class="Delimiter">(</span>p<span class="Delimiter">-></span>contents<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> +<span id="L285" class="LineNr">285 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L285'>line_exists_anywhere</a><span class="Delimiter">(</span><span class="Normal">const</span> string& <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <span class="Normal">const</span> string& <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L286" class="LineNr">286 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L287" class="LineNr">287 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a> != p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> +<span id="L288" class="LineNr">288 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> <span id="L289" class="LineNr">289 </span> <span class="Delimiter">}</span> <span id="L290" class="LineNr">290 </span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L291" class="LineNr">291 </span><span class="Delimiter">}</span> <span id="L292" class="LineNr">292 </span> -<span id="L293" class="LineNr">293 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L294" class="LineNr">294 </span> <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L293" class="LineNr">293 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L294" class="LineNr">294 </span> <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <span class="Constant">""</span><span class="Delimiter">);</span> <span id="L295" class="LineNr">295 </span><span class="Delimiter">}</span> <span id="L296" class="LineNr">296 </span> -<span id="L297" class="LineNr">297 </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="L297" class="LineNr">297 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L298" class="LineNr">298 </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="L299" class="LineNr">299 </span> <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L300" class="LineNr">300 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L301" class="LineNr">301 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L302" class="LineNr">302 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>line == <span class="Constant">""</span> || trim<span class="Delimiter">(</span>line<span class="Delimiter">)</span> == trim<span class="Delimiter">(</span>p<span class="Delimiter">-></span>contents<span class="Delimiter">))</span> +<span id="L300" class="LineNr">300 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L301" class="LineNr">301 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a> == p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L302" class="LineNr">302 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>line == <span class="Constant">""</span> || <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>line<span class="Delimiter">)</span> == <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span id="L303" class="LineNr">303 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++result<span class="Delimiter">;</span> <span id="L304" class="LineNr">304 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> <span id="L305" class="LineNr">305 </span> <span class="Delimiter">}</span> <span id="L306" class="LineNr">306 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L307" class="LineNr">307 </span><span class="Delimiter">}</span> <span id="L308" class="LineNr">308 </span> -<span id="L309" class="LineNr">309 </span><span class="Normal">int</span> trace_count_prefix<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string prefix<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L309" class="LineNr">309 </span><span class="Normal">int</span> <a href='003trace.cc.html#L309'>trace_count_prefix</a><span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string prefix<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L310" class="LineNr">310 </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="L311" class="LineNr">311 </span> <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L312" class="LineNr">312 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L313" class="LineNr">313 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L314" class="LineNr">314 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>starts_with<span class="Delimiter">(</span>trim<span class="Delimiter">(</span>p<span class="Delimiter">-></span>contents<span class="Delimiter">),</span> trim<span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span> +<span id="L312" class="LineNr">312 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L313" class="LineNr">313 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a> == p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L314" class="LineNr">314 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L27'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span> <span id="L315" class="LineNr">315 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++result<span class="Delimiter">;</span> <span id="L316" class="LineNr">316 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> <span id="L317" class="LineNr">317 </span> <span class="Delimiter">}</span> <span id="L318" class="LineNr">318 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L319" class="LineNr">319 </span><span class="Delimiter">}</span> <span id="L320" class="LineNr">320 </span> -<span id="L321" class="LineNr">321 </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="L322" class="LineNr">322 </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="L321" class="LineNr">321 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L322" class="LineNr">322 </span> <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> line<span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L323" class="LineNr">323 </span><span class="Delimiter">}</span> <span id="L324" class="LineNr">324 </span> <span id="L325" class="LineNr">325 </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="L326" class="LineNr">326 </span> vector<string> tmp = split_first<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">": "</span><span class="Delimiter">);</span> +<span id="L326" class="LineNr">326 </span> vector<string> tmp = <a href='003trace.cc.html#L345'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">": "</span><span class="Delimiter">);</span> <span id="L327" class="LineNr">327 </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="L328" class="LineNr">328 </span><span class="Delimiter">}</span> <span id="L329" class="LineNr">329 </span> -<span id="L330" class="LineNr">330 </span>vector<string> split<span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L330" class="LineNr">330 </span>vector<string> <a href='003trace.cc.html#L330'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L331" class="LineNr">331 </span> vector<string> result<span class="Delimiter">;</span> <span id="L332" class="LineNr">332 </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="L333" class="LineNr">333 </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="L334" class="LineNr">334 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>end == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L334" class="LineNr">334 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L184'>end</a> == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L335" class="LineNr">335 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</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="L336" class="LineNr">336 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L337" class="LineNr">337 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> <span id="L338" class="LineNr">338 </span> <span class="Conceal">¦</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="L339" class="LineNr">339 </span> <span class="Conceal">¦</span> begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span> -<span id="L340" class="LineNr">340 </span> <span class="Conceal">¦</span> end = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span> +<span id="L340" class="LineNr">340 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L184'>end</a> = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span> <span id="L341" class="LineNr">341 </span> <span class="Delimiter">}</span> <span id="L342" class="LineNr">342 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L343" class="LineNr">343 </span><span class="Delimiter">}</span> <span id="L344" class="LineNr">344 </span> -<span id="L345" class="LineNr">345 </span>vector<string> split_first<span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L345" class="LineNr">345 </span>vector<string> <a href='003trace.cc.html#L345'>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="L346" class="LineNr">346 </span> vector<string> result<span class="Delimiter">;</span> <span id="L347" class="LineNr">347 </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="L348" class="LineNr">348 </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> end<span class="Delimiter">));</span> -<span id="L349" class="LineNr">349 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>end != string::npos<span class="Delimiter">)</span> +<span id="L348" class="LineNr">348 </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#L184'>end</a><span class="Delimiter">));</span> +<span id="L349" class="LineNr">349 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L184'>end</a> != string::npos<span class="Delimiter">)</span> <span id="L350" class="LineNr">350 </span> <span class="Conceal">¦</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="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>string trim<span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L354" class="LineNr">354 </span>string <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L355" class="LineNr">355 </span> string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> -<span id="L356" class="LineNr">356 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span>end<span class="Delimiter">()</span> && isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span> +<span id="L356" class="LineNr">356 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">()</span> && isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span> <span id="L357" class="LineNr">357 </span> <span class="Conceal">¦</span> ++first<span class="Delimiter">;</span> -<span id="L358" class="LineNr">358 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> +<span id="L358" class="LineNr">358 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L359" class="LineNr">359 </span> -<span id="L360" class="LineNr">360 </span> string::const_iterator last = --s<span class="Delimiter">.</span>end<span class="Delimiter">();</span> +<span id="L360" class="LineNr">360 </span> string::const_iterator last = --s<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> <span id="L361" class="LineNr">361 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>last != s<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> && isspace<span class="Delimiter">(</span>*last<span class="Delimiter">))</span> <span id="L362" class="LineNr">362 </span> <span class="Conceal">¦</span> --last<span class="Delimiter">;</span> <span id="L363" class="LineNr">363 </span> ++last<span class="Delimiter">;</span> @@ -450,8 +450,8 @@ if ('onhashchange' in window) { <span id="L389" class="LineNr">389 </span><span class="Comment">//: Errors will be depth 0.</span> <span id="L390" class="LineNr">390 </span><span class="Comment">//: Mu 'applications' will be able to use depths 1-100 as they like.</span> <span id="L391" class="LineNr">391 </span><span class="Comment">//: Primitive statements will occupy 101-9989</span> -<span id="L392" class="LineNr">392 </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="L393" class="LineNr">393 </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="L392" class="LineNr">392 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L392'>Initial_callstack_depth</a> = <span class="Constant">101</span><span class="Delimiter">;</span> +<span id="L393" class="LineNr">393 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L393'>Max_callstack_depth</a> = <span class="Constant">9989</span><span class="Delimiter">;</span> <span id="L394" class="LineNr">394 </span><span class="Comment">//: Finally, details of primitive Mu statements will occupy depth 9990-9999</span> <span id="L395" class="LineNr">395 </span><span class="Comment">//: (more on that later as well)</span> <span id="L396" class="LineNr">396 </span><span class="Comment">//:</span> |