diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html
index 43a9bd49..ac47b8a0 100644
--- a/html/050scenario.cc.html
+++ b/html/050scenario.cc.html
@@ -102,7 +102,7 @@ if ('onhashchange' in window) {
<span id="L37" class="LineNr"> 37 </span><span class="muScenario"><a href='050scenario.cc.html#L57'>scenario</a></span> foo [
<span id="L38" class="LineNr"> 38 </span> run [
<span id="L39" class="LineNr"> 39 </span> <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">13</span>
-<span id="L40" class="LineNr"> 40 </span> <a href='003trace.cc.html#L169'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [a b c]
+<span id="L40" class="LineNr"> 40 </span> <a href='003trace.cc.html#L161'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [a b c]
<span id="L41" class="LineNr"> 41 </span> ]
<span id="L42" class="LineNr"> 42 </span> memory-should-contain [
<span id="L43" class="LineNr"> 43 </span> <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">13</span>
@@ -157,16 +157,16 @@ if ('onhashchange' in window) {
<span id="L92" class="LineNr"> 92 </span> <a href='050scenario.cc.html#L57'>scenario</a> result<span class="Delimiter">;</span>
<span id="L93" class="LineNr"> 93 </span> result<span class="Delimiter">.</span>name = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
<span id="L94" class="LineNr"> 94 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Scenario_names<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">))</span>
-<span id="L95" class="LineNr"> 95 </span> <a href='003trace.cc.html#L176'>raise</a> << <span class="Constant">"duplicate <a href='050scenario.cc.html#L57'>scenario</a> name: '"</span> << result<span class="Delimiter">.</span>name << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L193'>end</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </span> <a href='003trace.cc.html#L168'>raise</a> << <span class="Constant">"duplicate <a href='050scenario.cc.html#L57'>scenario</a> name: '"</span> << result<span class="Delimiter">.</span>name << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span>
<span id="L96" class="LineNr"> 96 </span> Scenario_names<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
<span id="L97" class="LineNr"> 97 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
<span id="L98" class="LineNr"> 98 </span> assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L99" class="LineNr"> 99 </span> <a href='003trace.cc.html#L176'>raise</a> << <span class="Constant">"incomplete <a href='050scenario.cc.html#L57'>scenario</a> at <a href='003trace.cc.html#L193'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L193'>end</a><span class="Delimiter">();</span>
+<span id="L99" class="LineNr"> 99 </span> <a href='003trace.cc.html#L168'>raise</a> << <span class="Constant">"incomplete <a href='050scenario.cc.html#L57'>scenario</a> at <a href='003trace.cc.html#L185'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span>
<span id="L100" class="LineNr">100 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span>
<span id="L101" class="LineNr">101 </span> <span class="Delimiter">}</span>
<span id="L102" class="LineNr">102 </span> <a href='011load.cc.html#L209'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
<span id="L103" class="LineNr">103 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L104" class="LineNr">104 </span> <a href='003trace.cc.html#L176'>raise</a> << <span class="Constant">"Expected '[' after <a href='050scenario.cc.html#L57'>scenario</a> '"</span> << result<span class="Delimiter">.</span>name << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L193'>end</a><span class="Delimiter">();</span>
+<span id="L104" class="LineNr">104 </span> <a href='003trace.cc.html#L168'>raise</a> << <span class="Constant">"Expected '[' after <a href='050scenario.cc.html#L57'>scenario</a> '"</span> << result<span class="Delimiter">.</span>name << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span>
<span id="L105" class="LineNr">105 </span> exit<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
<span id="L106" class="LineNr">106 </span> <span class="Delimiter">}</span>
<span id="L107" class="LineNr">107 </span> <span class="Comment">// scenarios are take special 'code' strings so we need to ignore brackets</span>
@@ -174,13 +174,13 @@ if ('onhashchange' in window) {
<span id="L109" class="LineNr">109 </span> result<span class="Delimiter">.</span>to_run = <a href='014literal_string.cc.html#L33'>slurp_quoted</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
<span id="L110" class="LineNr">110 </span> <span class="Comment">// delete [] delimiters</span>
<span id="L111" class="LineNr">111 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>result<span class="Delimiter">.</span>to_run<span class="Delimiter">,</span> <span class="Constant">"["</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L112" class="LineNr">112 </span> <a href='003trace.cc.html#L176'>raise</a> << <span class="Constant">"scenario "</span> << result<span class="Delimiter">.</span>name << <span class="Constant">" should start with '['</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L193'>end</a><span class="Delimiter">();</span>
+<span id="L112" class="LineNr">112 </span> <a href='003trace.cc.html#L168'>raise</a> << <span class="Constant">"scenario "</span> << result<span class="Delimiter">.</span>name << <span class="Constant">" should start with '['</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span>
<span id="L113" class="LineNr">113 </span> result<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
<span id="L114" class="LineNr">114 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span>
<span id="L115" class="LineNr">115 </span> <span class="Delimiter">}</span>
<span id="L116" class="LineNr">116 </span> result<span class="Delimiter">.</span>to_run<span class="Delimiter">.</span>erase<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
<span id="L117" class="LineNr">117 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>to_run<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>to_run<span class="Delimiter">)</span>-<span class="Constant">1</span><span class="Delimiter">)</span> != <span class="Constant">']'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L118" class="LineNr">118 </span> <a href='003trace.cc.html#L176'>raise</a> << <span class="Constant">"scenario "</span> << result<span class="Delimiter">.</span>name << <span class="Constant">" has an unbalanced '['</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L193'>end</a><span class="Delimiter">();</span>
+<span id="L118" class="LineNr">118 </span> <a href='003trace.cc.html#L168'>raise</a> << <span class="Constant">"scenario "</span> << result<span class="Delimiter">.</span>name << <span class="Constant">" has an unbalanced '['</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span>
<span id="L119" class="LineNr">119 </span> result<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
<span id="L120" class="LineNr">120 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span>
<span id="L121" class="LineNr">121 </span> <span class="Delimiter">}</span>
@@ -291,13 +291,13 @@ if ('onhashchange' in window) {
<span id="L226" class="LineNr">226 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!trace_contains_errors<span class="Delimiter">())</span>
<span id="L227" class="LineNr">227 </span> run<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>front<span class="Delimiter">());</span>
<span id="L228" class="LineNr">228 </span> <span class="Comment">// End Mu Test Teardown</span>
-<span id="L229" class="LineNr">229 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors && <a href='003trace.cc.html#L188'>trace_contains_errors</a><span class="Delimiter">()</span> && !Scenario_testing_scenario<span class="Delimiter">)</span>
+<span id="L229" class="LineNr">229 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors && <a href='003trace.cc.html#L180'>trace_contains_errors</a><span class="Delimiter">()</span> && !Scenario_testing_scenario<span class="Delimiter">)</span>
<span id="L230" class="LineNr">230 </span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
<span id="L231" class="LineNr">231 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>not_already_inside_test && Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
<span id="L232" class="LineNr">232 </span> <a href='000organization.cc.html#L138'>teardown</a><span class="Delimiter">();</span>
<span id="L233" class="LineNr">233 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> <span class="Delimiter">{</span>
<span id="L234" class="LineNr">234 </span> ofstream fout<span class="Delimiter">(</span><span class="Constant">"last_trace"</span><span class="Delimiter">);</span>
-<span id="L235" class="LineNr">235 </span> fout << Trace_stream<span class="Delimiter">-></span><a href='003trace.cc.html#L151'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span>
+<span id="L235" class="LineNr">235 </span> fout << Trace_stream<span class="Delimiter">-></span><a href='003trace.cc.html#L143'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span>
<span id="L236" class="LineNr">236 </span> fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
<span id="L237" class="LineNr">237 </span> <span class="Delimiter">}</span>
<span id="L238" class="LineNr">238 </span> <span class="Normal">delete</span> Trace_stream<span class="Delimiter">;</span>
@@ -350,7 +350,7 @@ if ('onhashchange' in window) {
<span id="L285" class="LineNr">285 </span> bind_special_scenario_names<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
<span id="L286" class="LineNr">286 </span> <a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span>
<span id="L287" class="LineNr">287 </span> run<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L288" class="LineNr">288 </span> <a href='003trace.cc.html#L229'>CHECK_TRACE_DOESNT_CONTAIN_ERRORS</a><span class="Delimiter">();</span>
+<span id="L288" class="LineNr">288 </span> <a href='003trace.cc.html#L221'>CHECK_TRACE_DOESNT_CONTAIN_ERRORS</a><span class="Delimiter">();</span>
<span id="L289" class="LineNr">289 </span><span class="Delimiter">}</span>
<span id="L290" class="LineNr">290 </span>
<span id="L291" class="LineNr">291 </span><span class="Comment">//: Watch out for redefinitions of scenario routines. We should never ever be</span>
@@ -467,7 +467,7 @@ if ('onhashchange' in window) {
<span id="L402" class="LineNr">402 </span> string lhs = <a href='011load.cc.html#L167'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
<span id="L403" class="LineNr">403 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>lhs<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
<span id="L404" class="LineNr">404 </span> assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L405" class="LineNr">405 </span> <a href='003trace.cc.html#L176'>raise</a> << <span class="Constant">"incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L193'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L193'>end</a><span class="Delimiter">();</span>
+<span id="L405" class="LineNr">405 </span> <a href='003trace.cc.html#L168'>raise</a> << <span class="Constant">"incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L185'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span>
<span id="L406" class="LineNr">406 </span> <span class="Identifier">return</span><span class="Delimiter">;</span>
<span id="L407" class="LineNr">407 </span> <span class="Delimiter">}</span>
<span id="L408" class="LineNr">408 </span> <span class="Norm# tests for 'scenario' in previous layer
scenario first_scenario_in_mu [
run [
10:num <- add 2, 2
]
memory-should-contain [
10 <- 4
]
]
scenario scenario_with_comment_in_mu [
run [
# comment
10:num <- add 2, 2
]
memory-should-contain [
10 <- 4
]
]
scenario scenario_with_multiple_comments_in_mu [
run [
# comment1
# comment2
10:num <- add 2, 2
]
memory-should-contain [
10 <- 4
]
]
scenario check_text_in_memory [
run [
10:num <- copy 3
11:char <- copy 97 # 'a'
12:char <- copy 98 # 'b'
13:char <- copy 99 # 'c'
]
memory-should-contain [
10:array:character <- [abc]
]
]
scenario check_trace [
run [
10:num <- add 2, 2
]
trace-should-contain [
mem: storing 4 in location 10
]
]
scenario check_trace_negative [
run [
10:num <- add 2, 2
]
trace-should-not-contain [
mem: storing 3 in location 10
]
]
scenario check_trace_instruction [
run [
trace 1, [foo], [aaa]
]
trace-should-contain [
foo: aaa
]
]
|