diff options
| author | Kartik Agaram <vc@akkartik.com> | 2019-02-18 22:43:01 -0800 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2019-02-18 22:43:01 -0800 |
| commit | e99038ea514a8703b170689d5a0730c8d2e542e7 (patch) | |
| tree | 841f1bb5b26c8110ba272dcae9d6a84d083c783e /html/subx/038---literal_strings.cc.html | |
| parent | 8188bbbc9408322c18cdc2d1049126900abf793c (diff) | |
| download | mu-e99038ea514a8703b170689d5a0730c8d2e542e7.tar.gz | |
4982
Diffstat (limited to 'html/subx/038---literal_strings.cc.html')
| -rw-r--r-- | html/subx/038---literal_strings.cc.html | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/html/subx/038---literal_strings.cc.html b/html/subx/038---literal_strings.cc.html index 2f7c2c48..0646fe2b 100644 --- a/html/subx/038---literal_strings.cc.html +++ b/html/subx/038---literal_strings.cc.html @@ -70,14 +70,14 @@ if ('onhashchange' in window) { <span id="L9" class="LineNr"> 9 </span>== data <span class="Comment"># need to manually create this for now</span> <span id="L10" class="LineNr"> 10 </span><span class="traceContains">+transform: -- move literal strings to data segment</span> <span id="L11" class="LineNr"> 11 </span><span class="traceContains">+transform: adding global variable '__subx_global_1' containing "test"</span> -<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'b8 __subx_global_1'</span> +<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L228'>transform</a>: 'b8 __subx_global_1'</span> <span id="L13" class="LineNr"> 13 </span> <span id="L14" class="LineNr"> 14 </span><span class="Comment">//: We don't rely on any transforms running in previous layers, but this layer</span> <span id="L15" class="LineNr"> 15 </span><span class="Comment">//: knows about labels and global variables and will emit them for previous</span> <span id="L16" class="LineNr"> 16 </span><span class="Comment">//: layers to transform.</span> <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(after "Begin Transforms")</span> <span id="L18" class="LineNr"> 18 </span><span class="Comment">// Begin Level-3 Transforms</span> -<span id="L19" class="LineNr"> 19 </span><span class="Special"><a href='011run.cc.html#L229'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='038---literal_strings.cc.html#L25'>transform_literal_strings</a><span class="Delimiter">);</span> +<span id="L19" class="LineNr"> 19 </span><span class="Special"><a href='011run.cc.html#L225'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='038---literal_strings.cc.html#L25'>transform_literal_strings</a><span class="Delimiter">);</span> <span id="L20" class="LineNr"> 20 </span><span class="Comment">// End Level-3 Transforms</span> <span id="L21" class="LineNr"> 21 </span> <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before "End Globals")</span> @@ -85,13 +85,13 @@ if ('onhashchange' in window) { <span id="L24" class="LineNr"> 24 </span><span class="Delimiter">:(code)</span> <span id="L25" class="LineNr"> 25 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L25'>transform_literal_strings</a><span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L26" class="LineNr"> 26 </span> <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- move literal strings to data segment"</span> << end<span class="Delimiter">();</span> -<span id="L27" class="LineNr"> 27 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L28" class="LineNr"> 28 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L27" class="LineNr"> 27 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L28" class="LineNr"> 28 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> <span id="L29" class="LineNr"> 29 </span> segment data<span class="Delimiter">;</span> -<span id="L30" class="LineNr"> 30 </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 < <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L31" class="LineNr"> 31 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L32" class="LineNr"> 32 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L33" class="LineNr"> 33 </span> word& curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> +<span id="L30" class="LineNr"> 30 </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 < <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L31" class="LineNr"> 31 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L32" class="LineNr"> 32 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L33" class="LineNr"> 33 </span> word& curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> <span id="L34" class="LineNr"> 34 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> != <span class="Constant">'"'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L35" class="LineNr"> 35 </span> ostringstream global_name<span class="Delimiter">;</span> <span id="L36" class="LineNr"> 36 </span> global_name << <span class="Constant">"__subx_global_"</span> << <span class="Special"><a href='038---literal_strings.cc.html#L23'>Next_auto_global</a></span><span class="Delimiter">;</span> @@ -99,32 +99,32 @@ if ('onhashchange' in window) { <span id="L38" class="LineNr"> 38 </span> <a href='038---literal_strings.cc.html#L52'>add_global_to_data_segment</a><span class="Delimiter">(</span>global_name<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> curr<span class="Delimiter">,</span> data<span class="Delimiter">);</span> <span id="L39" class="LineNr"> 39 </span> curr<span class="Delimiter">.</span>data = global_name<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L40" class="LineNr"> 40 </span> <span class="Delimiter">}</span> -<span id="L41" class="LineNr"> 41 </span> <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"instruction after <a href='011run.cc.html#L231'>transform</a>: '"</span> << data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> +<span id="L41" class="LineNr"> 41 </span> <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"instruction after <a href='011run.cc.html#L228'>transform</a>: '"</span> << data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> <span id="L42" class="LineNr"> 42 </span> <span class="Delimiter">}</span> -<span id="L43" class="LineNr"> 43 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L44" class="LineNr"> 44 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span> < <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L45" class="LineNr"> 45 </span> p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span> -<span id="L46" class="LineNr"> 46 </span> p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> +<span id="L43" class="LineNr"> 43 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L44" class="LineNr"> 44 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">)</span> < <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L45" class="LineNr"> 45 </span> p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span> +<span id="L46" class="LineNr"> 46 </span> p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span> <span id="L47" class="LineNr"> 47 </span> <span class="Delimiter">}</span> -<span id="L48" class="LineNr"> 48 </span> vector<line>& existing_data = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">;</span> -<span id="L49" class="LineNr"> 49 </span> existing_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>existing_data<span class="Delimiter">.</span>end<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span> +<span id="L48" class="LineNr"> 48 </span> vector<line>& existing_data = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">;</span> +<span id="L49" class="LineNr"> 49 </span> existing_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>existing_data<span class="Delimiter">.</span>end<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span> <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">}</span> <span id="L51" class="LineNr"> 51 </span> <span id="L52" class="LineNr"> 52 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L52'>add_global_to_data_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> string& name<span class="Delimiter">,</span> <span class="Normal">const</span> word& value<span class="Delimiter">,</span> segment& data<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L53" class="LineNr"> 53 </span> <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"adding global variable '"</span> << name << <span class="Constant">"' containing "</span> << value<span class="Delimiter">.</span>data << end<span class="Delimiter">();</span> <span id="L54" class="LineNr"> 54 </span> <span class="Comment">// emit label</span> -<span id="L55" class="LineNr"> 55 </span> data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span>name<span class="Delimiter">));</span> +<span id="L55" class="LineNr"> 55 </span> data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span>name<span class="Delimiter">));</span> <span id="L56" class="LineNr"> 56 </span> <span class="Comment">// emit size for size-prefixed array</span> -<span id="L57" class="LineNr"> 57 </span> data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">());</span> -<span id="L58" class="LineNr"> 58 </span> emit_hex_bytes<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">(),</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip quotes</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Comment">/*</span><span class="Comment">bytes</span><span class="Comment">*/</span><span class="Delimiter">);</span> +<span id="L57" class="LineNr"> 57 </span> data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L113'>line</a><span class="Delimiter">());</span> +<span id="L58" class="LineNr"> 58 </span> emit_hex_bytes<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">(),</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip quotes</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Comment">/*</span><span class="Comment">bytes</span><span class="Comment">*/</span><span class="Delimiter">);</span> <span id="L59" class="LineNr"> 59 </span> <span class="Comment">// emit data byte by byte</span> -<span id="L60" class="LineNr"> 60 </span> data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">());</span> -<span id="L61" class="LineNr"> 61 </span> line& curr = data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">();</span> +<span id="L60" class="LineNr"> 60 </span> data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L113'>line</a><span class="Delimiter">());</span> +<span id="L61" class="LineNr"> 61 </span> line& curr = data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">();</span> <span id="L62" class="LineNr"> 62 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip start quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip end quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L63" class="LineNr"> 63 </span> <span class="Normal">char</span> c = value<span class="Delimiter">.</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L64" class="LineNr"> 64 </span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span> -<span id="L65" class="LineNr"> 65 </span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <a href='030---operands.cc.html#L286'>hex_byte_to_string</a><span class="Delimiter">(</span>c<span class="Delimiter">);</span> -<span id="L66" class="LineNr"> 66 </span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">,</span> c<span class="Delimiter">));</span> +<span id="L64" class="LineNr"> 64 </span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L119'>word</a><span class="Delimiter">());</span> +<span id="L65" class="LineNr"> 65 </span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <a href='030---operands.cc.html#L286'>hex_byte_to_string</a><span class="Delimiter">(</span>c<span class="Delimiter">);</span> +<span id="L66" class="LineNr"> 66 </span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">,</span> c<span class="Delimiter">));</span> <span id="L67" class="LineNr"> 67 </span> <span class="Delimiter">}</span> <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span> <span id="L69" class="LineNr"> 69 </span> @@ -134,9 +134,9 @@ if ('onhashchange' in window) { <span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(scenarios parse_instruction_character_by_character)</span> <span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(scenario instruction_with_string_literal)</span> <span id="L75" class="LineNr"> 75 </span>a <span class="Constant">"abc def"</span> z <span class="Comment"># two spaces inside string</span> -<span id="L76" class="LineNr"> 76 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> -<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: "abc def"</span> -<span id="L78" class="LineNr"> 78 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: z</span> +<span id="L76" class="LineNr"> 76 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span> +<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: "abc def"</span> +<span id="L78" class="LineNr"> 78 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: z</span> <span id="L79" class="LineNr"> 79 </span><span class="Comment"># no other words</span> <span id="L80" class="LineNr"> 80 </span>$parse2: <span class="Constant">3</span> <span id="L81" class="LineNr"> 81 </span> @@ -155,7 +155,7 @@ if ('onhashchange' in window) { <span id="L94" class="LineNr"> 94 </span> <span class="Comment">// parse literals</span> <span id="L95" class="LineNr"> 95 </span> istringstream in<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span> <span id="L96" class="LineNr"> 96 </span> in >> std::noskipws<span class="Delimiter">;</span> -<span id="L97" class="LineNr"> 97 </span> <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span> +<span id="L97" class="LineNr"> 97 </span> <a href='011run.cc.html#L113'>line</a> result<span class="Delimiter">;</span> <span id="L98" class="LineNr"> 98 </span> <span class="Comment">// add tokens (words or strings) one by one</span> <span id="L99" class="LineNr"> 99 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L100" class="LineNr">100 </span> <a href='038---literal_strings.cc.html#L151'>skip_whitespace</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> @@ -168,7 +168,7 @@ if ('onhashchange' in window) { <span id="L107" class="LineNr">107 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> <span id="L108" class="LineNr">108 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// '.' followed by space is comment token; skip</span> <span id="L109" class="LineNr">109 </span> <span class="Delimiter">}</span> -<span id="L110" class="LineNr">110 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span> +<span id="L110" class="LineNr">110 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L119'>word</a><span class="Delimiter">());</span> <span id="L111" class="LineNr">111 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'"'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L112" class="LineNr">112 </span> <span class="Comment">// slurp word data</span> <span id="L113" class="LineNr">113 </span> ostringstream d<span class="Delimiter">;</span> @@ -178,20 +178,20 @@ if ('onhashchange' in window) { <span id="L117" class="LineNr">117 </span> d << c<span class="Delimiter">;</span> <span id="L118" class="LineNr">118 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'"'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L119" class="LineNr">119 </span> <span class="Delimiter">}</span> -<span id="L120" class="LineNr">120 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = d<span class="Delimiter">.</span>str<span class="Delimiter">();</span> +<span id="L120" class="LineNr">120 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = d<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L121" class="LineNr">121 </span> <span class="Comment">// slurp metadata</span> <span id="L122" class="LineNr">122 </span> ostringstream m<span class="Delimiter">;</span> <span id="L123" class="LineNr">123 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> && <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L124" class="LineNr">124 </span> in >> c<span class="Delimiter">;</span> <span id="L125" class="LineNr">125 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'/'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L126" class="LineNr">126 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">.</span>str<span class="Delimiter">());</span> +<span id="L126" class="LineNr">126 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">.</span>str<span class="Delimiter">());</span> <span id="L127" class="LineNr">127 </span> m<span class="Delimiter">.</span>str<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L128" class="LineNr">128 </span> <span class="Delimiter">}</span> <span id="L129" class="LineNr">129 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> <span id="L130" class="LineNr">130 </span> m << c<span class="Delimiter">;</span> <span id="L131" class="LineNr">131 </span> <span class="Delimiter">}</span> <span id="L132" class="LineNr">132 </span> <span class="Delimiter">}</span> -<span id="L133" class="LineNr">133 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">.</span>str<span class="Delimiter">());</span> +<span id="L133" class="LineNr">133 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">.</span>str<span class="Delimiter">());</span> <span id="L134" class="LineNr">134 </span> <span class="Delimiter">}</span> <span id="L135" class="LineNr">135 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> <span id="L136" class="LineNr">136 </span> <span class="Comment">// slurp all characters until whitespace</span> @@ -201,11 +201,11 @@ if ('onhashchange' in window) { <span id="L140" class="LineNr">140 </span> in >> c<span class="Delimiter">;</span> <span id="L141" class="LineNr">141 </span> w << c<span class="Delimiter">;</span> <span id="L142" class="LineNr">142 </span> <span class="Delimiter">}</span> -<span id="L143" class="LineNr">143 </span> <a href='011run.cc.html#L191'>parse_word</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span> +<span id="L143" class="LineNr">143 </span> <a href='011run.cc.html#L187'>parse_word</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span> <span id="L144" class="LineNr">144 </span> <span class="Delimiter">}</span> -<span id="L145" class="LineNr">145 </span> <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse2"</span><span class="Delimiter">)</span> << <span class="Constant">"word: "</span> << to_string<span class="Delimiter">(</span>result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">())</span> << end<span class="Delimiter">();</span> +<span id="L145" class="LineNr">145 </span> <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse2"</span><span class="Delimiter">)</span> << <span class="Constant">"word: "</span> << to_string<span class="Delimiter">(</span>result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">())</span> << end<span class="Delimiter">();</span> <span id="L146" class="LineNr">146 </span> <span class="Delimiter">}</span> -<span id="L147" class="LineNr">147 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> +<span id="L147" class="LineNr">147 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span id="L148" class="LineNr">148 </span> out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>result<span class="Delimiter">);</span> <span id="L149" class="LineNr">149 </span><span class="Delimiter">}</span> <span id="L150" class="LineNr">150 </span> @@ -231,52 +231,52 @@ if ('onhashchange' in window) { <span id="L170" class="LineNr">170 </span> <span id="L171" class="LineNr">171 </span><span class="Delimiter">:(scenario parse2_comment_token_in_middle)</span> <span id="L172" class="LineNr">172 </span>a <span class="Delimiter">.</span> z -<span id="L173" class="LineNr">173 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> -<span id="L174" class="LineNr">174 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: z</span> -<span id="L175" class="LineNr">175 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span> +<span id="L173" class="LineNr">173 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span> +<span id="L174" class="LineNr">174 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: z</span> +<span id="L175" class="LineNr">175 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L119'>word</a>: .</span> <span id="L176" class="LineNr">176 </span><span class="Comment"># no other words</span> <span id="L177" class="LineNr">177 </span>$parse2: <span class="Constant">2</span> <span id="L178" class="LineNr">178 </span> <span id="L179" class="LineNr">179 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot)</span> <span id="L180" class="LineNr">180 </span>a <span class="Delimiter">.</span>b c -<span id="L181" class="LineNr">181 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> -<span id="L182" class="LineNr">182 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .b</span> -<span id="L183" class="LineNr">183 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: c</span> +<span id="L181" class="LineNr">181 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span> +<span id="L182" class="LineNr">182 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: .b</span> +<span id="L183" class="LineNr">183 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: c</span> <span id="L184" class="LineNr">184 </span> <span id="L185" class="LineNr">185 </span><span class="Delimiter">:(scenario parse2_comment_token_at_start)</span> <span id="L186" class="LineNr">186 </span><span class="Delimiter">.</span> a b -<span id="L187" class="LineNr">187 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> -<span id="L188" class="LineNr">188 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span> -<span id="L189" class="LineNr">189 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span> +<span id="L187" class="LineNr">187 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span> +<span id="L188" class="LineNr">188 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: b</span> +<span id="L189" class="LineNr">189 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L119'>word</a>: .</span> <span id="L190" class="LineNr">190 </span> <span id="L191" class="LineNr">191 </span><span class="Delimiter">:(scenario parse2_comment_token_at_end)</span> <span id="L192" class="LineNr">192 </span>a b <span class="Delimiter">.</span> -<span id="L193" class="LineNr">193 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> -<span id="L194" class="LineNr">194 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span> -<span id="L195" class="LineNr">195 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span> +<span id="L193" class="LineNr">193 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span> +<span id="L194" class="LineNr">194 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: b</span> +<span id="L195" class="LineNr">195 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L119'>word</a>: .</span> <span id="L196" class="LineNr">196 </span> <span id="L197" class="LineNr">197 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot_at_start)</span> <span id="L198" class="LineNr">198 </span><span class="Delimiter">.</span>a b c -<span id="L199" class="LineNr">199 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .a</span> -<span id="L200" class="LineNr">200 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span> -<span id="L201" class="LineNr">201 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: c</span> +<span id="L199" class="LineNr">199 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: .a</span> +<span id="L200" class="LineNr">200 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: b</span> +<span id="L201" class="LineNr">201 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: c</span> <span id="L202" class="LineNr">202 </span> <span id="L203" class="LineNr">203 </span><span class="Delimiter">:(scenario parse2_metadata)</span> <span id="L204" class="LineNr">204 </span><span class="Delimiter">.</span>a b/c d -<span id="L205" class="LineNr">205 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .a</span> -<span id="L206" class="LineNr">206 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b /c</span> -<span id="L207" class="LineNr">207 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: d</span> +<span id="L205" class="LineNr">205 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: .a</span> +<span id="L206" class="LineNr">206 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: b /c</span> +<span id="L207" class="LineNr">207 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: d</span> <span id="L208" class="LineNr">208 </span> <span id="L209" class="LineNr">209 </span><span class="Delimiter">:(scenario parse2_string_with_metadata)</span> <span id="L210" class="LineNr">210 </span>a <span class="Constant">"bc def"</span>/disp32 g -<span id="L211" class="LineNr">211 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> -<span id="L212" class="LineNr">212 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: "bc def" /disp32</span> -<span id="L213" class="LineNr">213 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: g</span> +<span id="L211" class="LineNr">211 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span> +<span id="L212" class="LineNr">212 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: "bc def" /disp32</span> +<span id="L213" class="LineNr">213 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: g</span> <span id="L214" class="LineNr">214 </span> <span id="L215" class="LineNr">215 </span><span class="Delimiter">:(scenario parse2_string_with_metadata_at_end)</span> <span id="L216" class="LineNr">216 </span>a <span class="Constant">"bc def"</span>/disp32 -<span id="L217" class="LineNr">217 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> -<span id="L218" class="LineNr">218 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: "bc def" /disp32</span> +<span id="L217" class="LineNr">217 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span> +<span id="L218" class="LineNr">218 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: "bc def" /disp32</span> <span id="L219" class="LineNr">219 </span> <span id="L220" class="LineNr">220 </span><span class="Delimiter">:(code)</span> <span id="L221" class="LineNr">221 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L221'>test_parse2_string_with_metadata_at_end_of_line_without_newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> @@ -284,8 +284,8 @@ if ('onhashchange' in window) { <span id="L223" class="LineNr">223 </span> <span class="Constant">"68/push \"</span>test\<span class="Constant">"/f"</span> <span class="Comment">// no newline, which is how calls from parse() will look</span> <span id="L224" class="LineNr">224 </span> <span class="Delimiter">);</span> <span id="L225" class="LineNr">225 </span> <a href='003trace.cc.html#L233'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span> -<span id="L226" class="LineNr">226 </span> <span class="Constant">"parse2: <a href='011run.cc.html#L123'>word</a>: 68 /push^D"</span> -<span id="L227" class="LineNr">227 </span> <span class="Constant">"parse2: <a href='011run.cc.html#L123'>word</a>: \"</span>test\<span class="Constant">" /f^D"</span> +<span id="L226" class="LineNr">226 </span> <span class="Constant">"parse2: <a href='011run.cc.html#L119'>word</a>: 68 /push^D"</span> +<span id="L227" class="LineNr">227 </span> <span class="Constant">"parse2: <a href='011run.cc.html#L119'>word</a>: \"</span>test\<span class="Constant">" /f^D"</span> <span id="L228" class="LineNr">228 </span> <span class="Delimiter">);</span> <span id="L229" class="LineNr">229 </span><span class="Delimiter">}</span> <span id="L230" class="LineNr">230 </span> @@ -293,7 +293,7 @@ if ('onhashchange' in window) { <span id="L232" class="LineNr">232 </span><span class="Comment">//: string to metadata.</span> <span id="L233" class="LineNr">233 </span><span class="Delimiter">:(scenario parse2_string_containing_slashes)</span> <span id="L234" class="LineNr">234 </span>a <span class="Constant">"bc/def"</span>/disp32 -<span id="L235" class="LineNr">235 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: "bc/def" /disp32</span> +<span id="L235" class="LineNr">235 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: "bc/def" /disp32</span> </pre> </body> </html> |