diff options
| author | Kartik Agaram <vc@akkartik.com> | 2019-07-14 09:42:36 -0700 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2019-07-14 09:42:36 -0700 |
| commit | ce2c1efc41470764126e9a1a7f4e0cfec4213587 (patch) | |
| tree | 84a2fb9475ad6326571a628bfc36e9cf1d757e7f /html/subx/039debug.cc.html | |
| parent | c4412d299ee983da5bfca64f33cf6f3eb478d232 (diff) | |
| download | mu-ce2c1efc41470764126e9a1a7f4e0cfec4213587.tar.gz | |
.
Diffstat (limited to 'html/subx/039debug.cc.html')
| -rw-r--r-- | html/subx/039debug.cc.html | 118 |
1 files changed, 66 insertions, 52 deletions
diff --git a/html/subx/039debug.cc.html b/html/subx/039debug.cc.html index 60653e04..fa0901d6 100644 --- a/html/subx/039debug.cc.html +++ b/html/subx/039debug.cc.html @@ -3,8 +3,8 @@ <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <title>Mu - subx/039debug.cc</title> -<meta name="Generator" content="Vim/8.0"> -<meta name="plugin-version" content="vim7.4_v2"> +<meta name="Generator" content="Vim/8.1"> +<meta name="plugin-version" content="vim8.1_v1"> <meta name="syntax" content="cpp"> <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy="> <meta name="colorscheme" content="minimal-light"> @@ -14,14 +14,14 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background- body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; } a { color:inherit; } * { font-size:12pt; font-size: 1em; } -.Todo { color: #000000; background-color: #ffff00; padding-bottom: 1px; } .LineNr { } .Constant { color: #008787; } +.Comment { color: #005faf; } .Delimiter { color: #c000c0; } .Special { color: #d70000; } .Identifier { color: #af5f00; } .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; } -.Comment { color: #005faf; } +.Todo { color: #000000; background-color: #ffff00; padding-bottom: 1px; } .SalientComment { color: #0000af; } --> </style> @@ -39,7 +39,7 @@ function JumpToLine() if (lineNum.indexOf('L') == -1) { lineNum = 'L'+lineNum; } - lineElem = document.getElementById(lineNum); + var lineElem = document.getElementById(lineNum); /* Always jump to new location even if the line was hidden inside a fold, or * we corrected the raw number to a line ID. */ @@ -91,7 +91,7 @@ if ('onhashchange' in window) { <span id="L31" class="LineNr"> 31 </span> fin >> addr<span class="Delimiter">;</span> <span id="L32" class="LineNr"> 32 </span> string <a href='011run.cc.html#L120'>line</a><span class="Delimiter">;</span> <span id="L33" class="LineNr"> 33 </span> getline<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> <a href='011run.cc.html#L120'>line</a><span class="Delimiter">);</span> -<span id="L34" class="LineNr"> 34 </span> <a href='001help.cc.html#L251'>put</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L9'>Source_line</a></span><span class="Delimiter">,</span> addr<span class="Delimiter">,</span> <a href='039debug.cc.html#L97'>hacky_squeeze_out_whitespace</a><span class="Delimiter">(</span><a href='011run.cc.html#L120'>line</a><span class="Delimiter">));</span> +<span id="L34" class="LineNr"> 34 </span> <a href='001help.cc.html#L251'>put</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L9'>Source_line</a></span><span class="Delimiter">,</span> addr<span class="Delimiter">,</span> <a href='039debug.cc.html#L111'>hacky_squeeze_out_whitespace</a><span class="Delimiter">(</span><a href='011run.cc.html#L120'>line</a><span class="Delimiter">));</span> <span id="L35" class="LineNr"> 35 </span> <span class="Delimiter">}</span> <span id="L36" class="LineNr"> 36 </span><span class="Delimiter">}</span> <span id="L37" class="LineNr"> 37 </span> @@ -99,17 +99,17 @@ if ('onhashchange' in window) { <span id="L39" class="LineNr"> 39 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L255'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L8'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">))</span> <span id="L40" class="LineNr"> 40 </span> <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"== label "</span> << get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L8'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L41" class="LineNr"> 41 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L255'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L9'>Source_line</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">))</span> -<span id="L42" class="LineNr"> 42 </span> <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"0x"</span> << <a href='010---vm.cc.html#L413'>HEXWORD</a> << EIP << <span class="Constant">": "</span> << get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L9'>Source_line</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L42" class="LineNr"> 42 </span> <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"0x"</span> << <a href='010---vm.cc.html#L408'>HEXWORD</a> << EIP << <span class="Constant">": "</span> << get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L9'>Source_line</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L43" class="LineNr"> 43 </span><span class="Normal">else</span> <span id="L44" class="LineNr"> 44 </span> <span class="Comment">// no source line info; do what you can</span> -<span id="L45" class="LineNr"> 45 </span> <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"0x"</span> << <a href='010---vm.cc.html#L413'>HEXWORD</a> << EIP << <span class="Constant">": "</span> << <a href='039debug.cc.html#L48'>debug_info</a><span class="Delimiter">(</span>EIP<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L45" class="LineNr"> 45 </span> <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"0x"</span> << <a href='010---vm.cc.html#L408'>HEXWORD</a> << EIP << <span class="Constant">": "</span> << <a href='039debug.cc.html#L48'>debug_info</a><span class="Delimiter">(</span>EIP<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L46" class="LineNr"> 46 </span> <span id="L47" class="LineNr"> 47 </span><span class="Delimiter">:(code)</span> <span id="L48" class="LineNr"> 48 </span>string <a href='039debug.cc.html#L48'>debug_info</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> inst_address<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L49" class="LineNr"> 49 </span> <span class="Normal">uint8_t</span> op = <a href='010---vm.cc.html#L179'>read_mem_u8</a><span class="Delimiter">(</span>inst_address<span class="Delimiter">);</span> <span id="L50" class="LineNr"> 50 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>op != <span class="Constant">0xe8</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L51" class="LineNr"> 51 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L52" class="LineNr"> 52 </span> out << <a href='010---vm.cc.html#L412'>HEXBYTE</a> << <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">);</span> +<span id="L52" class="LineNr"> 52 </span> out << <a href='010---vm.cc.html#L407'>HEXBYTE</a> << <a href='010---vm.cc.html#L410'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">);</span> <span id="L53" class="LineNr"> 53 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L54" class="LineNr"> 54 </span> <span class="Delimiter">}</span> <span id="L55" class="LineNr"> 55 </span> <span class="Normal">int32_t</span> offset = <a href='010---vm.cc.html#L190'>read_mem_i32</a><span class="Delimiter">(</span>inst_address+<span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span> @@ -117,7 +117,7 @@ if ('onhashchange' in window) { <span id="L57" class="LineNr"> 57 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L255'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L8'>Symbol_name</a></span><span class="Delimiter">,</span> next_eip<span class="Delimiter">))</span> <span id="L58" class="LineNr"> 58 </span> <span class="Identifier">return</span> <span class="Constant">"e8/call "</span>+get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L8'>Symbol_name</a></span><span class="Delimiter">,</span> next_eip<span class="Delimiter">);</span> <span id="L59" class="LineNr"> 59 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L60" class="LineNr"> 60 </span> out << <span class="Constant">"e8/call 0x"</span> << <a href='010---vm.cc.html#L413'>HEXWORD</a> << next_eip<span class="Delimiter">;</span> +<span id="L60" class="LineNr"> 60 </span> out << <span class="Constant">"e8/call 0x"</span> << <a href='010---vm.cc.html#L408'>HEXWORD</a> << next_eip<span class="Delimiter">;</span> <span id="L61" class="LineNr"> 61 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L62" class="LineNr"> 62 </span><span class="Delimiter">}</span> <span id="L63" class="LineNr"> 63 </span> @@ -134,9 +134,9 @@ if ('onhashchange' in window) { <span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(code)</span> <span id="L75" class="LineNr"> 75 </span><span class="Normal">void</span> <a href='039debug.cc.html#L75'>dump_watch_points</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L76" class="LineNr"> 76 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L71'>Watch_points</a></span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L77" class="LineNr"> 77 </span> <a href='003trace.cc.html#L430'>dbg</a> << <span class="Constant">"watch points:"</span> << end<span class="Delimiter">();</span> +<span id="L77" class="LineNr"> 77 </span> <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span><span class="Delimiter">,</span> <span class="Constant">"dbg"</span><span class="Delimiter">)</span> << <span class="Constant">"watch points:"</span> << end<span class="Delimiter">();</span> <span id="L78" class="LineNr"> 78 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>>::iterator p = <span class="Special"><a href='039debug.cc.html#L71'>Watch_points</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <span class="Special"><a href='039debug.cc.html#L71'>Watch_points</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> -<span id="L79" class="LineNr"> 79 </span> <a href='003trace.cc.html#L430'>dbg</a> << <span class="Constant">" "</span> << p<span class="Delimiter">-></span>first << <span class="Constant">": "</span> << <a href='010---vm.cc.html#L413'>HEXWORD</a> << p<span class="Delimiter">-></span>second << <span class="Constant">" -> "</span> << <a href='010---vm.cc.html#L413'>HEXWORD</a> << <a href='010---vm.cc.html#L186'>read_mem_u32</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span>second<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L79" class="LineNr"> 79 </span> <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span><span class="Delimiter">,</span> <span class="Constant">"dbg"</span><span class="Delimiter">)</span> << <span class="Constant">" "</span> << p<span class="Delimiter">-></span>first << <span class="Constant">": "</span> << <a href='010---vm.cc.html#L408'>HEXWORD</a> << p<span class="Delimiter">-></span>second << <span class="Constant">" -> "</span> << <a href='010---vm.cc.html#L408'>HEXWORD</a> << <a href='010---vm.cc.html#L186'>read_mem_u32</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span>second<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L80" class="LineNr"> 80 </span><span class="Delimiter">}</span> <span id="L81" class="LineNr"> 81 </span> <span id="L82" class="LineNr"> 82 </span><span class="Delimiter">:(before "End Globals")</span> @@ -147,50 +147,64 @@ if ('onhashchange' in window) { <span id="L87" class="LineNr"> 87 </span> <span class="Special">Watch_this_effective_address</span> = get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L8'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">);</span> <span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(after "Found effective_address(addr)")</span> <span id="L89" class="LineNr"> 89 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special">Watch_this_effective_address</span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L90" class="LineNr"> 90 </span> <a href='003trace.cc.html#L430'>dbg</a> << <span class="Constant">"now watching "</span> << <a href='010---vm.cc.html#L413'>HEXWORD</a> << addr << <span class="Constant">" for "</span> << <span class="Special">Watch_this_effective_address</span> << end<span class="Delimiter">();</span> +<span id="L90" class="LineNr"> 90 </span> <a href='003trace.cc.html#L430'>dbg</a> << <span class="Constant">"now watching "</span> << <a href='010---vm.cc.html#L408'>HEXWORD</a> << addr << <span class="Constant">" for "</span> << <span class="Special">Watch_this_effective_address</span> << end<span class="Delimiter">();</span> <span id="L91" class="LineNr"> 91 </span> <a href='001help.cc.html#L251'>put</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L71'>Watch_points</a></span><span class="Delimiter">,</span> <span class="Special">Watch_this_effective_address</span><span class="Delimiter">,</span> addr<span class="Delimiter">);</span> <span id="L92" class="LineNr"> 92 </span><span class="Delimiter">}</span> <span id="L93" class="LineNr"> 93 </span> -<span id="L94" class="LineNr"> 94 </span><span class="Comment">//: helpers</span> -<span id="L95" class="LineNr"> 95 </span> -<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">:(code)</span> -<span id="L97" class="LineNr"> 97 </span>string <a href='039debug.cc.html#L97'>hacky_squeeze_out_whitespace</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L98" class="LineNr"> 98 </span> <span class="Comment">// strip whitespace at start</span> -<span id="L99" class="LineNr"> 99 </span> string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> -<span id="L100" class="LineNr">100 </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="L101" class="LineNr">101 </span> ++first<span class="Delimiter">;</span> -<span id="L102" class="LineNr">102 </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="L103" class="LineNr">103 </span> -<span id="L104" class="LineNr">104 </span> <span class="Comment">// strip whitespace at end</span> -<span id="L105" class="LineNr">105 </span> string::const_iterator last = --s<span class="Delimiter">.</span>end<span class="Delimiter">();</span> -<span id="L106" class="LineNr">106 </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="L107" class="LineNr">107 </span> --last<span class="Delimiter">;</span> -<span id="L108" class="LineNr">108 </span> ++last<span class="Delimiter">;</span> +<span id="L94" class="LineNr"> 94 </span><span class="Comment">//: Special label that dumps regions of memory.</span> +<span id="L95" class="LineNr"> 95 </span><span class="Comment">//: Not a general mechanism; by the time you get here you're willing to hack</span> +<span id="L96" class="LineNr"> 96 </span><span class="Comment">//: on the emulator.</span> +<span id="L97" class="LineNr"> 97 </span><span class="Delimiter">:(after "Run One Instruction")</span> +<span id="L98" class="LineNr"> 98 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L255'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L8'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> && get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L8'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> == <span class="Constant">"$dump-stream-at-EAX"</span><span class="Delimiter">)</span> +<span id="L99" class="LineNr"> 99 </span> <a href='039debug.cc.html#L101'>dump_stream_at</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> +<span id="L100" class="LineNr">100 </span><span class="Delimiter">:(code)</span> +<span id="L101" class="LineNr">101 </span><span class="Normal">void</span> <a href='039debug.cc.html#L101'>dump_stream_at</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> stream_start<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L102" class="LineNr">102 </span> <span class="Normal">int32_t</span> stream_length = <a href='010---vm.cc.html#L190'>read_mem_i32</a><span class="Delimiter">(</span>stream_start + <span class="Constant">8</span><span class="Delimiter">);</span> +<span id="L103" class="LineNr">103 </span> <a href='003trace.cc.html#L430'>dbg</a> << <span class="Constant">"stream length: "</span> << std::dec << stream_length << end<span class="Delimiter">();</span> +<span id="L104" class="LineNr">104 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < stream_length + <span class="Constant">12</span><span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> +<span id="L105" class="LineNr">105 </span> <a href='003trace.cc.html#L430'>dbg</a> << <span class="Constant">"0x"</span> << <a href='010---vm.cc.html#L408'>HEXWORD</a> << <span class="Delimiter">(</span>stream_start+i<span class="Delimiter">)</span> << <span class="Constant">": "</span> << <a href='010---vm.cc.html#L407'>HEXBYTE</a> << <a href='010---vm.cc.html#L410'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L179'>read_mem_u8</a><span class="Delimiter">(</span>stream_start+i<span class="Delimiter">))</span> << end<span class="Delimiter">();</span> +<span id="L106" class="LineNr">106 </span><span class="Delimiter">}</span> +<span id="L107" class="LineNr">107 </span> +<span id="L108" class="LineNr">108 </span><span class="Comment">//: helpers</span> <span id="L109" class="LineNr">109 </span> -<span id="L110" class="LineNr">110 </span> <span class="Comment">// replace runs of spaces/dots with single space until comment or string</span> -<span id="L111" class="LineNr">111 </span> <span class="Comment">// </span><span class="Todo">TODO</span><span class="Comment">:</span> -<span id="L112" class="LineNr">112 </span> <span class="Comment">// leave alone dots not surrounded by whitespace</span> -<span id="L113" class="LineNr">113 </span> <span class="Comment">// leave alone '#' within word</span> -<span id="L114" class="LineNr">114 </span> <span class="Comment">// leave alone '"' within word</span> -<span id="L115" class="LineNr">115 </span> <span class="Comment">// squeeze spaces after end of string</span> -<span id="L116" class="LineNr">116 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L117" class="LineNr">117 </span> <span class="Normal">bool</span> previous_was_space = <span class="Constant">false</span><span class="Delimiter">;</span> -<span id="L118" class="LineNr">118 </span> <span class="Normal">bool</span> in_comment_or_string = <span class="Constant">false</span><span class="Delimiter">;</span> -<span id="L119" class="LineNr">119 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>string::const_iterator curr = first<span class="Delimiter">;</span> curr != last<span class="Delimiter">;</span> ++curr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L120" class="LineNr">120 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in_comment_or_string<span class="Delimiter">)</span> -<span id="L121" class="LineNr">121 </span> out << *curr<span class="Delimiter">;</span> -<span id="L122" class="LineNr">122 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>*curr<span class="Delimiter">)</span> || *curr == <span class="Constant">'.'</span><span class="Delimiter">)</span> -<span id="L123" class="LineNr">123 </span> previous_was_space = <span class="Constant">true</span><span class="Delimiter">;</span> -<span id="L124" class="LineNr">124 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L125" class="LineNr">125 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>previous_was_space<span class="Delimiter">)</span> -<span id="L126" class="LineNr">126 </span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> -<span id="L127" class="LineNr">127 </span> out << *curr<span class="Delimiter">;</span> -<span id="L128" class="LineNr">128 </span> previous_was_space = <span class="Constant">false</span><span class="Delimiter">;</span> -<span id="L129" class="LineNr">129 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr == <span class="Constant">'#'</span> || *curr == <span class="Constant">'"'</span><span class="Delimiter">)</span> in_comment_or_string = <span class="Constant">true</span><span class="Delimiter">;</span> -<span id="L130" class="LineNr">130 </span> <span class="Delimiter">}</span> -<span id="L131" class="LineNr">131 </span> <span class="Delimiter">}</span> -<span id="L132" class="LineNr">132 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> -<span id="L133" class="LineNr">133 </span><span class="Delimiter">}</span> +<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(code)</span> +<span id="L111" class="LineNr">111 </span>string <a href='039debug.cc.html#L111'>hacky_squeeze_out_whitespace</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L112" class="LineNr">112 </span> <span class="Comment">// strip whitespace at start</span> +<span id="L113" class="LineNr">113 </span> string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> +<span id="L114" class="LineNr">114 </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="L115" class="LineNr">115 </span> ++first<span class="Delimiter">;</span> +<span id="L116" class="LineNr">116 </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="L117" class="LineNr">117 </span> +<span id="L118" class="LineNr">118 </span> <span class="Comment">// strip whitespace at end</span> +<span id="L119" class="LineNr">119 </span> string::const_iterator last = --s<span class="Delimiter">.</span>end<span class="Delimiter">();</span> +<span id="L120" class="LineNr">120 </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="L121" class="LineNr">121 </span> --last<span class="Delimiter">;</span> +<span id="L122" class="LineNr">122 </span> ++last<span class="Delimiter">;</span> +<span id="L123" class="LineNr">123 </span> +<span id="L124" class="LineNr">124 </span> <span class="Comment">// replace runs of spaces/dots with single space until comment or string</span> +<span id="L125" class="LineNr">125 </span> <span class="Comment">// </span><span class="Todo">TODO</span><span class="Comment">:</span> +<span id="L126" class="LineNr">126 </span> <span class="Comment">// leave alone dots not surrounded by whitespace</span> +<span id="L127" class="LineNr">127 </span> <span class="Comment">// leave alone '#' within word</span> +<span id="L128" class="LineNr">128 </span> <span class="Comment">// leave alone '"' within word</span> +<span id="L129" class="LineNr">129 </span> <span class="Comment">// squeeze spaces after end of string</span> +<span id="L130" class="LineNr">130 </span> ostringstream out<span class="Delimiter">;</span> +<span id="L131" class="LineNr">131 </span> <span class="Normal">bool</span> previous_was_space = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L132" class="LineNr">132 </span> <span class="Normal">bool</span> in_comment_or_string = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L133" class="LineNr">133 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>string::const_iterator curr = first<span class="Delimiter">;</span> curr != last<span class="Delimiter">;</span> ++curr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L134" class="LineNr">134 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in_comment_or_string<span class="Delimiter">)</span> +<span id="L135" class="LineNr">135 </span> out << *curr<span class="Delimiter">;</span> +<span id="L136" class="LineNr">136 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>*curr<span class="Delimiter">)</span> || *curr == <span class="Constant">'.'</span><span class="Delimiter">)</span> +<span id="L137" class="LineNr">137 </span> previous_was_space = <span class="Constant">true</span><span class="Delimiter">;</span> +<span id="L138" class="LineNr">138 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> +<span id="L139" class="LineNr">139 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>previous_was_space<span class="Delimiter">)</span> +<span id="L140" class="LineNr">140 </span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> +<span id="L141" class="LineNr">141 </span> out << *curr<span class="Delimiter">;</span> +<span id="L142" class="LineNr">142 </span> previous_was_space = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L143" class="LineNr">143 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr == <span class="Constant">'#'</span> || *curr == <span class="Constant">'"'</span><span class="Delimiter">)</span> in_comment_or_string = <span class="Constant">true</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="Delimiter">}</span> +<span id="L146" class="LineNr">146 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> +<span id="L147" class="LineNr">147 </span><span class="Delimiter">}</span> </pre> </body> </html> |