diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2018-01-25 22:39:31 -0800 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2018-01-25 22:39:31 -0800 |
| commit | 805d58c6aeeeba3e4989c0eed6781b3861e8fae0 (patch) | |
| tree | ea5225bdd7c5fbeea912671cdc5f1c4b2b2828d7 /html/010vm.cc.html | |
| parent | aefa8fec6a473be459a2ff33e6bd96e7c22ced20 (diff) | |
| download | mu-805d58c6aeeeba3e4989c0eed6781b3861e8fae0.tar.gz | |
4199
Diffstat (limited to 'html/010vm.cc.html')
| -rw-r--r-- | html/010vm.cc.html | 245 |
1 files changed, 122 insertions, 123 deletions
diff --git a/html/010vm.cc.html b/html/010vm.cc.html index 3d6de025..a4932e2d 100644 --- a/html/010vm.cc.html +++ b/html/010vm.cc.html @@ -15,19 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color a { color:#eeeeee; text-decoration: none; } a:hover { text-decoration: underline; } * { font-size: 12pt; font-size: 1em; } -.Conceal { color: #4e4e4e; } +.cSpecial { color: #008000; } .PreProc { color: #800080; } .LineNr { color: #444444; } -.SalientComment { color: #00ffff; } -.Identifier { color: #c0a020; } .Constant { color: #00a0a0; } +.muRecipe { color: #ff8700; } +.Delimiter { color: #800080; } +.Identifier { color: #c0a020; } .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; } .Comment { color: #9090ff; } .Comment a { color:#0000ee; text-decoration:underline; } -.Delimiter { color: #800080; } -.cSpecial { color: #008000; } .CommentedCode { color: #6c6c6c; } -.muRecipe { color: #ff8700; } +.SalientComment { color: #00ffff; } --> </style> @@ -198,8 +197,8 @@ if ('onhashchange' in window) { <span id="L134" class="LineNr">134 </span> <a href='010vm.cc.html#L123'>type_ordinal</a> number = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">"number"</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span> <span id="L135" class="LineNr">135 </span> <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> number<span class="Delimiter">).</span>name = <span class="Constant">"number"</span><span class="Delimiter">;</span> <span id="L136" class="LineNr">136 </span> <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">"location"</span><span class="Delimiter">,</span> number<span class="Delimiter">);</span> <span class="Comment">// synonym of number to indicate we only care about its size</span> -<span id="L137" class="LineNr">137 </span> <a href='010vm.cc.html#L123'>type_ordinal</a> <a href='043space.cc.html#L82'>address</a> = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">"address"</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span> -<span id="L138" class="LineNr">138 </span> <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> <a href='043space.cc.html#L82'>address</a><span class="Delimiter">).</span>name = <span class="Constant">"address"</span><span class="Delimiter">;</span> +<span id="L137" class="LineNr">137 </span> <a href='010vm.cc.html#L123'>type_ordinal</a> <a href='043space.cc.html#L80'>address</a> = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">"address"</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span> +<span id="L138" class="LineNr">138 </span> <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> <a href='043space.cc.html#L80'>address</a><span class="Delimiter">).</span>name = <span class="Constant">"address"</span><span class="Delimiter">;</span> <span id="L139" class="LineNr">139 </span> <a href='010vm.cc.html#L123'>type_ordinal</a> boolean = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">"boolean"</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span> <span id="L140" class="LineNr">140 </span> <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> boolean<span class="Delimiter">).</span>name = <span class="Constant">"boolean"</span><span class="Delimiter">;</span> <span id="L141" class="LineNr">141 </span> <a href='010vm.cc.html#L123'>type_ordinal</a> character = <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Constant">"character"</span><span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span> @@ -212,8 +211,8 @@ if ('onhashchange' in window) { <span id="L148" class="LineNr">148 </span><span class="Delimiter">}</span> <span id="L149" class="LineNr">149 </span><span class="Normal">void</span> <a href='010vm.cc.html#L149'>teardown_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L150" class="LineNr">150 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<type_ordinal<span class="Delimiter">,</span> type_info>::iterator p = Type<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Type<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L151" class="LineNr">151 </span> <span class="Conceal">¦</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#L141'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span>second<span class="Delimiter">.</span>elements<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L152" class="LineNr">152 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> p<span class="Delimiter">-></span>second<span class="Delimiter">.</span>elements<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> +<span id="L151" class="LineNr">151 </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#L141'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span>second<span class="Delimiter">.</span>elements<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L152" class="LineNr">152 </span> p<span class="Delimiter">-></span>second<span class="Delimiter">.</span>elements<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> <span id="L153" class="LineNr">153 </span> <span class="Delimiter">}</span> <span id="L154" class="LineNr">154 </span> Type_ordinal<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> <span id="L155" class="LineNr">155 </span><span class="Delimiter">}</span> @@ -244,7 +243,7 @@ if ('onhashchange' in window) { <span id="L180" class="LineNr">180 </span> vector<reagent> elements<span class="Delimiter">;</span> <span id="L181" class="LineNr">181 </span> <span class="Comment">// End type_info Fields</span> <span id="L182" class="LineNr">182 </span> type_info<span class="Delimiter">()</span> :kind<span class="Delimiter">(</span><a href='010vm.cc.html#L172'>PRIMITIVE</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L183" class="LineNr">183 </span> <span class="Conceal">¦</span> <span class="Comment">// End type_info Constructor</span> +<span id="L183" class="LineNr">183 </span> <span class="Comment">// End type_info Constructor</span> <span id="L184" class="LineNr">184 </span> <span class="Delimiter">}</span> <span id="L185" class="LineNr">185 </span><span class="Delimiter">};</span> <span id="L186" class="LineNr">186 </span> @@ -352,9 +351,9 @@ if ('onhashchange' in window) { <span id="L288" class="LineNr">288 </span> <span class="Normal">delete</span> type_names<span class="Delimiter">;</span> <span id="L289" class="LineNr">289 </span> <span class="Comment">// special cases</span> <span id="L290" class="LineNr">290 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span>name<span class="Delimiter">)</span> && type == <span class="Constant">NULL</span><span class="Delimiter">)</span> -<span id="L291" class="LineNr">291 </span> <span class="Conceal">¦</span> type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">"literal"</span><span class="Delimiter">);</span> +<span id="L291" class="LineNr">291 </span> type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">"literal"</span><span class="Delimiter">);</span> <span id="L292" class="LineNr">292 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>name == <span class="Constant">"_"</span> && type == <span class="Constant">NULL</span><span class="Delimiter">)</span> -<span id="L293" class="LineNr">293 </span> <span class="Conceal">¦</span> type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">"literal"</span><span class="Delimiter">);</span> +<span id="L293" class="LineNr">293 </span> type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">"literal"</span><span class="Delimiter">);</span> <span id="L294" class="LineNr">294 </span> <span class="Comment">// other properties</span> <span id="L295" class="LineNr">295 </span> slurp_properties<span class="Delimiter">(</span>in<span class="Delimiter">,</span> properties<span class="Delimiter">);</span> <span id="L296" class="LineNr">296 </span> <span class="Comment">// End Parsing reagent</span> @@ -362,11 +361,11 @@ if ('onhashchange' in window) { <span id="L298" class="LineNr">298 </span> <span id="L299" class="LineNr">299 </span><span class="Normal">void</span> slurp_properties<span class="Delimiter">(</span>istream& in<span class="Delimiter">,</span> vector<pair<string<span class="Delimiter">,</span> string_tree*> >& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L300" class="LineNr">300 </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="L301" class="LineNr">301 </span> <span class="Conceal">¦</span> istringstream row<span class="Delimiter">(</span>slurp_until<span class="Delimiter">(</span>in<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">));</span> -<span id="L302" class="LineNr">302 </span> <span class="Conceal">¦</span> row >> std::noskipws<span class="Delimiter">;</span> -<span id="L303" class="LineNr">303 </span> <span class="Conceal">¦</span> string key = slurp_until<span class="Delimiter">(</span>row<span class="Delimiter">,</span> <span class="Constant">':'</span><span class="Delimiter">);</span> -<span id="L304" class="LineNr">304 </span> <span class="Conceal">¦</span> string_tree* value = parse_property_list<span class="Delimiter">(</span>row<span class="Delimiter">);</span> -<span id="L305" class="LineNr">305 </span> <span class="Conceal">¦</span> out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair<string<span class="Delimiter">,</span> string_tree*><span class="Delimiter">(</span>key<span class="Delimiter">,</span> value<span class="Delimiter">));</span> +<span id="L301" class="LineNr">301 </span> istringstream row<span class="Delimiter">(</span>slurp_until<span class="Delimiter">(</span>in<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">));</span> +<span id="L302" class="LineNr">302 </span> row >> std::noskipws<span class="Delimiter">;</span> +<span id="L303" class="LineNr">303 </span> string key = slurp_until<span class="Delimiter">(</span>row<span class="Delimiter">,</span> <span class="Constant">':'</span><span class="Delimiter">);</span> +<span id="L304" class="LineNr">304 </span> string_tree* value = parse_property_list<span class="Delimiter">(</span>row<span class="Delimiter">);</span> +<span id="L305" class="LineNr">305 </span> out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair<string<span class="Delimiter">,</span> string_tree*><span class="Delimiter">(</span>key<span class="Delimiter">,</span> value<span class="Delimiter">));</span> <span id="L306" class="LineNr">306 </span> <span class="Delimiter">}</span> <span id="L307" class="LineNr">307 </span><span class="Delimiter">}</span> <span id="L308" class="LineNr">308 </span> @@ -377,7 +376,7 @@ if ('onhashchange' in window) { <span id="L313" class="LineNr">313 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">return</span> first<span class="Delimiter">;</span> <span id="L314" class="LineNr">314 </span> string_tree* rest = parse_property_list<span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L315" class="LineNr">315 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">)</span> && rest<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> -<span id="L316" class="LineNr">316 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>first<span class="Delimiter">,</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>rest<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span> +<span id="L316" class="LineNr">316 </span> <span class="Identifier">return</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>first<span class="Delimiter">,</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>rest<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span> <span id="L317" class="LineNr">317 </span> <span class="Identifier">return</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>first<span class="Delimiter">,</span> rest<span class="Delimiter">);</span> <span id="L318" class="LineNr">318 </span><span class="Delimiter">}</span> <span id="L319" class="LineNr">319 </span><span class="Delimiter">:(before "End Unit Tests")</span> @@ -404,20 +403,20 @@ if ('onhashchange' in window) { <span id="L340" class="LineNr">340 </span>type_tree* <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span><span class="Normal">const</span> string_tree* properties<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L341" class="LineNr">341 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!properties<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">NULL</span><span class="Delimiter">;</span> <span id="L342" class="LineNr">342 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L343" class="LineNr">343 </span> <span class="Conceal">¦</span> <span class="Normal">const</span> string& type_name = properties<span class="Delimiter">-></span>value<span class="Delimiter">;</span> -<span id="L344" class="LineNr">344 </span> <span class="Conceal">¦</span> <span class="Normal">int</span> value = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L345" class="LineNr">345 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type_name<span class="Delimiter">))</span> -<span id="L346" class="LineNr">346 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> value = get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type_name<span class="Delimiter">);</span> -<span id="L347" class="LineNr">347 </span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span>type_name<span class="Delimiter">))</span> <span class="Comment">// sometimes types will contain non-type tags, like numbers for the size of an array</span> -<span id="L348" class="LineNr">348 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> value = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L349" class="LineNr">349 </span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">-></span>value == <span class="Constant">"->"</span><span class="Delimiter">)</span> <span class="Comment">// used in recipe types</span> -<span id="L350" class="LineNr">350 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> value = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L351" class="LineNr">351 </span> <span class="Conceal">¦</span> <span class="Normal">else</span> -<span id="L352" class="LineNr">352 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> value = -<span class="Constant">1</span><span class="Delimiter">;</span> <span class="Comment">// should never happen; will trigger errors later</span> -<span id="L353" class="LineNr">353 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>type_name<span class="Delimiter">,</span> value<span class="Delimiter">);</span> +<span id="L343" class="LineNr">343 </span> <span class="Normal">const</span> string& type_name = properties<span class="Delimiter">-></span>value<span class="Delimiter">;</span> +<span id="L344" class="LineNr">344 </span> <span class="Normal">int</span> value = <span class="Constant">0</span><span class="Delimiter">;</span> +<span id="L345" class="LineNr">345 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type_name<span class="Delimiter">))</span> +<span id="L346" class="LineNr">346 </span> value = get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type_name<span class="Delimiter">);</span> +<span id="L347" class="LineNr">347 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span>type_name<span class="Delimiter">))</span> <span class="Comment">// sometimes types will contain non-type tags, like numbers for the size of an array</span> +<span id="L348" class="LineNr">348 </span> value = <span class="Constant">0</span><span class="Delimiter">;</span> +<span id="L349" class="LineNr">349 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">-></span>value == <span class="Constant">"->"</span><span class="Delimiter">)</span> <span class="Comment">// used in recipe types</span> +<span id="L350" class="LineNr">350 </span> value = <span class="Constant">0</span><span class="Delimiter">;</span> +<span id="L351" class="LineNr">351 </span> <span class="Normal">else</span> +<span id="L352" class="LineNr">352 </span> value = -<span class="Constant">1</span><span class="Delimiter">;</span> <span class="Comment">// should never happen; will trigger errors later</span> +<span id="L353" class="LineNr">353 </span> <span class="Identifier">return</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>type_name<span class="Delimiter">,</span> value<span class="Delimiter">);</span> <span id="L354" class="LineNr">354 </span> <span class="Delimiter">}</span> <span id="L355" class="LineNr">355 </span> <span class="Identifier">return</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>properties<span class="Delimiter">-></span>left<span class="Delimiter">),</span> -<span id="L356" class="LineNr">356 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>properties<span class="Delimiter">-></span>right<span class="Delimiter">));</span> +<span id="L356" class="LineNr">356 </span> <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>properties<span class="Delimiter">-></span>right<span class="Delimiter">));</span> <span id="L357" class="LineNr">357 </span><span class="Delimiter">}</span> <span id="L358" class="LineNr">358 </span> <span id="L359" class="LineNr">359 </span><span class="Comment">//: avoid memory leaks for the type tree</span> @@ -428,7 +427,7 @@ if ('onhashchange' in window) { <span id="L364" class="LineNr">364 </span> value = other<span class="Delimiter">.</span>value<span class="Delimiter">;</span> <span id="L365" class="LineNr">365 </span> initialized = other<span class="Delimiter">.</span>initialized<span class="Delimiter">;</span> <span id="L366" class="LineNr">366 </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#L141'>SIZE</a><span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L367" class="LineNr">367 </span> <span class="Conceal">¦</span> properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair<string<span class="Delimiter">,</span> string_tree*><span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first<span class="Delimiter">,</span> copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)));</span> +<span id="L367" class="LineNr">367 </span> properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair<string<span class="Delimiter">,</span> string_tree*><span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first<span class="Delimiter">,</span> copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)));</span> <span id="L368" class="LineNr">368 </span> <span class="Delimiter">}</span> <span id="L369" class="LineNr">369 </span> type = copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span>type<span class="Delimiter">);</span> <span id="L370" class="LineNr">370 </span> <span class="Comment">// End reagent Copy Constructor</span> @@ -456,9 +455,9 @@ if ('onhashchange' in window) { <span id="L392" class="LineNr">392 </span><span class="Normal">bool</span> type_tree::<span class="Normal">operator</span>==<span class="Delimiter">(</span><span class="Normal">const</span> type_tree& other<span class="Delimiter">)</span> <span class="Normal">const</span> <span class="Delimiter">{</span> <span id="L393" class="LineNr">393 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>atom != other<span class="Delimiter">.</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L394" class="LineNr">394 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>atom<span class="Delimiter">)</span> -<span id="L395" class="LineNr">395 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span> name == other<span class="Delimiter">.</span>name && value == other<span class="Delimiter">.</span>value<span class="Delimiter">;</span> +<span id="L395" class="LineNr">395 </span> <span class="Identifier">return</span> name == other<span class="Delimiter">.</span>name && value == other<span class="Delimiter">.</span>value<span class="Delimiter">;</span> <span id="L396" class="LineNr">396 </span> <span class="Identifier">return</span> <span class="Delimiter">(</span>left == other<span class="Delimiter">.</span>left || *left == *other<span class="Delimiter">.</span>left<span class="Delimiter">)</span> -<span id="L397" class="LineNr">397 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> && <span class="Delimiter">(</span>right == other<span class="Delimiter">.</span>right || *right == *other<span class="Delimiter">.</span>right<span class="Delimiter">);</span> +<span id="L397" class="LineNr">397 </span> && <span class="Delimiter">(</span>right == other<span class="Delimiter">.</span>right || *right == *other<span class="Delimiter">.</span>right<span class="Delimiter">);</span> <span id="L398" class="LineNr">398 </span><span class="Delimiter">}</span> <span id="L399" class="LineNr">399 </span> <span id="L400" class="LineNr">400 </span><span class="Comment">// only constraint we care about: if a < b then !(b < a)</span> @@ -476,8 +475,8 @@ if ('onhashchange' in window) { <span id="L412" class="LineNr">412 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>right == other<span class="Delimiter">.</span>right || *right == *other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> <span class="Identifier">return</span> left && *left < *other<span class="Delimiter">.</span>left<span class="Delimiter">;</span> <span id="L413" class="LineNr">413 </span> <span class="Comment">// if the two sides criss-cross, pick the side with the smaller lhs</span> <span id="L414" class="LineNr">414 </span> <span class="Normal">if</span> <span class="Delimiter">((</span>left == other<span class="Delimiter">.</span>right || *left == *other<span class="Delimiter">.</span>right<span class="Delimiter">)</span> -<span id="L415" class="LineNr">415 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> && <span class="Delimiter">(</span>right == other<span class="Delimiter">.</span>left || *right == *other<span class="Delimiter">.</span>left<span class="Delimiter">))</span> -<span id="L416" class="LineNr">416 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span> *left < *other<span class="Delimiter">.</span>left<span class="Delimiter">;</span> +<span id="L415" class="LineNr">415 </span> && <span class="Delimiter">(</span>right == other<span class="Delimiter">.</span>left || *right == *other<span class="Delimiter">.</span>left<span class="Delimiter">))</span> +<span id="L416" class="LineNr">416 </span> <span class="Identifier">return</span> *left < *other<span class="Delimiter">.</span>left<span class="Delimiter">;</span> <span id="L417" class="LineNr">417 </span> <span class="Comment">// now the hard case: both sides are not equal</span> <span id="L418" class="LineNr">418 </span> <span class="Comment">// make sure we stay consistent between (a < b) and (b < a)</span> <span id="L419" class="LineNr">419 </span> <span class="Comment">// just return the side with the smallest of the 4 branches</span> @@ -498,32 +497,32 @@ if ('onhashchange' in window) { <span id="L434" class="LineNr">434 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type < *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span> <span id="L435" class="LineNr">435 </span><span class="Delimiter">}</span> <span id="L436" class="LineNr">436 </span><span class="Normal">void</span> test_compare_atom_with_non_atom<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L437" class="LineNr">437 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L82'>address</a>:number"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:boolean"</span><span class="Delimiter">);</span> +<span id="L437" class="LineNr">437 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L80'>address</a>:number"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:boolean"</span><span class="Delimiter">);</span> <span id="L438" class="LineNr">438 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type < *b<span class="Delimiter">.</span>type<span class="Delimiter">));</span> <span id="L439" class="LineNr">439 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type < *a<span class="Delimiter">.</span>type<span class="Delimiter">);</span> <span id="L440" class="LineNr">440 </span><span class="Delimiter">}</span> <span id="L441" class="LineNr">441 </span><span class="Normal">void</span> test_compare_lists_with_identical_structure<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L442" class="LineNr">442 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L82'>address</a>:address"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:<a href='043space.cc.html#L82'>address</a>:boolean"</span><span class="Delimiter">);</span> +<span id="L442" class="LineNr">442 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L80'>address</a>:address"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:<a href='043space.cc.html#L80'>address</a>:boolean"</span><span class="Delimiter">);</span> <span id="L443" class="LineNr">443 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type < *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span> <span id="L444" class="LineNr">444 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type < *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span> <span id="L445" class="LineNr">445 </span><span class="Delimiter">}</span> <span id="L446" class="LineNr">446 </span><span class="Normal">void</span> test_compare_identical_lists<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L447" class="LineNr">447 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L82'>address</a>:boolean"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:<a href='043space.cc.html#L82'>address</a>:boolean"</span><span class="Delimiter">);</span> +<span id="L447" class="LineNr">447 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L80'>address</a>:boolean"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:<a href='043space.cc.html#L80'>address</a>:boolean"</span><span class="Delimiter">);</span> <span id="L448" class="LineNr">448 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type < *b<span class="Delimiter">.</span>type<span class="Delimiter">));</span> <span id="L449" class="LineNr">449 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type < *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span> <span id="L450" class="LineNr">450 </span><span class="Delimiter">}</span> <span id="L451" class="LineNr">451 </span><span class="Normal">void</span> test_compare_list_with_extra_element<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L452" class="LineNr">452 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L82'>address</a>:address"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:<a href='043space.cc.html#L82'>address</a>:<a href='043space.cc.html#L82'>address</a>:number"</span><span class="Delimiter">);</span> +<span id="L452" class="LineNr">452 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L80'>address</a>:address"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:<a href='043space.cc.html#L80'>address</a>:<a href='043space.cc.html#L80'>address</a>:number"</span><span class="Delimiter">);</span> <span id="L453" class="LineNr">453 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type < *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span> <span id="L454" class="LineNr">454 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type < *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span> <span id="L455" class="LineNr">455 </span><span class="Delimiter">}</span> <span id="L456" class="LineNr">456 </span><span class="Normal">void</span> test_compare_list_with_smaller_left_but_larger_right<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L457" class="LineNr">457 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L82'>address</a>:number"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:character:array"</span><span class="Delimiter">);</span> +<span id="L457" class="LineNr">457 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L80'>address</a>:number"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:character:array"</span><span class="Delimiter">);</span> <span id="L458" class="LineNr">458 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type < *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span> <span id="L459" class="LineNr">459 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type < *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span> <span id="L460" class="LineNr">460 </span><span class="Delimiter">}</span> <span id="L461" class="LineNr">461 </span><span class="Normal">void</span> test_compare_list_with_smaller_left_but_larger_right_identical_types<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L462" class="LineNr">462 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L82'>address</a>:boolean"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:boolean:address"</span><span class="Delimiter">);</span> +<span id="L462" class="LineNr">462 </span> reagent a<span class="Delimiter">(</span><span class="Constant">"a:<a href='043space.cc.html#L80'>address</a>:boolean"</span><span class="Delimiter">),</span> b<span class="Delimiter">(</span><span class="Constant">"b:boolean:address"</span><span class="Delimiter">);</span> <span id="L463" class="LineNr">463 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>*a<span class="Delimiter">.</span>type < *b<span class="Delimiter">.</span>type<span class="Delimiter">);</span> <span id="L464" class="LineNr">464 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!<span class="Delimiter">(</span>*b<span class="Delimiter">.</span>type < *a<span class="Delimiter">.</span>type<span class="Delimiter">));</span> <span id="L465" class="LineNr">465 </span><span class="Delimiter">}</span> @@ -539,10 +538,10 @@ if ('onhashchange' in window) { <span id="L475" class="LineNr">475 </span>reagent& reagent::<span class="Normal">operator</span>=<span class="Delimiter">(</span><span class="Normal">const</span> reagent& other<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L476" class="LineNr">476 </span> original_string = other<span class="Delimiter">.</span>original_string<span class="Delimiter">;</span> <span id="L477" class="LineNr">477 </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#L141'>SIZE</a><span class="Delimiter">(</span>properties<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L478" class="LineNr">478 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)</span> <span class="Normal">delete</span> properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">;</span> +<span id="L478" class="LineNr">478 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)</span> <span class="Normal">delete</span> properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">;</span> <span id="L479" class="LineNr">479 </span> properties<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> <span id="L480" class="LineNr">480 </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#L141'>SIZE</a><span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L481" class="LineNr">481 </span> <span class="Conceal">¦</span> properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair<string<span class="Delimiter">,</span> string_tree*><span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first<span class="Delimiter">,</span> copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)));</span> +<span id="L481" class="LineNr">481 </span> properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair<string<span class="Delimiter">,</span> string_tree*><span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first<span class="Delimiter">,</span> copy<span class="Delimiter">(</span>other<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)));</span> <span id="L482" class="LineNr">482 </span> name = other<span class="Delimiter">.</span>name<span class="Delimiter">;</span> <span id="L483" class="LineNr">483 </span> value = other<span class="Delimiter">.</span>value<span class="Delimiter">;</span> <span id="L484" class="LineNr">484 </span> initialized = other<span class="Delimiter">.</span>initialized<span class="Delimiter">;</span> @@ -558,10 +557,10 @@ if ('onhashchange' in window) { <span id="L494" class="LineNr">494 </span> <span id="L495" class="LineNr">495 </span><span class="Normal">void</span> reagent::<a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L496" class="LineNr">496 </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#L141'>SIZE</a><span class="Delimiter">(</span>properties<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L497" class="LineNr">497 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L498" class="LineNr">498 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">;</span> -<span id="L499" class="LineNr">499 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second = <span class="Constant">NULL</span><span class="Delimiter">;</span> -<span id="L500" class="LineNr">500 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> +<span id="L497" class="LineNr">497 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L498" class="LineNr">498 </span> <span class="Normal">delete</span> properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">;</span> +<span id="L499" class="LineNr">499 </span> properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second = <span class="Constant">NULL</span><span class="Delimiter">;</span> +<span id="L500" class="LineNr">500 </span> <span class="Delimiter">}</span> <span id="L501" class="LineNr">501 </span> <span class="Delimiter">}</span> <span id="L502" class="LineNr">502 </span> <span class="Normal">delete</span> type<span class="Delimiter">;</span> <span id="L503" class="LineNr">503 </span> type = <span class="Constant">NULL</span><span class="Delimiter">;</span> @@ -577,8 +576,8 @@ if ('onhashchange' in window) { <span id="L513" class="LineNr">513 </span> <span id="L514" class="LineNr">514 </span><span class="Normal">void</span> append<span class="Delimiter">(</span>type_tree*& base<span class="Delimiter">,</span> type_tree* extra<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L515" class="LineNr">515 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!base<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L516" class="LineNr">516 </span> <span class="Conceal">¦</span> base = extra<span class="Delimiter">;</span> -<span id="L517" class="LineNr">517 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L516" class="LineNr">516 </span> base = extra<span class="Delimiter">;</span> +<span id="L517" class="LineNr">517 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L518" class="LineNr">518 </span> <span class="Delimiter">}</span> <span id="L519" class="LineNr">519 </span> type_tree* curr = base<span class="Delimiter">;</span> <span id="L520" class="LineNr">520 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-></span>right<span class="Delimiter">)</span> curr = curr<span class="Delimiter">-></span>right<span class="Delimiter">;</span> @@ -587,8 +586,8 @@ if ('onhashchange' in window) { <span id="L523" class="LineNr">523 </span> <span id="L524" class="LineNr">524 </span><span class="Normal">void</span> append<span class="Delimiter">(</span>string_tree*& base<span class="Delimiter">,</span> string_tree* extra<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L525" class="LineNr">525 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!base<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L526" class="LineNr">526 </span> <span class="Conceal">¦</span> base = extra<span class="Delimiter">;</span> -<span id="L527" class="LineNr">527 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L526" class="LineNr">526 </span> base = extra<span class="Delimiter">;</span> +<span id="L527" class="LineNr">527 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L528" class="LineNr">528 </span> <span class="Delimiter">}</span> <span id="L529" class="LineNr">529 </span> string_tree* curr = base<span class="Delimiter">;</span> <span id="L530" class="LineNr">530 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-></span>right<span class="Delimiter">)</span> curr = curr<span class="Delimiter">-></span>right<span class="Delimiter">;</span> @@ -599,26 +598,26 @@ if ('onhashchange' in window) { <span id="L535" class="LineNr">535 </span> ostringstream out<span class="Delimiter">;</span> <span id="L536" class="LineNr">536 </span> <span class="Normal">char</span> c<span class="Delimiter">;</span> <span id="L537" class="LineNr">537 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>in >> c<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L538" class="LineNr">538 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == delim<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L539" class="LineNr">539 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// drop the delim</span> -<span id="L540" class="LineNr">540 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span> -<span id="L541" class="LineNr">541 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> -<span id="L542" class="LineNr">542 </span> <span class="Conceal">¦</span> out << c<span class="Delimiter">;</span> +<span id="L538" class="LineNr">538 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == delim<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L539" class="LineNr">539 </span> <span class="Comment">// drop the delim</span> +<span id="L540" class="LineNr">540 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> +<span id="L541" class="LineNr">541 </span> <span class="Delimiter">}</span> +<span id="L542" class="LineNr">542 </span> out << c<span class="Delimiter">;</span> <span id="L543" class="LineNr">543 </span> <span class="Delimiter">}</span> <span id="L544" class="LineNr">544 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L545" class="LineNr">545 </span><span class="Delimiter">}</span> <span id="L546" class="LineNr">546 </span> <span id="L547" class="LineNr">547 </span><span class="Normal">bool</span> has_property<span class="Delimiter">(</span><span class="Normal">const</span> reagent& x<span class="Delimiter">,</span> <span class="Normal">const</span> string& name<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L548" class="LineNr">548 </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#L141'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L549" class="LineNr">549 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first == name<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> +<span id="L549" class="LineNr">549 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first == name<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> <span id="L550" class="LineNr">550 </span> <span class="Delimiter">}</span> <span id="L551" class="LineNr">551 </span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L552" class="LineNr">552 </span><span class="Delimiter">}</span> <span id="L553" class="LineNr">553 </span> <span id="L554" class="LineNr">554 </span>string_tree* property<span class="Delimiter">(</span><span class="Normal">const</span> reagent& r<span class="Delimiter">,</span> <span class="Normal">const</span> string& name<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L555" class="LineNr">555 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> p = <span class="Constant">0</span><span class="Delimiter">;</span> p != <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">);</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L556" class="LineNr">556 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">).</span>first == name<span class="Delimiter">)</span> -<span id="L557" class="LineNr">557 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">).</span>second<span class="Delimiter">;</span> +<span id="L556" class="LineNr">556 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">).</span>first == name<span class="Delimiter">)</span> +<span id="L557" class="LineNr">557 </span> <span class="Identifier">return</span> r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">).</span>second<span class="Delimiter">;</span> <span id="L558" class="LineNr">558 </span> <span class="Delimiter">}</span> <span id="L559" class="LineNr">559 </span> <span class="Identifier">return</span> <span class="Constant">NULL</span><span class="Delimiter">;</span> <span id="L560" class="LineNr">560 </span><span class="Delimiter">}</span> @@ -638,17 +637,17 @@ if ('onhashchange' in window) { <span id="L574" class="LineNr">574 </span><span class="Delimiter">:(code)</span> <span id="L575" class="LineNr">575 </span><span class="Normal">void</span> skip_whitespace_but_not_newline<span class="Delimiter">(</span>istream& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L576" class="LineNr">576 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L577" class="LineNr">577 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span> -<span id="L578" class="LineNr">578 </span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span> -<span id="L579" class="LineNr">579 </span> <span class="Conceal">¦</span> <span class="Normal">else</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> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> -<span id="L580" class="LineNr">580 </span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Ignore<span class="Delimiter">.</span>find<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> != string::npos<span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> -<span id="L581" class="LineNr">581 </span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span> +<span id="L577" class="LineNr">577 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span> +<span id="L578" class="LineNr">578 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span> +<span id="L579" class="LineNr">579 </span> <span class="Normal">else</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> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> +<span id="L580" class="LineNr">580 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Ignore<span class="Delimiter">.</span>find<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> != string::npos<span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> +<span id="L581" class="LineNr">581 </span> <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L582" class="LineNr">582 </span> <span class="Delimiter">}</span> <span id="L583" class="LineNr">583 </span><span class="Delimiter">}</span> <span id="L584" class="LineNr">584 </span> <span id="L585" class="LineNr">585 </span><span class="Normal">void</span> dump_memory<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L586" class="LineNr">586 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">double</span>>::iterator p = Memory<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Memory<span class="Delimiter">.</span><a href='003trace.cc.html#L203'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L587" class="LineNr">587 </span> <span class="Conceal">¦</span> cout << p<span class="Delimiter">-></span>first << <span class="Constant">": "</span> << no_scientific<span class="Delimiter">(</span>p<span class="Delimiter">-></span>second<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L587" class="LineNr">587 </span> cout << p<span class="Delimiter">-></span>first << <span class="Constant">": "</span> << no_scientific<span class="Delimiter">(</span>p<span class="Delimiter">-></span>second<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L588" class="LineNr">588 </span> <span class="Delimiter">}</span> <span id="L589" class="LineNr">589 </span><span class="Delimiter">}</span> <span id="L590" class="LineNr">590 </span> @@ -662,7 +661,7 @@ if ('onhashchange' in window) { <span id="L598" class="LineNr">598 </span> ostringstream out<span class="Delimiter">;</span> <span id="L599" class="LineNr">599 </span> out << <span class="Constant">"recipe "</span> << r<span class="Delimiter">.</span>name << <span class="Constant">" [</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L600" class="LineNr">600 </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#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L601" class="LineNr">601 </span> <span class="Conceal">¦</span> out << <span class="Constant">" "</span> << <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L601" class="LineNr">601 </span> out << <span class="Constant">" "</span> << <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L602" class="LineNr">602 </span> out << <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L603" class="LineNr">603 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L604" class="LineNr">604 </span><span class="Delimiter">}</span> @@ -671,7 +670,7 @@ if ('onhashchange' in window) { <span id="L607" class="LineNr">607 </span> ostringstream out<span class="Delimiter">;</span> <span id="L608" class="LineNr">608 </span> out << <span class="Constant">"recipe "</span> << r<span class="Delimiter">.</span>name << <span class="Constant">" [</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L609" class="LineNr">609 </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#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L610" class="LineNr">610 </span> <span class="Conceal">¦</span> out << <span class="Constant">" "</span> << to_original_string<span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L610" class="LineNr">610 </span> out << <span class="Constant">" "</span> << to_original_string<span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L611" class="LineNr">611 </span> out << <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L612" class="LineNr">612 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L613" class="LineNr">613 </span><span class="Delimiter">}</span> @@ -681,14 +680,14 @@ if ('onhashchange' in window) { <span id="L617" class="LineNr">617 </span> out << <span class="Constant">"- <a href='010vm.cc.html#L19'>recipe</a> "</span> << x<span class="Delimiter">.</span>name << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L618" class="LineNr">618 </span> <span class="Comment">// Begin debug_string(recipe x)</span> <span id="L619" class="LineNr">619 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> index = <span class="Constant">0</span><span class="Delimiter">;</span> index < <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>steps<span class="Delimiter">);</span> ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L620" class="LineNr">620 </span> <span class="Conceal">¦</span> <span class="Normal">const</span> instruction& inst = x<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span> -<span id="L621" class="LineNr">621 </span> <span class="Conceal">¦</span> out << <span class="Constant">"inst: "</span> << <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L622" class="LineNr">622 </span> <span class="Conceal">¦</span> out << <span class="Constant">" ingredients</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> -<span id="L623" class="LineNr">623 </span> <span class="Conceal">¦</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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L624" class="LineNr">624 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> out << <span class="Constant">" "</span> << debug_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L625" class="LineNr">625 </span> <span class="Conceal">¦</span> out << <span class="Constant">" products</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> -<span id="L626" class="LineNr">626 </span> <span class="Conceal">¦</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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L627" class="LineNr">627 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> out << <span class="Constant">" "</span> << debug_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L620" class="LineNr">620 </span> <span class="Normal">const</span> instruction& inst = x<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span> +<span id="L621" class="LineNr">621 </span> out << <span class="Constant">"inst: "</span> << <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L622" class="LineNr">622 </span> out << <span class="Constant">" ingredients</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L623" class="LineNr">623 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L624" class="LineNr">624 </span> out << <span class="Constant">" "</span> << debug_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L625" class="LineNr">625 </span> out << <span class="Constant">" products</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L626" class="LineNr">626 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L627" class="LineNr">627 </span> out << <span class="Constant">" "</span> << debug_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L628" class="LineNr">628 </span> <span class="Delimiter">}</span> <span id="L629" class="LineNr">629 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L630" class="LineNr">630 </span><span class="Delimiter">}</span> @@ -698,15 +697,15 @@ if ('onhashchange' in window) { <span id="L634" class="LineNr">634 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>original_string<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> inst<span class="Delimiter">.</span>original_string<span class="Delimiter">;</span> <span id="L635" class="LineNr">635 </span> ostringstream out<span class="Delimiter">;</span> <span id="L636" class="LineNr">636 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L637" class="LineNr">637 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">", "</span><span class="Delimiter">;</span> -<span id="L638" class="LineNr">638 </span> <span class="Conceal">¦</span> out << inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span> +<span id="L637" class="LineNr">637 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">", "</span><span class="Delimiter">;</span> +<span id="L638" class="LineNr">638 </span> out << inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span> <span id="L639" class="LineNr">639 </span> <span class="Delimiter">}</span> <span id="L640" class="LineNr">640 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out << <span class="Constant">" <- "</span><span class="Delimiter">;</span> <span id="L641" class="LineNr">641 </span> out << inst<span class="Delimiter">.</span>name<span class="Delimiter">;</span> <span id="L642" class="LineNr">642 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> <span id="L643" class="LineNr">643 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L644" class="LineNr">644 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">", "</span><span class="Delimiter">;</span> -<span id="L645" class="LineNr">645 </span> <span class="Conceal">¦</span> out << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span> +<span id="L644" class="LineNr">644 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">", "</span><span class="Delimiter">;</span> +<span id="L645" class="LineNr">645 </span> out << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span> <span id="L646" class="LineNr">646 </span> <span class="Delimiter">}</span> <span id="L647" class="LineNr">647 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L648" class="LineNr">648 </span><span class="Delimiter">}</span> @@ -715,14 +714,14 @@ if ('onhashchange' in window) { <span id="L651" class="LineNr">651 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">return</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">;</span> <span id="L652" class="LineNr">652 </span> ostringstream out<span class="Delimiter">;</span> <span id="L653" class="LineNr">653 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L654" class="LineNr">654 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">", "</span><span class="Delimiter">;</span> -<span id="L655" class="LineNr">655 </span> <span class="Conceal">¦</span> out << <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> +<span id="L654" class="LineNr">654 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">", "</span><span class="Delimiter">;</span> +<span id="L655" class="LineNr">655 </span> out << <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> <span id="L656" class="LineNr">656 </span> <span class="Delimiter">}</span> <span id="L657" class="LineNr">657 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out << <span class="Constant">" <- "</span><span class="Delimiter">;</span> <span id="L658" class="LineNr">658 </span> out << inst<span class="Delimiter">.</span>name << <span class="Constant">' '</span><span class="Delimiter">;</span> <span id="L659" class="LineNr">659 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L660" class="LineNr">660 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">", "</span><span class="Delimiter">;</span> -<span id="L661" class="LineNr">661 </span> <span class="Conceal">¦</span> out << <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> +<span id="L660" class="LineNr">660 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">", "</span><span class="Delimiter">;</span> +<span id="L661" class="LineNr">661 </span> out << <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> <span id="L662" class="LineNr">662 </span> <span class="Delimiter">}</span> <span id="L663" class="LineNr">663 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L664" class="LineNr">664 </span><span class="Delimiter">}</span> @@ -733,8 +732,8 @@ if ('onhashchange' in window) { <span id="L669" class="LineNr">669 </span> out << <span class="Constant">"{"</span><span class="Delimiter">;</span> <span id="L670" class="LineNr">670 </span> out << r<span class="Delimiter">.</span>name << <span class="Constant">": "</span> << names_to_string<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span> <span id="L671" class="LineNr">671 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L672" class="LineNr">672 </span> <span class="Conceal">¦</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#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L673" class="LineNr">673 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> out << <span class="Constant">", </span><span class="cSpecial">\"</span><span class="Constant">"</span> << r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first << <span class="Constant">"</span><span class="cSpecial">\"</span><span class="Constant">: "</span> << <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">);</span> +<span id="L672" class="LineNr">672 </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#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L673" class="LineNr">673 </span> out << <span class="Constant">", </span><span class="cSpecial">\"</span><span class="Constant">"</span> << r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first << <span class="Constant">"</span><span class="cSpecial">\"</span><span class="Constant">: "</span> << <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">);</span> <span id="L674" class="LineNr">674 </span> <span class="Delimiter">}</span> <span id="L675" class="LineNr">675 </span> out << <span class="Constant">"}"</span><span class="Delimiter">;</span> <span id="L676" class="LineNr">676 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> @@ -761,20 +760,20 @@ if ('onhashchange' in window) { <span id="L697" class="LineNr">697 </span><span class="Normal">void</span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span><span class="Normal">const</span> string_tree* x<span class="Delimiter">,</span> ostream& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L698" class="LineNr">698 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L699" class="LineNr">699 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L700" class="LineNr">700 </span> <span class="Conceal">¦</span> out << <span class="Constant">'"'</span> << x<span class="Delimiter">-></span>value << <span class="Constant">'"'</span><span class="Delimiter">;</span> -<span id="L701" class="LineNr">701 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L700" class="LineNr">700 </span> out << <span class="Constant">'"'</span> << x<span class="Delimiter">-></span>value << <span class="Constant">'"'</span><span class="Delimiter">;</span> +<span id="L701" class="LineNr">701 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L702" class="LineNr">702 </span> <span class="Delimiter">}</span> <span id="L703" class="LineNr">703 </span> out << <span class="Constant">'('</span><span class="Delimiter">;</span> <span id="L704" class="LineNr">704 </span> <span class="Normal">const</span> string_tree* curr = x<span class="Delimiter">;</span> <span id="L705" class="LineNr">705 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr && !curr<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L706" class="LineNr">706 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>curr<span class="Delimiter">-></span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span> -<span id="L707" class="LineNr">707 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-></span>right<span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> -<span id="L708" class="LineNr">708 </span> <span class="Conceal">¦</span> curr = curr<span class="Delimiter">-></span>right<span class="Delimiter">;</span> +<span id="L706" class="LineNr">706 </span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>curr<span class="Delimiter">-></span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span> +<span id="L707" class="LineNr">707 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-></span>right<span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> +<span id="L708" class="LineNr">708 </span> curr = curr<span class="Delimiter">-></span>right<span class="Delimiter">;</span> <span id="L709" class="LineNr">709 </span> <span class="Delimiter">}</span> <span id="L710" class="LineNr">710 </span> <span class="Comment">// check for dotted list; should never happen</span> <span id="L711" class="LineNr">711 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L712" class="LineNr">712 </span> <span class="Conceal">¦</span> out << <span class="Constant">". "</span><span class="Delimiter">;</span> -<span id="L713" class="LineNr">713 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span> +<span id="L712" class="LineNr">712 </span> out << <span class="Constant">". "</span><span class="Delimiter">;</span> +<span id="L713" class="LineNr">713 </span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span> <span id="L714" class="LineNr">714 </span> <span class="Delimiter">}</span> <span id="L715" class="LineNr">715 </span> out << <span class="Constant">')'</span><span class="Delimiter">;</span> <span id="L716" class="LineNr">716 </span><span class="Delimiter">}</span> @@ -789,29 +788,29 @@ if ('onhashchange' in window) { <span id="L725" class="LineNr">725 </span><span class="Normal">void</span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">,</span> ostream& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L726" class="LineNr">726 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L727" class="LineNr">727 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L728" class="LineNr">728 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>x<span class="Delimiter">-></span>value<span class="Delimiter">,</span> out<span class="Delimiter">);</span> -<span id="L729" class="LineNr">729 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L728" class="LineNr">728 </span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>x<span class="Delimiter">-></span>value<span class="Delimiter">,</span> out<span class="Delimiter">);</span> +<span id="L729" class="LineNr">729 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L730" class="LineNr">730 </span> <span class="Delimiter">}</span> <span id="L731" class="LineNr">731 </span> out << <span class="Constant">'('</span><span class="Delimiter">;</span> <span id="L732" class="LineNr">732 </span> <span class="Normal">const</span> type_tree* curr = x<span class="Delimiter">;</span> <span id="L733" class="LineNr">733 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr && !curr<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L734" class="LineNr">734 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>curr<span class="Delimiter">-></span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span> -<span id="L735" class="LineNr">735 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-></span>right<span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> -<span id="L736" class="LineNr">736 </span> <span class="Conceal">¦</span> curr = curr<span class="Delimiter">-></span>right<span class="Delimiter">;</span> +<span id="L734" class="LineNr">734 </span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>curr<span class="Delimiter">-></span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span> +<span id="L735" class="LineNr">735 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-></span>right<span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> +<span id="L736" class="LineNr">736 </span> curr = curr<span class="Delimiter">-></span>right<span class="Delimiter">;</span> <span id="L737" class="LineNr">737 </span> <span class="Delimiter">}</span> <span id="L738" class="LineNr">738 </span> <span class="Comment">// check for dotted list; should never happen</span> <span id="L739" class="LineNr">739 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L740" class="LineNr">740 </span> <span class="Conceal">¦</span> out << <span class="Constant">". "</span><span class="Delimiter">;</span> -<span id="L741" class="LineNr">741 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span> +<span id="L740" class="LineNr">740 </span> out << <span class="Constant">". "</span><span class="Delimiter">;</span> +<span id="L741" class="LineNr">741 </span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span> <span id="L742" class="LineNr">742 </span> <span class="Delimiter">}</span> <span id="L743" class="LineNr">743 </span> out << <span class="Constant">')'</span><span class="Delimiter">;</span> <span id="L744" class="LineNr">744 </span><span class="Delimiter">}</span> <span id="L745" class="LineNr">745 </span> <span id="L746" class="LineNr">746 </span><span class="Normal">void</span> <a href='003trace.cc.html#L120'>dump</a><span class="Delimiter">(</span><a href='010vm.cc.html#L123'>type_ordinal</a> type<span class="Delimiter">,</span> ostream& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L747" class="LineNr">747 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">))</span> -<span id="L748" class="LineNr">748 </span> <span class="Conceal">¦</span> out << get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">).</span>name<span class="Delimiter">;</span> +<span id="L748" class="LineNr">748 </span> out << get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">).</span>name<span class="Delimiter">;</span> <span id="L749" class="LineNr">749 </span> <span class="Normal">else</span> -<span id="L750" class="LineNr">750 </span> <span class="Conceal">¦</span> out << <span class="Constant">"?"</span> << type<span class="Delimiter">;</span> +<span id="L750" class="LineNr">750 </span> out << <span class="Constant">"?"</span> << type<span class="Delimiter">;</span> <span id="L751" class="LineNr">751 </span><span class="Delimiter">}</span> <span id="L752" class="LineNr">752 </span> <span id="L753" class="LineNr">753 </span>string names_to_string<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span> @@ -824,20 +823,20 @@ if ('onhashchange' in window) { <span id="L760" class="LineNr">760 </span><span class="Normal">void</span> dump_names<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">,</span> ostream& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L761" class="LineNr">761 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L762" class="LineNr">762 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L763" class="LineNr">763 </span> <span class="Conceal">¦</span> out << <span class="Constant">'"'</span> << x<span class="Delimiter">-></span>name << <span class="Constant">'"'</span><span class="Delimiter">;</span> -<span id="L764" class="LineNr">764 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L763" class="LineNr">763 </span> out << <span class="Constant">'"'</span> << x<span class="Delimiter">-></span>name << <span class="Constant">'"'</span><span class="Delimiter">;</span> +<span id="L764" class="LineNr">764 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L765" class="LineNr">765 </span> <span class="Delimiter">}</span> <span id="L766" class="LineNr">766 </span> out << <span class="Constant">'('</span><span class="Delimiter">;</span> <span id="L767" class="LineNr">767 </span> <span class="Normal">const</span> type_tree* curr = x<span class="Delimiter">;</span> <span id="L768" class="LineNr">768 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr && !curr<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L769" class="LineNr">769 </span> <span class="Conceal">¦</span> dump_names<span class="Delimiter">(</span>curr<span class="Delimiter">-></span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span> -<span id="L770" class="LineNr">770 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-></span>right<span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> -<span id="L771" class="LineNr">771 </span> <span class="Conceal">¦</span> curr = curr<span class="Delimiter">-></span>right<span class="Delimiter">;</span> +<span id="L769" class="LineNr">769 </span> dump_names<span class="Delimiter">(</span>curr<span class="Delimiter">-></span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span> +<span id="L770" class="LineNr">770 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-></span>right<span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> +<span id="L771" class="LineNr">771 </span> curr = curr<span class="Delimiter">-></span>right<span class="Delimiter">;</span> <span id="L772" class="LineNr">772 </span> <span class="Delimiter">}</span> <span id="L773" class="LineNr">773 </span> <span class="Comment">// check for dotted list; should never happen</span> <span id="L774" class="LineNr">774 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L775" class="LineNr">775 </span> <span class="Conceal">¦</span> out << <span class="Constant">". "</span><span class="Delimiter">;</span> -<span id="L776" class="LineNr">776 </span> <span class="Conceal">¦</span> dump_names<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span> +<span id="L775" class="LineNr">775 </span> out << <span class="Constant">". "</span><span class="Delimiter">;</span> +<span id="L776" class="LineNr">776 </span> dump_names<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span> <span id="L777" class="LineNr">777 </span> <span class="Delimiter">}</span> <span id="L778" class="LineNr">778 </span> out << <span class="Constant">')'</span><span class="Delimiter">;</span> <span id="L779" class="LineNr">779 </span><span class="Delimiter">}</span> @@ -852,28 +851,28 @@ if ('onhashchange' in window) { <span id="L788" class="LineNr">788 </span><span class="Normal">void</span> dump_names_without_quotes<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* x<span class="Delimiter">,</span> ostream& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L789" class="LineNr">789 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L790" class="LineNr">790 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L791" class="LineNr">791 </span> <span class="Conceal">¦</span> out << x<span class="Delimiter">-></span>name<span class="Delimiter">;</span> -<span id="L792" class="LineNr">792 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L791" class="LineNr">791 </span> out << x<span class="Delimiter">-></span>name<span class="Delimiter">;</span> +<span id="L792" class="LineNr">792 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L793" class="LineNr">793 </span> <span class="Delimiter">}</span> <span id="L794" class="LineNr">794 </span> out << <span class="Constant">'('</span><span class="Delimiter">;</span> <span id="L795" class="LineNr">795 </span> <span class="Normal">const</span> type_tree* curr = x<span class="Delimiter">;</span> <span id="L796" class="LineNr">796 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr && !curr<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L797" class="LineNr">797 </span> <span class="Conceal">¦</span> dump_names_without_quotes<span class="Delimiter">(</span>curr<span class="Delimiter">-></span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span> -<span id="L798" class="LineNr">798 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-></span>right<span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> -<span id="L799" class="LineNr">799 </span> <span class="Conceal">¦</span> curr = curr<span class="Delimiter">-></span>right<span class="Delimiter">;</span> +<span id="L797" class="LineNr">797 </span> dump_names_without_quotes<span class="Delimiter">(</span>curr<span class="Delimiter">-></span>left<span class="Delimiter">,</span> out<span class="Delimiter">);</span> +<span id="L798" class="LineNr">798 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">-></span>right<span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> +<span id="L799" class="LineNr">799 </span> curr = curr<span class="Delimiter">-></span>right<span class="Delimiter">;</span> <span id="L800" class="LineNr">800 </span> <span class="Delimiter">}</span> <span id="L801" class="LineNr">801 </span> <span class="Comment">// check for dotted list; should never happen</span> <span id="L802" class="LineNr">802 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L803" class="LineNr">803 </span> <span class="Conceal">¦</span> out << <span class="Constant">". "</span><span class="Delimiter">;</span> -<span id="L804" class="LineNr">804 </span> <span class="Conceal">¦</span> dump_names_without_quotes<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span> +<span id="L803" class="LineNr">803 </span> out << <span class="Constant">". "</span><span class="Delimiter">;</span> +<span id="L804" class="LineNr">804 </span> dump_names_without_quotes<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> out<span class="Delimiter">);</span> <span id="L805" class="LineNr">805 </span> <span class="Delimiter">}</span> <span id="L806" class="LineNr">806 </span> out << <span class="Constant">')'</span><span class="Delimiter">;</span> <span id="L807" class="LineNr">807 </span><span class="Delimiter">}</span> <span id="L808" class="LineNr">808 </span> <span id="L809" class="LineNr">809 </span><span class="Normal">bool</span> is_integer<span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L810" class="LineNr">810 </span> <span class="Identifier">return</span> s<span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">"0123456789-"</span><span class="Delimiter">)</span> == string::npos <span class="Comment">// no other characters</span> -<span id="L811" class="LineNr">811 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> && s<span class="Delimiter">.</span>find_first_of<span class="Delimiter">(</span><span class="Constant">"0123456789"</span><span class="Delimiter">)</span> != string::npos <span class="Comment">// at least one digit</span> -<span id="L812" class="LineNr">812 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> && s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'-'</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">)</span> == string::npos<span class="Delimiter">;</span> <span class="Comment">// '-' only at first position</span> +<span id="L811" class="LineNr">811 </span> && s<span class="Delimiter">.</span>find_first_of<span class="Delimiter">(</span><span class="Constant">"0123456789"</span><span class="Delimiter">)</span> != string::npos <span class="Comment">// at least one digit</span> +<span id="L812" class="LineNr">812 </span> && s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'-'</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">)</span> == string::npos<span class="Delimiter">;</span> <span class="Comment">// '-' only at first position</span> <span id="L813" class="LineNr">813 </span><span class="Delimiter">}</span> <span id="L814" class="LineNr">814 </span> <span id="L815" class="LineNr">815 </span><span class="Normal">int</span> to_integer<span class="Delimiter">(</span>string n<span class="Delimiter">)</span> <span class="Delimiter">{</span> @@ -906,9 +905,9 @@ if ('onhashchange' in window) { <span id="L842" class="LineNr">842 </span><span class="Delimiter">:(code)</span> <span id="L843" class="LineNr">843 </span>ostream& <span class="Normal">operator</span><<<span class="Delimiter">(</span>ostream& os<span class="Delimiter">,</span> no_scientific x<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L844" class="LineNr">844 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!isfinite<span class="Delimiter">(</span>x<span class="Delimiter">.</span>x<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L845" class="LineNr">845 </span> <span class="Conceal">¦</span> <span class="Comment">// Infinity or NaN</span> -<span id="L846" class="LineNr">846 </span> <span class="Conceal">¦</span> os << x<span class="Delimiter">.</span>x<span class="Delimiter">;</span> -<span id="L847" class="LineNr">847 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span> os<span class="Delimiter">;</span> +<span id="L845" class="LineNr">845 </span> <span class="Comment">// Infinity or NaN</span> +<span id="L846" class="LineNr">846 </span> os << x<span class="Delimiter">.</span>x<span class="Delimiter">;</span> +<span id="L847" class="LineNr">847 </span> <span class="Identifier">return</span> os<span class="Delimiter">;</span> <span id="L848" class="LineNr">848 </span> <span class="Delimiter">}</span> <span id="L849" class="LineNr">849 </span> ostringstream tmp<span class="Delimiter">;</span> <span id="L850" class="LineNr">850 </span> <span class="Comment">// more accurate, but too slow</span> @@ -923,8 +922,8 @@ if ('onhashchange' in window) { <span id="L859" class="LineNr">859 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'.'</span><span class="Delimiter">)</span> == string::npos<span class="Delimiter">)</span> <span class="Identifier">return</span> in<span class="Delimiter">;</span> <span id="L860" class="LineNr">860 </span> <span class="Normal">int</span> length = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L861" class="LineNr">861 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>length > <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L862" class="LineNr">862 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>length-<span class="Constant">1</span><span class="Delimiter">)</span> != <span class="Constant">'0'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span> -<span id="L863" class="LineNr">863 </span> <span class="Conceal">¦</span> --length<span class="Delimiter">;</span> +<span id="L862" class="LineNr">862 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>length-<span class="Constant">1</span><span class="Delimiter">)</span> != <span class="Constant">'0'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span> +<span id="L863" class="LineNr">863 </span> --length<span class="Delimiter">;</span> <span id="L864" class="LineNr">864 </span> <span class="Delimiter">}</span> <span id="L865" class="LineNr">865 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>length-<span class="Constant">1</span><span class="Delimiter">)</span> == <span class="Constant">'.'</span><span class="Delimiter">)</span> --length<span class="Delimiter">;</span> <span id="L866" class="LineNr">866 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>length == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">"0"</span><span class="Delimiter">;</span> |