diff options
Diffstat (limited to 'html/016dilated_reagent.cc.html')
| -rw-r--r-- | html/016dilated_reagent.cc.html | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/html/016dilated_reagent.cc.html b/html/016dilated_reagent.cc.html index bf41460b..dcd7bb87 100644 --- a/html/016dilated_reagent.cc.html +++ b/html/016dilated_reagent.cc.html @@ -95,7 +95,7 @@ if ('onhashchange' in window) { <span id="L31" class="LineNr"> 31 </span> <span id="L32" class="LineNr"> 32 </span><span class="Comment">//: First augment next_word to group balanced brackets together.</span> <span id="L33" class="LineNr"> 33 </span> -<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before "End <a href='011load.cc.html#L167'>next_word</a> Special-cases")</span> +<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before "End <a href='011load.cc.html#L169'>next_word</a> Special-cases")</span> <span id="L35" class="LineNr"> 35 </span><span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'('</span><span class="Delimiter">)</span> <span id="L36" class="LineNr"> 36 </span> <span class="Identifier">return</span> <a href='016dilated_reagent.cc.html#L57'>slurp_balanced_bracket</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L37" class="LineNr"> 37 </span><span class="Comment">// treat curlies mostly like parens, but don't mess up labels</span> @@ -106,7 +106,7 @@ if ('onhashchange' in window) { <span id="L42" class="LineNr"> 42 </span><span class="Comment">// A curly is considered a label if it's the last thing on a line. Dilated</span> <span id="L43" class="LineNr"> 43 </span><span class="Comment">// reagents should remain all on one line.</span> <span id="L44" class="LineNr"> 44 </span><span class="Normal">bool</span> <a href='016dilated_reagent.cc.html#L44'>start_of_dilated_reagent</a><span class="Delimiter">(</span>istream& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L45" class="LineNr"> 45 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'{'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L45" class="LineNr"> 45 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'{'</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L46" class="LineNr"> 46 </span> <span class="Normal">int</span> pos = in<span class="Delimiter">.</span>tellg<span class="Delimiter">();</span> <span id="L47" class="LineNr"> 47 </span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> <span class="Comment">// slurp '{'</span> <span id="L48" class="LineNr"> 48 </span> skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span> @@ -126,7 +126,7 @@ if ('onhashchange' in window) { <span id="L62" class="LineNr"> 62 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'('</span><span class="Delimiter">)</span> open_brackets<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>c<span class="Delimiter">);</span> <span id="L63" class="LineNr"> 63 </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="L64" class="LineNr"> 64 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>open_brackets<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || open_brackets<span class="Delimiter">.</span>back<span class="Delimiter">()</span> != <span class="Constant">'('</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L65" class="LineNr"> 65 </span> <a href='003trace.cc.html#L174'>raise</a> << <span class="Constant">"unbalanced ')'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> +<span id="L65" class="LineNr"> 65 </span> <a href='003trace.cc.html#L197'>raise</a> << <span class="Constant">"unbalanced ')'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> <span id="L66" class="LineNr"> 66 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L67" class="LineNr"> 67 </span> <span class="Delimiter">}</span> <span id="L68" class="LineNr"> 68 </span> assert<span class="Delimiter">(</span>open_brackets<span class="Delimiter">.</span>back<span class="Delimiter">()</span> == <span class="Constant">'('</span><span class="Delimiter">);</span> @@ -135,7 +135,7 @@ if ('onhashchange' in window) { <span id="L71" class="LineNr"> 71 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'['</span><span class="Delimiter">)</span> open_brackets<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>c<span class="Delimiter">);</span> <span id="L72" class="LineNr"> 72 </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="L73" class="LineNr"> 73 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>open_brackets<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || open_brackets<span class="Delimiter">.</span>back<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L74" class="LineNr"> 74 </span> <a href='003trace.cc.html#L174'>raise</a> << <span class="Constant">"unbalanced ']'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> +<span id="L74" class="LineNr"> 74 </span> <a href='003trace.cc.html#L197'>raise</a> << <span class="Constant">"unbalanced ']'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> <span id="L75" class="LineNr"> 75 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L76" class="LineNr"> 76 </span> <span class="Delimiter">}</span> <span id="L77" class="LineNr"> 77 </span> open_brackets<span class="Delimiter">.</span>pop_back<span class="Delimiter">();</span> @@ -143,7 +143,7 @@ if ('onhashchange' in window) { <span id="L79" class="LineNr"> 79 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'{'</span><span class="Delimiter">)</span> open_brackets<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>c<span class="Delimiter">);</span> <span id="L80" class="LineNr"> 80 </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="L81" class="LineNr"> 81 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>open_brackets<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || open_brackets<span class="Delimiter">.</span>back<span class="Delimiter">()</span> != <span class="Constant">'{'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L82" class="LineNr"> 82 </span> <a href='003trace.cc.html#L174'>raise</a> << <span class="Constant">"unbalanced '}'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> +<span id="L82" class="LineNr"> 82 </span> <a href='003trace.cc.html#L197'>raise</a> << <span class="Constant">"unbalanced '}'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> <span id="L83" class="LineNr"> 83 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L84" class="LineNr"> 84 </span> <span class="Delimiter">}</span> <span id="L85" class="LineNr"> 85 </span> open_brackets<span class="Delimiter">.</span>pop_back<span class="Delimiter">();</span> @@ -151,7 +151,7 @@ if ('onhashchange' in window) { <span id="L87" class="LineNr"> 87 </span> result << c<span class="Delimiter">;</span> <span id="L88" class="LineNr"> 88 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>open_brackets<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L89" class="LineNr"> 89 </span> <span class="Delimiter">}</span> -<span id="L90" class="LineNr"> 90 </span> <a href='011load.cc.html#L220'>skip_whitespace_and_comments_but_not_newline</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> +<span id="L90" class="LineNr"> 90 </span> <a href='011load.cc.html#L222'>skip_whitespace_and_comments_but_not_newline</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L91" class="LineNr"> 91 </span> <span class="Identifier">return</span> result<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L92" class="LineNr"> 92 </span><span class="Delimiter">}</span> <span id="L93" class="LineNr"> 93 </span> @@ -163,33 +163,33 @@ if ('onhashchange' in window) { <span id="L99" class="LineNr"> 99 </span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> <span class="Comment">// skip '{'</span> <span id="L100" class="LineNr">100 </span> name = <a href='016dilated_reagent.cc.html#L139'>slurp_key</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L101" class="LineNr">101 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L102" class="LineNr">102 </span> <a href='003trace.cc.html#L174'>raise</a> << <span class="Constant">"invalid reagent '"</span> << s << <span class="Constant">"' without a name</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> +<span id="L102" class="LineNr">102 </span> <a href='003trace.cc.html#L197'>raise</a> << <span class="Constant">"invalid reagent '"</span> << s << <span class="Constant">"' without a name</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> <span id="L103" class="LineNr">103 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L104" class="LineNr">104 </span> <span class="Delimiter">}</span> <span id="L105" class="LineNr">105 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>name == <span class="Constant">"}"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L106" class="LineNr">106 </span> <a href='003trace.cc.html#L174'>raise</a> << <span class="Constant">"invalid empty reagent '"</span> << s << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> +<span id="L106" class="LineNr">106 </span> <a href='003trace.cc.html#L197'>raise</a> << <span class="Constant">"invalid empty reagent '"</span> << s << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> <span id="L107" class="LineNr">107 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L108" class="LineNr">108 </span> <span class="Delimiter">}</span> <span id="L109" class="LineNr">109 </span> <span class="Delimiter">{</span> -<span id="L110" class="LineNr">110 </span> string s = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> +<span id="L110" class="LineNr">110 </span> string s = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L111" class="LineNr">111 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> <span id="L112" class="LineNr">112 </span> assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span> -<span id="L113" class="LineNr">113 </span> <a href='003trace.cc.html#L174'>raise</a> << <span class="Constant">"incomplete dilated reagent at <a href='003trace.cc.html#L203'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> +<span id="L113" class="LineNr">113 </span> <a href='003trace.cc.html#L197'>raise</a> << <span class="Constant">"incomplete dilated reagent at <a href='003trace.cc.html#L226'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> <span id="L114" class="LineNr">114 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L115" class="LineNr">115 </span> <span class="Delimiter">}</span> <span id="L116" class="LineNr">116 </span> string_tree* type_names = <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>s<span class="Delimiter">);</span> <span id="L117" class="LineNr">117 </span> <span class="Comment">// End Parsing Dilated Reagent Type Property(type_names)</span> -<span id="L118" class="LineNr">118 </span> type = <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>type_names<span class="Delimiter">);</span> +<span id="L118" class="LineNr">118 </span> type = <a href='019type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>type_names<span class="Delimiter">);</span> <span id="L119" class="LineNr">119 </span> <span class="Normal">delete</span> type_names<span class="Delimiter">;</span> <span id="L120" class="LineNr">120 </span> <span class="Delimiter">}</span> <span id="L121" class="LineNr">121 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L239'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L122" class="LineNr">122 </span> string key = <a href='016dilated_reagent.cc.html#L139'>slurp_key</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L123" class="LineNr">123 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>key<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L124" class="LineNr">124 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>key == <span class="Constant">"}"</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> -<span id="L125" class="LineNr">125 </span> string s = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> +<span id="L125" class="LineNr">125 </span> string s = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L126" class="LineNr">126 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> <span id="L127" class="LineNr">127 </span> assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span> -<span id="L128" class="LineNr">128 </span> <a href='003trace.cc.html#L174'>raise</a> << <span class="Constant">"incomplete dilated reagent at <a href='003trace.cc.html#L203'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> +<span id="L128" class="LineNr">128 </span> <a href='003trace.cc.html#L197'>raise</a> << <span class="Constant">"incomplete dilated reagent at <a href='003trace.cc.html#L226'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> <span id="L129" class="LineNr">129 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L130" class="LineNr">130 </span> <span class="Delimiter">}</span> <span id="L131" class="LineNr">131 </span> string_tree* value = <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>s<span class="Delimiter">);</span> @@ -201,10 +201,10 @@ if ('onhashchange' in window) { <span id="L137" class="LineNr">137 </span> <span id="L138" class="LineNr">138 </span><span class="Delimiter">:(code)</span> <span id="L139" class="LineNr">139 </span>string <a href='016dilated_reagent.cc.html#L139'>slurp_key</a><span class="Delimiter">(</span>istream& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L140" class="LineNr">140 </span> string result = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> +<span id="L140" class="LineNr">140 </span> string result = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L141" class="LineNr">141 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> <span id="L142" class="LineNr">142 </span> assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span> -<span id="L143" class="LineNr">143 </span> <a href='003trace.cc.html#L174'>raise</a> << <span class="Constant">"incomplete dilated reagent at <a href='003trace.cc.html#L203'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> +<span id="L143" class="LineNr">143 </span> <a href='003trace.cc.html#L197'>raise</a> << <span class="Constant">"incomplete dilated reagent at <a href='003trace.cc.html#L226'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> <span id="L144" class="LineNr">144 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L145" class="LineNr">145 </span> <span class="Delimiter">}</span> <span id="L146" class="LineNr">146 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> && *result<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span> |