diff options
Diffstat (limited to 'html')
96 files changed, 4653 insertions, 4597 deletions
diff --git a/html/014literal_string.cc.html b/html/014literal_string.cc.html index bb6eba51..10456661 100644 --- a/html/014literal_string.cc.html +++ b/html/014literal_string.cc.html @@ -153,11 +153,11 @@ string slurp_quoted<span class="Delimiter">(</span>istream& in<span class="D <span class="Comment">//: more friendly to trace().</span> <span class="Delimiter">:(after "string to_string(const reagent& r)")</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_string<span class="Delimiter">(</span>r<span class="Delimiter">))</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_text<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span> emit_literal_string<span class="Delimiter">(</span>r<span class="Delimiter">.</span>name<span class="Delimiter">);</span> <span class="Delimiter">:(code)</span> -<span class="Normal">bool</span> is_literal_string<span class="Delimiter">(</span><span class="Normal">const</span> reagent& x<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span class="Normal">bool</span> is_literal_text<span class="Delimiter">(</span><span class="Normal">const</span> reagent& x<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Identifier">return</span> x<span class="Delimiter">.</span>type && x<span class="Delimiter">.</span>type<span class="Delimiter">-></span>name == <span class="Constant">"literal-string"</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> diff --git a/html/018type_abbreviations.cc.html b/html/018type_abbreviations.cc.html index a025de1d..abb190c1 100644 --- a/html/018type_abbreviations.cc.html +++ b/html/018type_abbreviations.cc.html @@ -177,11 +177,11 @@ def main [ <span class="Delimiter">:(scenario abbreviations_for_address_and_array)</span> def main [ - f <span class="Constant">1</span>:&:number <span class="Comment"># abbreviation for 'address:number'</span> - f <span class="Constant">2</span>:@:number <span class="Comment"># abbreviation for 'array:number'</span> - f <span class="Constant">3</span>:&:@:number <span class="Comment"># combining '&' and '@'</span> - f <span class="Constant">4</span>:&:&:@:&:@:number <span class="Comment"># ..any number of times</span> - f <span class="Delimiter">{</span><span class="Constant">5</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>& number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span> <span class="Comment"># support for dilated reagents and more complex parse trees</span> + f <span class="Constant">1</span>:&:num <span class="Comment"># abbreviation for 'address:number'</span> + f <span class="Constant">2</span>:@:num <span class="Comment"># abbreviation for 'array:number'</span> + f <span class="Constant">3</span>:&:@:num <span class="Comment"># combining '&' and '@'</span> + f <span class="Constant">4</span>:&:&:@:&:@:num <span class="Comment"># ..any number of times</span> + f <span class="Delimiter">{</span><span class="Constant">5</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>& num<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span> <span class="Comment"># support for dilated reagents and more complex parse trees</span> ] def f [ ] @@ -199,7 +199,10 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(code)</span> <span class="Normal">void</span> expand_type_abbreviations<span class="Delimiter">(</span><span class="Normal">const</span> recipe_ordinal r<span class="Delimiter">)</span> <span class="Delimiter">{</span> - <span class="Normal">const</span> recipe& caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span> + expand_type_abbreviations<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span> +<span class="Delimiter">}</span> + +<span class="Normal">void</span> expand_type_abbreviations<span class="Delimiter">(</span><span class="Normal">const</span> recipe& caller<span class="Delimiter">)</span> <span class="Delimiter">{</span> trace<span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"--- expand type abbreviations in recipe '"</span> << caller<span class="Delimiter">.</span>name << <span class="Constant">"'"</span> << end<span class="Delimiter">();</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 < SIZE<span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Normal">const</span> instruction& inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> diff --git a/html/020run.cc.html b/html/020run.cc.html index 08909f94..fca868e8 100644 --- a/html/020run.cc.html +++ b/html/020run.cc.html @@ -49,15 +49,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario copy_literal)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">23</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">23</span> ] <span class="traceContains">+run: {1: "number"} <- copy {23: "literal"}</span> <span class="traceContains">+mem: storing 23 in location 1</span> <span class="Delimiter">:(scenario copy)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">23</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">23</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:num ] <span class="traceContains">+run: {2: "number"} <- copy {1: "number"}</span> <span class="traceContains">+mem: location 1 is 23</span> @@ -65,7 +65,7 @@ def main [ <span class="Delimiter">:(scenario copy_multiple)</span> def main [ - <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">24</span> + <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">24</span> ] <span class="traceContains">+mem: storing 23 in location 1</span> <span class="traceContains">+mem: storing 24 in location 2</span> @@ -403,8 +403,8 @@ vector<<span class="Normal">double</span>> read_memory<span class="Delimit <span class="Delimiter">:(scenario run_label)</span> def main [ +foo - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">23</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">23</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:num ] <span class="traceContains">+run: {1: "number"} <- copy {23: "literal"}</span> <span class="traceContains">+run: {2: "number"} <- copy {1: "number"}</span> @@ -419,7 +419,7 @@ def main [ <span class="Delimiter">:(scenario write_to_0_disallowed)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">0</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">0</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> ] <span class="traceAbsent">-mem: storing 34 in location 0</span> @@ -428,25 +428,25 @@ def main [ <span class="Delimiter">:(scenario comma_without_space)</span> def main [ - <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">2</span><span class="Delimiter">,</span><span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">2</span><span class="Delimiter">,</span><span class="Constant">2</span> ] <span class="traceContains">+mem: storing 2 in location 1</span> <span class="Delimiter">:(scenario space_without_comma)</span> def main [ - <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">2</span> <span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">2</span> <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 2 in location 1</span> <span class="Delimiter">:(scenario comma_before_space)</span> def main [ - <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 2 in location 1</span> <span class="Delimiter">:(scenario comma_after_space)</span> def main [ - <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">2</span> <span class="Delimiter">,</span><span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">2</span> <span class="Delimiter">,</span><span class="Constant">2</span> ] <span class="traceContains">+mem: storing 2 in location 1</span> </pre> diff --git a/html/021check_instruction.cc.html b/html/021check_instruction.cc.html index 801c60f6..111355b4 100644 --- a/html/021check_instruction.cc.html +++ b/html/021check_instruction.cc.html @@ -80,51 +80,51 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenario copy_checks_reagent_count)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> ] -<span class="traceContains">+error: main: ingredients and products should match in '1:number <- copy 34, 35'</span> +<span class="traceContains">+error: main: ingredients and products should match in '1:num <- copy 34, 35'</span> <span class="Delimiter">:(scenario write_scalar_to_array_disallowed)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:array:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">1</span>:array:num<span class="Special"> <- </span>copy <span class="Constant">34</span> ] -<span class="traceContains">+error: main: can't copy '34' to '1:array:number'; types don't match</span> +<span class="traceContains">+error: main: can't copy '34' to '1:array:num'; types don't match</span> <span class="Delimiter">:(scenario write_scalar_to_array_disallowed_2)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:array:number<span class="Special"> <- </span>copy <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> + <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:array:num<span class="Special"> <- </span>copy <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> ] -<span class="traceContains">+error: main: can't copy '35' to '2:array:number'; types don't match</span> +<span class="traceContains">+error: main: can't copy '35' to '2:array:num'; types don't match</span> <span class="Delimiter">:(scenario write_scalar_to_address_disallowed)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">34</span> ] -<span class="traceContains">+error: main: can't copy '34' to '1:address:number'; types don't match</span> +<span class="traceContains">+error: main: can't copy '34' to '1:address:num'; types don't match</span> <span class="Delimiter">:(scenario write_address_to_number_allowed)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">12</span>/unsafe - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:number + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">12</span>/unsafe + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:num ] <span class="traceContains">+mem: storing 12 in location 2</span> $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario write_boolean_to_number_allowed)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">1</span>/<span class="Constant">true</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:boolean + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">1</span>/<span class="Constant">true</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:<span class="Normal">bool</span> ] <span class="traceContains">+mem: storing 1 in location 2</span> $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario write_number_to_boolean_allowed)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">1</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">1</span>:num ] <span class="traceContains">+mem: storing 34 in location 2</span> $error: <span class="Constant">0</span> @@ -196,6 +196,8 @@ $error: <span class="Constant">0</span> CHECK<span class="Delimiter">(</span>types_strictly_match<span class="Delimiter">(</span>a<span class="Delimiter">,</span> b<span class="Delimiter">));</span> <span class="Delimiter">}</span> +<span class="Comment">//: helpers</span> + <span class="Normal">bool</span> is_unsafe<span class="Delimiter">(</span><span class="Normal">const</span> reagent& r<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Identifier">return</span> has_property<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">"unsafe"</span><span class="Delimiter">);</span> <span class="Delimiter">}</span> @@ -204,7 +206,6 @@ $error: <span class="Constant">0</span> <span class="Comment">// End Preprocess is_mu_array(reagent r)</span> <span class="Identifier">return</span> is_mu_array<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span> <span class="Delimiter">}</span> - <span class="Normal">bool</span> is_mu_array<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>type<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> @@ -217,7 +218,6 @@ $error: <span class="Constant">0</span> <span class="Comment">// End Preprocess is_mu_address(reagent r)</span> <span class="Identifier">return</span> is_mu_address<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span> <span class="Delimiter">}</span> - <span class="Normal">bool</span> is_mu_address<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>type<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> @@ -260,7 +260,6 @@ $error: <span class="Constant">0</span> <span class="Normal">bool</span> is_mu_scalar<span class="Delimiter">(</span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Identifier">return</span> is_mu_scalar<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span> <span class="Delimiter">}</span> - <span class="Normal">bool</span> is_mu_scalar<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>type<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> diff --git a/html/022arithmetic.cc.html b/html/022arithmetic.cc.html index 728eef67..476f505a 100644 --- a/html/022arithmetic.cc.html +++ b/html/022arithmetic.cc.html @@ -71,37 +71,37 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario add_literal)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">34</span> ] <span class="traceContains">+mem: storing 57 in location 1</span> <span class="Delimiter">:(scenario add)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">23</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">23</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 57 in location 3</span> <span class="Delimiter">:(scenario add_multiple)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">5</span> ] <span class="traceContains">+mem: storing 12 in location 1</span> <span class="Delimiter">:(scenario add_checks_type)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">2</span>:boolean<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">2</span>:<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Constant">1</span> ] -<span class="traceContains">+error: main: 'add' requires number ingredients, but got '2:boolean'</span> +<span class="traceContains">+error: main: 'add' requires number ingredients, but got '2:bool'</span> <span class="Delimiter">:(scenario add_checks_return_type)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] -<span class="traceContains">+error: main: 'add' should yield a number, but got '1:address:number'</span> +<span class="traceContains">+error: main: 'add' should yield a number, but got '1:address:num'</span> <span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> SUBTRACT<span class="Delimiter">,</span> @@ -146,21 +146,21 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario subtract_literal)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>subtract <span class="Constant">5</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>subtract <span class="Constant">5</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 3 in location 1</span> <span class="Delimiter">:(scenario subtract)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">23</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>subtract <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">23</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>subtract <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing -11 in location 3</span> <span class="Delimiter">:(scenario subtract_multiple)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>subtract <span class="Constant">6</span><span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>subtract <span class="Constant">6</span><span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> @@ -199,21 +199,21 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario multiply_literal)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>multiply <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">3</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>multiply <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">3</span> ] <span class="traceContains">+mem: storing 6 in location 1</span> <span class="Delimiter">:(scenario multiply)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">4</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">6</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>multiply <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">4</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">6</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>multiply <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 24 in location 3</span> <span class="Delimiter">:(scenario multiply_multiple)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>multiply <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>multiply <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span> ] <span class="traceContains">+mem: storing 24 in location 1</span> @@ -255,21 +255,21 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario divide_literal)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>divide <span class="Constant">8</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>divide <span class="Constant">8</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 4 in location 1</span> <span class="Delimiter">:(scenario divide)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">27</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>divide <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">27</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>divide <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 9 in location 3</span> <span class="Delimiter">:(scenario divide_multiple)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>divide <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>divide <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 2 in location 1</span> @@ -323,39 +323,39 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario divide_with_remainder_literal)</span> def main [ - <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number<span class="Special"> <- </span>divide-with-remainder <span class="Constant">9</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> <- </span>divide-with-remainder <span class="Constant">9</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 4 in location 1</span> <span class="traceContains">+mem: storing 1 in location 2</span> <span class="Delimiter">:(scenario divide_with_remainder)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">27</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">11</span> - <span class="Constant">3</span>:number<span class="Delimiter">,</span> <span class="Constant">4</span>:number<span class="Special"> <- </span>divide-with-remainder <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">27</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">11</span> + <span class="Constant">3</span>:num<span class="Delimiter">,</span> <span class="Constant">4</span>:num<span class="Special"> <- </span>divide-with-remainder <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 2 in location 3</span> <span class="traceContains">+mem: storing 5 in location 4</span> <span class="Delimiter">:(scenario divide_with_decimal_point)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>divide <span class="Constant">5</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>divide <span class="Constant">5</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 2.5 in location 1</span> <span class="Delimiter">:(scenario divide_by_zero)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>divide <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>divide <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">0</span> ] <span class="traceContains">+mem: storing inf in location 1</span> <span class="Delimiter">:(scenario divide_by_zero_2)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>divide-with-remainder <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>divide-with-remainder <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">0</span> ] <span class="Comment"># integer division can't return floating-point infinity</span> -<span class="traceContains">+error: main: divide by zero in '1:number <- divide-with-remainder 4, 0'</span> +<span class="traceContains">+error: main: divide by zero in '1:num <- divide-with-remainder 4, 0'</span> <span class="Comment">//: Bitwise shifts</span> @@ -400,33 +400,33 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario shift_left_by_zero)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>shift-left <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>shift-left <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> <span class="Delimiter">:(scenario shift_left_1)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>shift-left <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">4</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>shift-left <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">4</span> ] <span class="traceContains">+mem: storing 16 in location 1</span> <span class="Delimiter">:(scenario shift_left_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>shift-left <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>shift-left <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 12 in location 1</span> <span class="Delimiter">:(scenario shift_left_by_negative)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>shift-left <span class="Constant">3</span><span class="Delimiter">,</span> -<span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>shift-left <span class="Constant">3</span><span class="Delimiter">,</span> -<span class="Constant">1</span> ] -<span class="traceContains">+error: main: second ingredient can't be negative in '1:number <- shift-left 3, -1'</span> +<span class="traceContains">+error: main: second ingredient can't be negative in '1:num <- shift-left 3, -1'</span> <span class="Delimiter">:(scenario shift_left_ignores_fractional_part)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>divide <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>shift-left <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>divide <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>shift-left <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 2 in location 2</span> @@ -471,33 +471,33 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario shift_right_by_zero)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>shift-right <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>shift-right <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> <span class="Delimiter">:(scenario shift_right_1)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>shift-right <span class="Constant">1024</span><span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>shift-right <span class="Constant">1024</span><span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 512 in location 1</span> <span class="Delimiter">:(scenario shift_right_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>shift-right <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>shift-right <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> <span class="Delimiter">:(scenario shift_right_by_negative)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>shift-right <span class="Constant">4</span><span class="Delimiter">,</span> -<span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>shift-right <span class="Constant">4</span><span class="Delimiter">,</span> -<span class="Constant">1</span> ] -<span class="traceContains">+error: main: second ingredient can't be negative in '1:number <- shift-right 4, -1'</span> +<span class="traceContains">+error: main: second ingredient can't be negative in '1:num <- shift-right 4, -1'</span> <span class="Delimiter">:(scenario shift_right_ignores_fractional_part)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>divide <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>shift-right <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>divide <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>shift-right <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 0 in location 2</span> @@ -537,25 +537,25 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario and_bits_1)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span><span class="Normal">and</span>-bits <span class="Constant">8</span><span class="Delimiter">,</span> <span class="Constant">3</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span><span class="Normal">and</span>-bits <span class="Constant">8</span><span class="Delimiter">,</span> <span class="Constant">3</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> <span class="Delimiter">:(scenario and_bits_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span><span class="Normal">and</span>-bits <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span><span class="Normal">and</span>-bits <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 2 in location 1</span> <span class="Delimiter">:(scenario and_bits_3)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span><span class="Normal">and</span>-bits <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">3</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span><span class="Normal">and</span>-bits <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">3</span> ] <span class="traceContains">+mem: storing 2 in location 1</span> <span class="Delimiter">:(scenario and_bits_negative)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span><span class="Normal">and</span>-bits -<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span><span class="Normal">and</span>-bits -<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span> ] <span class="traceContains">+mem: storing 4 in location 1</span> @@ -595,19 +595,19 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario or_bits_1)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span><span class="Normal">or</span>-bits <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">8</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span><span class="Normal">or</span>-bits <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">8</span> ] <span class="traceContains">+mem: storing 11 in location 1</span> <span class="Delimiter">:(scenario or_bits_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span><span class="Normal">or</span>-bits <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">10</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span><span class="Normal">or</span>-bits <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">10</span> ] <span class="traceContains">+mem: storing 11 in location 1</span> <span class="Delimiter">:(scenario or_bits_3)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span><span class="Normal">or</span>-bits <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">6</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span><span class="Normal">or</span>-bits <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">6</span> ] <span class="traceContains">+mem: storing 6 in location 1</span> @@ -647,19 +647,19 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario xor_bits_1)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span><span class="Normal">xor</span>-bits <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">8</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span><span class="Normal">xor</span>-bits <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">8</span> ] <span class="traceContains">+mem: storing 11 in location 1</span> <span class="Delimiter">:(scenario xor_bits_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span><span class="Normal">xor</span>-bits <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">10</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span><span class="Normal">xor</span>-bits <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">10</span> ] <span class="traceContains">+mem: storing 9 in location 1</span> <span class="Delimiter">:(scenario xor_bits_3)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span><span class="Normal">xor</span>-bits <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">6</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span><span class="Normal">xor</span>-bits <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">6</span> ] <span class="traceContains">+mem: storing 2 in location 1</span> @@ -698,25 +698,25 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario flip_bits_zero)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>flip-bits <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>flip-bits <span class="Constant">0</span> ] <span class="traceContains">+mem: storing -1 in location 1</span> <span class="Delimiter">:(scenario flip_bits_negative)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>flip-bits -<span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>flip-bits -<span class="Constant">1</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> <span class="Delimiter">:(scenario flip_bits_1)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>flip-bits <span class="Constant">3</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>flip-bits <span class="Constant">3</span> ] <span class="traceContains">+mem: storing -4 in location 1</span> <span class="Delimiter">:(scenario flip_bits_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>flip-bits <span class="Constant">12</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>flip-bits <span class="Constant">12</span> ] <span class="traceContains">+mem: storing -13 in location 1</span> @@ -745,7 +745,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario round_to_nearest_integer)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>round <span class="Constant">12.2</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>round <span class="Constant">12.2</span> ] <span class="traceContains">+mem: storing 12 in location 1</span> diff --git a/html/023boolean.cc.html b/html/023boolean.cc.html index b561cf93..0faab3e0 100644 --- a/html/023boolean.cc.html +++ b/html/023boolean.cc.html @@ -68,27 +68,27 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario and)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">2</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span><span class="Normal">and</span> <span class="Constant">1</span>:boolean<span class="Delimiter">,</span> <span class="Constant">2</span>:boolean + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">2</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">and</span> <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Constant">2</span>:<span class="Normal">bool</span> ] <span class="traceContains">+mem: storing 0 in location 3</span> <span class="Delimiter">:(scenario and_2)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span><span class="Normal">and</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">and</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> <span class="Delimiter">:(scenario and_multiple)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span><span class="Normal">and</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">and</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> <span class="Delimiter">:(scenario and_multiple_2)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span><span class="Normal">and</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">and</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> @@ -126,27 +126,27 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario or)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">2</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span><span class="Normal">or</span> <span class="Constant">1</span>:boolean<span class="Delimiter">,</span> <span class="Constant">2</span>:boolean + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">2</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">or</span> <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Constant">2</span>:<span class="Normal">bool</span> ] <span class="traceContains">+mem: storing 1 in location 3</span> <span class="Delimiter">:(scenario or_2)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span><span class="Normal">or</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">or</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> <span class="Delimiter">:(scenario or_multiple)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span><span class="Normal">and</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">and</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> <span class="Delimiter">:(scenario or_multiple_2)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span><span class="Normal">or</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">or</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> @@ -186,14 +186,14 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario not)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">2</span>:boolean<span class="Special"> <- </span><span class="Normal">not</span> <span class="Constant">1</span>:boolean + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">2</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">not</span> <span class="Constant">1</span>:<span class="Normal">bool</span> ] <span class="traceContains">+mem: storing 0 in location 2</span> <span class="Delimiter">:(scenario not_multiple)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Delimiter">,</span> <span class="Constant">2</span>:boolean<span class="Delimiter">,</span> <span class="Constant">3</span>:boolean<span class="Special"> <- </span><span class="Normal">not</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Constant">2</span>:<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">not</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> <span class="traceContains">+mem: storing 1 in location 2</span> diff --git a/html/024jump.cc.html b/html/024jump.cc.html index 9dc3662e..f222fa52 100644 --- a/html/024jump.cc.html +++ b/html/024jump.cc.html @@ -38,7 +38,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario jump_can_skip_instructions)</span> def main [ jump <span class="Constant">1</span>:offset - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> ] <span class="traceContains">+run: jump {1: "offset"}</span> <span class="traceAbsent">-run: {1: "number"} <- copy {1: "literal"}</span> @@ -119,7 +119,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario jump_if)</span> def main [ jump-<span class="Normal">if</span> <span class="Constant">999</span><span class="Delimiter">,</span> <span class="Constant">1</span>:offset - <span class="Constant">123</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">123</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> ] <span class="traceContains">+run: jump-if {999: "literal"}, {1: "offset"}</span> <span class="traceContains">+run: jumping to instruction 2</span> @@ -129,7 +129,7 @@ def main [ <span class="Delimiter">:(scenario jump_if_fallthrough)</span> def main [ jump-<span class="Normal">if</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>:offset - <span class="Constant">123</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">123</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> ] <span class="traceContains">+run: jump-if {0: "literal"}, {1: "offset"}</span> <span class="traceContains">+run: jump-if fell through</span> @@ -172,7 +172,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario jump_unless)</span> def main [ jump-unless <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>:offset - <span class="Constant">123</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">123</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> ] <span class="traceContains">+run: jump-unless {0: "literal"}, {1: "offset"}</span> <span class="traceContains">+run: jumping to instruction 2</span> @@ -182,7 +182,7 @@ def main [ <span class="Delimiter">:(scenario jump_unless_fallthrough)</span> def main [ jump-unless <span class="Constant">999</span><span class="Delimiter">,</span> <span class="Constant">1</span>:offset - <span class="Constant">123</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">123</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> ] <span class="traceContains">+run: jump-unless {999: "literal"}, {1: "offset"}</span> <span class="traceContains">+run: jump-unless fell through</span> diff --git a/html/025compare.cc.html b/html/025compare.cc.html index 10c3a0d8..987b6602 100644 --- a/html/025compare.cc.html +++ b/html/025compare.cc.html @@ -78,9 +78,9 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario equal)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">33</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">33</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: location 1 is 34</span> <span class="traceContains">+mem: location 2 is 33</span> @@ -88,9 +88,9 @@ def main [ <span class="Delimiter">:(scenario equal_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: location 1 is 34</span> <span class="traceContains">+mem: location 2 is 34</span> @@ -98,13 +98,13 @@ def main [ <span class="Delimiter">:(scenario equal_multiple)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">34</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> <span class="Delimiter">:(scenario equal_multiple_2)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> @@ -144,9 +144,9 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario not_equal)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">33</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span><span class="Normal">not</span>-equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">33</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">not</span>-equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: location 1 is 34</span> <span class="traceContains">+mem: location 2 is 33</span> @@ -154,9 +154,9 @@ def main [ <span class="Delimiter">:(scenario not_equal_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span><span class="Normal">not</span>-equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span><span class="Normal">not</span>-equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: location 1 is 34</span> <span class="traceContains">+mem: location 2 is 34</span> @@ -203,29 +203,29 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario greater_than)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">33</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>greater-than <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">33</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>greater-than <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 1 in location 3</span> <span class="Delimiter">:(scenario greater_than_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>greater-than <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>greater-than <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 0 in location 3</span> <span class="Delimiter">:(scenario greater_than_multiple)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>greater-than <span class="Constant">36</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>greater-than <span class="Constant">36</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">34</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> <span class="Delimiter">:(scenario greater_than_multiple_2)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>greater-than <span class="Constant">36</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">35</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>greater-than <span class="Constant">36</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">35</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> @@ -270,29 +270,29 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario lesser_than)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">32</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">33</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>lesser-than <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">32</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">33</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>lesser-than <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 1 in location 3</span> <span class="Delimiter">:(scenario lesser_than_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">33</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>lesser-than <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">33</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>lesser-than <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 0 in location 3</span> <span class="Delimiter">:(scenario lesser_than_multiple)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>lesser-than <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">36</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>lesser-than <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">36</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> <span class="Delimiter">:(scenario lesser_than_multiple_2)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>lesser-than <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">35</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>lesser-than <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">35</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> @@ -337,37 +337,37 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario greater_or_equal)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">33</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">33</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 1 in location 3</span> <span class="Delimiter">:(scenario greater_or_equal_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 1 in location 3</span> <span class="Delimiter">:(scenario greater_or_equal_3)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 0 in location 3</span> <span class="Delimiter">:(scenario greater_or_equal_multiple)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">36</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">35</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">36</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">35</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> <span class="Delimiter">:(scenario greater_or_equal_multiple_2)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">36</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">36</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>greater-<span class="Normal">or</span>-equal <span class="Constant">36</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">36</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> @@ -412,37 +412,37 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario lesser_or_equal)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">32</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">33</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>lesser-<span class="Normal">or</span>-equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">32</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">33</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>lesser-<span class="Normal">or</span>-equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 1 in location 3</span> <span class="Delimiter">:(scenario lesser_or_equal_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">33</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">33</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>lesser-<span class="Normal">or</span>-equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">33</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">33</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>lesser-<span class="Normal">or</span>-equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 1 in location 3</span> <span class="Delimiter">:(scenario lesser_or_equal_3)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">33</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>lesser-<span class="Normal">or</span>-equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">33</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>lesser-<span class="Normal">or</span>-equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 0 in location 3</span> <span class="Delimiter">:(scenario lesser_or_equal_multiple)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>lesser-<span class="Normal">or</span>-equal <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">35</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>lesser-<span class="Normal">or</span>-equal <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">35</span> ] <span class="traceContains">+mem: storing 1 in location 1</span> <span class="Delimiter">:(scenario lesser_or_equal_multiple_2)</span> def main [ - <span class="Constant">1</span>:boolean<span class="Special"> <- </span>lesser-<span class="Normal">or</span>-equal <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>lesser-<span class="Normal">or</span>-equal <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span><span class="Delimiter">,</span> <span class="Constant">34</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> diff --git a/html/026call.cc.html b/html/026call.cc.html index 687ffbd3..fc0cd90d 100644 --- a/html/026call.cc.html +++ b/html/026call.cc.html @@ -40,20 +40,20 @@ def main [ f ] def f [ - <span class="Constant">3</span>:number<span class="Special"> <- </span>add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 4 in location 3</span> <span class="Delimiter">:(scenario return_on_fallthrough)</span> def main [ f - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] def f [ - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+run: f</span> <span class="Comment"># running f</span> @@ -173,9 +173,9 @@ def main [ <span class="Delimiter">:(scenario calling_undefined_recipe_handles_missing_result)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">x</span>:number<span class="Special"> <- </span>foo + <span class="Normal">x</span>:num<span class="Special"> <- </span>foo ] -<span class="traceContains">+error: main: undefined operation in 'x:number <- foo '</span> +<span class="traceContains">+error: main: undefined operation in 'x:num <- foo '</span> <span class="SalientComment">//:: finally, we need to fix the termination conditions for the run loop</span> diff --git a/html/027call_ingredient.cc.html b/html/027call_ingredient.cc.html index 07ad869d..95aed732 100644 --- a/html/027call_ingredient.cc.html +++ b/html/027call_ingredient.cc.html @@ -40,8 +40,8 @@ def main [ f <span class="Constant">2</span> ] def f [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>next-ingredient - <span class="Constant">13</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">12</span>:number + <span class="Constant">12</span>:num<span class="Special"> <- </span>next-ingredient + <span class="Constant">13</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">12</span>:num ] <span class="traceContains">+mem: storing 3 in location 13</span> @@ -50,7 +50,7 @@ def main [ f ] def f [ - _<span class="Delimiter">,</span> <span class="Constant">12</span>:number<span class="Special"> <- </span>next-ingredient + _<span class="Delimiter">,</span> <span class="Constant">12</span>:num<span class="Special"> <- </span>next-ingredient ] <span class="traceContains">+mem: storing 0 in location 12</span> @@ -91,7 +91,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Normal">if</span> <span class="Delimiter">(</span>current_recipe_name<span class="Delimiter">()</span> == <span class="Constant">"main"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Comment">// no ingredient types since the call might be implicit; assume ingredients are always strings</span> <span class="Comment">// todo: how to test this?</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_string<span class="Delimiter">(</span>product<span class="Delimiter">))</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>product<span class="Delimiter">))</span> raise << <span class="Constant">"main: wrong type for ingredient '"</span> << product<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Delimiter">}</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>product<span class="Delimiter">,</span> @@ -125,19 +125,19 @@ def main [ f ] def f [ - <span class="Constant">11</span>:number<span class="Special"> <- </span>next-ingredient + <span class="Constant">11</span>:num<span class="Special"> <- </span>next-ingredient ] -<span class="traceContains">+error: f: no ingredient to save in '11:number'</span> +<span class="traceContains">+error: f: no ingredient to save in '11:num'</span> <span class="Delimiter">:(scenario rewind_ingredients)</span> def main [ f <span class="Constant">2</span> ] def f [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>next-ingredient <span class="Comment"># consume ingredient</span> - _<span class="Delimiter">,</span> <span class="Constant">1</span>:boolean<span class="Special"> <- </span>next-ingredient <span class="Comment"># will not find any ingredients</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>next-ingredient <span class="Comment"># consume ingredient</span> + _<span class="Delimiter">,</span> <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>next-ingredient <span class="Comment"># will not find any ingredients</span> rewind-ingredients - <span class="Constant">13</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:boolean<span class="Special"> <- </span>next-ingredient <span class="Comment"># will find ingredient again</span> + <span class="Constant">13</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:<span class="Normal">bool</span><span class="Special"> <- </span>next-ingredient <span class="Comment"># will find ingredient again</span> ] <span class="traceContains">+mem: storing 2 in location 12</span> <span class="traceContains">+mem: storing 0 in location 1</span> @@ -163,8 +163,8 @@ def main [ f <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] def f [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>ingredient <span class="Constant">1</span> <span class="Comment"># consume second ingredient first</span> - <span class="Constant">13</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span>:boolean<span class="Special"> <- </span>next-ingredient <span class="Comment"># next-ingredient tries to scan past that</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>ingredient <span class="Constant">1</span> <span class="Comment"># consume second ingredient first</span> + <span class="Constant">13</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span>:<span class="Normal">bool</span><span class="Special"> <- </span>next-ingredient <span class="Comment"># next-ingredient tries to scan past that</span> ] <span class="traceContains">+mem: storing 2 in location 12</span> <span class="traceContains">+mem: storing 0 in location 1</span> @@ -205,10 +205,10 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> -<span class="Comment">//: a particularly common array type is the string, or address:array:character</span> +<span class="Comment">//: a particularly common array type is the text, or address:array:character</span> <span class="Delimiter">:(code)</span> -<span class="Normal">bool</span> is_mu_string<span class="Delimiter">(</span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> x<span class="Delimiter">)</span> <span class="Delimiter">{</span> - <span class="Comment">// End Preprocess is_mu_string(reagent x)</span> +<span class="Normal">bool</span> is_mu_text<span class="Delimiter">(</span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> x<span class="Delimiter">)</span> <span class="Delimiter">{</span> + <span class="Comment">// End Preprocess is_mu_text(reagent x)</span> <span class="Identifier">return</span> x<span class="Delimiter">.</span>type && !x<span class="Delimiter">.</span>type<span class="Delimiter">-></span>atom && x<span class="Delimiter">.</span>type<span class="Delimiter">-></span>left<span class="Delimiter">-></span>atom diff --git a/html/028call_reply.cc.html b/html/028call_reply.cc.html index 4c145b0e..3e4de57d 100644 --- a/html/028call_reply.cc.html +++ b/html/028call_reply.cc.html @@ -36,12 +36,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario return)</span> def main [ - <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number<span class="Special"> <- </span>f <span class="Constant">34</span> + <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num<span class="Special"> <- </span>f <span class="Constant">34</span> ] def f [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>next-ingredient - <span class="Constant">13</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">12</span>:number - reply <span class="Constant">12</span>:number<span class="Delimiter">,</span> <span class="Constant">13</span>:number + <span class="Constant">12</span>:num<span class="Special"> <- </span>next-ingredient + <span class="Constant">13</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">12</span>:num + reply <span class="Constant">12</span>:num<span class="Delimiter">,</span> <span class="Constant">13</span>:num ] <span class="traceContains">+mem: storing 34 in location 1</span> <span class="traceContains">+mem: storing 35 in location 2</span> @@ -136,15 +136,15 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenario return_type_mismatch)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">3</span>:number<span class="Special"> <- </span>f <span class="Constant">2</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>f <span class="Constant">2</span> ] def f [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>next-ingredient - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>next-ingredient + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> <span class="Constant">14</span>:point<span class="Special"> <- </span>copy <span class="Constant">12</span>:point/<span class="Special">raw</span> <span class="Identifier">return</span> <span class="Constant">14</span>:point ] -<span class="traceContains">+error: f: return ingredient '14:point' can't be saved in '3:number'</span> +<span class="traceContains">+error: f: return ingredient '14:point' can't be saved in '3:num'</span> <span class="Comment">//: In mu we'd like to assume that any instruction doesn't modify its</span> <span class="Comment">//: ingredients unless they're also products. The /same-as-ingredient inside</span> @@ -154,23 +154,23 @@ def f [ <span class="Delimiter">:(scenario return_same_as_ingredient)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>test1 <span class="Constant">1</span>:number <span class="Comment"># call with different ingredient and product</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>test1 <span class="Constant">1</span>:num <span class="Comment"># call with different ingredient and product</span> ] def test1 [ - <span class="Constant">10</span>:number<span class="Special"> <- </span>next-ingredient - <span class="Identifier">return</span> <span class="Constant">10</span>:number/same-as-ingredient:<span class="Constant">0</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>next-ingredient + <span class="Identifier">return</span> <span class="Constant">10</span>:num/same-as-ingredient:<span class="Constant">0</span> ] -<span class="traceContains">+error: main: '2:number <- test1 1:number' should write to '1:number' rather than '2:number'</span> +<span class="traceContains">+error: main: '2:num <- test1 1:num' should write to '1:num' rather than '2:num'</span> <span class="Delimiter">:(scenario return_same_as_ingredient_dummy)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - _<span class="Special"> <- </span>test1 <span class="Constant">1</span>:number <span class="Comment"># call with different ingredient and product</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + _<span class="Special"> <- </span>test1 <span class="Constant">1</span>:num <span class="Comment"># call with different ingredient and product</span> ] def test1 [ - <span class="Constant">10</span>:number<span class="Special"> <- </span>next-ingredient - <span class="Identifier">return</span> <span class="Constant">10</span>:number/same-as-ingredient:<span class="Constant">0</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>next-ingredient + <span class="Identifier">return</span> <span class="Constant">10</span>:num/same-as-ingredient:<span class="Constant">0</span> ] $error: <span class="Constant">0</span> diff --git a/html/029tools.cc.html b/html/029tools.cc.html index 0d861715..1005b991 100644 --- a/html/029tools.cc.html +++ b/html/029tools.cc.html @@ -56,7 +56,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of 'trace' should be a number (depth), but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"second ingredient of 'trace' should be a literal string (label), but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> @@ -110,8 +110,8 @@ def main [ <span class="Delimiter">:(scenario stash_number)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - stash [foo:]<span class="Delimiter">,</span> <span class="Constant">1</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + stash [foo:]<span class="Delimiter">,</span> <span class="Constant">1</span>:num ] <span class="traceContains">+app: foo: 34</span> @@ -246,7 +246,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'assert' requires a boolean for its first ingredient, but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'assert' requires a literal string for its second ingredient, but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> @@ -320,7 +320,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'$system' requires exactly one ingredient, but got '"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"ingredient to '$system' must be a literal text, but got '"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Delimiter">}</span> <span class="Identifier">break</span><span class="Delimiter">;</span> diff --git a/html/030container.cc.html b/html/030container.cc.html index 38136c79..040af497 100644 --- a/html/030container.cc.html +++ b/html/030container.cc.html @@ -53,8 +53,8 @@ get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point<sp <span class="Comment">//: skip later checks.</span> <span class="Delimiter">:(scenario copy_multiple_locations)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> <span class="Constant">3</span>:point<span class="Special"> <- </span>copy <span class="Constant">1</span>:point/unsafe ] <span class="traceContains">+mem: storing 34 in location 3</span> @@ -64,9 +64,9 @@ def main [ <span class="Delimiter">:(scenario copy_checks_size)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">2</span>:point<span class="Special"> <- </span>copy <span class="Constant">1</span>:number + <span class="Constant">2</span>:point<span class="Special"> <- </span>copy <span class="Constant">1</span>:num ] -<span class="traceContains">+error: main: can't copy '1:number' to '2:point'; types don't match</span> +<span class="traceContains">+error: main: can't copy '1:num' to '2:point'; types don't match</span> <span class="Delimiter">:(before "End Mu Types Initialization")</span> <span class="Comment">// A more complex example container, containing another container as one of</span> @@ -80,9 +80,9 @@ get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> point_nu <span class="Delimiter">:(scenario copy_handles_nested_container_elements)</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> <span class="Constant">15</span>:point-number<span class="Special"> <- </span>copy <span class="Constant">12</span>:point-number/unsafe ] <span class="traceContains">+mem: storing 36 in location 17</span> @@ -93,8 +93,8 @@ def main [ <span class="Constant">3</span>:point<span class="Special"> <- </span>f <span class="Constant">2</span> ] def f [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>next-ingredient - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>next-ingredient + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> <span class="Identifier">return</span> <span class="Constant">12</span>:point/<span class="Special">raw</span> ] <span class="traceContains">+run: result 0 is [2, 35]</span> @@ -106,25 +106,25 @@ def f [ <span class="Delimiter">:(scenario compare_multiple_locations)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># first</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># second</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">6</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> - <span class="Constant">7</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">4</span>:point-number/unsafe + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># first</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># second</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">7</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">4</span>:point-number/unsafe ] <span class="traceContains">+mem: storing 1 in location 7</span> <span class="Delimiter">:(scenario compare_multiple_locations_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># first</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># second</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">6</span>:number<span class="Special"> <- </span>copy <span class="Constant">37</span> <span class="Comment"># different</span> - <span class="Constant">7</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">4</span>:point-number/unsafe + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># first</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># second</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>copy <span class="Constant">37</span> <span class="Comment"># different</span> + <span class="Constant">7</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">4</span>:point-number/unsafe ] <span class="traceContains">+mem: storing 0 in location 7</span> @@ -227,6 +227,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">}</span> <span class="Normal">void</span> compute_container_sizes<span class="Delimiter">(</span>reagent& r<span class="Delimiter">)</span> <span class="Delimiter">{</span> + expand_type_abbreviations<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">);</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>r<span class="Delimiter">)</span> || is_dummy<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> reagent rcopy = r<span class="Delimiter">;</span> <span class="Comment">// Compute Container Size(reagent rcopy)</span> @@ -249,7 +250,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">}</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-></span>left<span class="Delimiter">-></span>name == <span class="Constant">"array"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Normal">const</span> type_tree* element_type = type<span class="Delimiter">-></span>right<span class="Delimiter">;</span> - <span class="Comment">// hack: support both array:number:3 and array:address:number</span> + <span class="Comment">// hack: support both array:num:3 and array:address:num</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!element_type<span class="Delimiter">-></span>atom && element_type<span class="Delimiter">-></span>right && element_type<span class="Delimiter">-></span>right<span class="Delimiter">-></span>atom && is_integer<span class="Delimiter">(</span>element_type<span class="Delimiter">-></span>right<span class="Delimiter">-></span>name<span class="Delimiter">))</span> element_type = element_type<span class="Delimiter">-></span>left<span class="Delimiter">;</span> compute_container_sizes<span class="Delimiter">(</span>element_type<span class="Delimiter">,</span> pending_metadata<span class="Delimiter">);</span> @@ -310,9 +311,9 @@ container_metadata& get<span class="Delimiter">(</span>vector<pair<typ <span class="Delimiter">:(scenario stash_container)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># first</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># first</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> stash [foo:]<span class="Delimiter">,</span> <span class="Constant">1</span>:point-number/<span class="Special">raw</span> ] <span class="traceContains">+app: foo: 34 35 36</span> @@ -333,6 +334,19 @@ def main [ CHECK_EQ<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span>size<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span> <span class="Delimiter">}</span> +<span class="Normal">void</span> test_container_sizes_through_aliases<span class="Delimiter">()</span> <span class="Delimiter">{</span> + <span class="Comment">// a new alias for a container</span> + put<span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">"pt"</span><span class="Delimiter">,</span> new_type_tree<span class="Delimiter">(</span><span class="Constant">"point"</span><span class="Delimiter">));</span> + reagent r<span class="Delimiter">(</span><span class="Constant">"x:pt"</span><span class="Delimiter">);</span> + <span class="Comment">// scan</span> + compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> + <span class="Comment">// the reagent we scanned knows its size</span> + CHECK_EQ<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>size<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span> + <span class="Comment">// the global table also knows its size</span> + CHECK<span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">));</span> + CHECK_EQ<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">,</span> r<span class="Delimiter">.</span>type<span class="Delimiter">).</span>size<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span> +<span class="Delimiter">}</span> + <span class="Normal">void</span> test_container_sizes_nested<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Comment">// a container we don't have the size for</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:point-number"</span><span class="Delimiter">);</span> @@ -349,7 +363,7 @@ def main [ <span class="Normal">void</span> test_container_sizes_recursive<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Comment">// define a container containing an address to itself</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" y:address:foo</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:foo"</span><span class="Delimiter">);</span> @@ -435,9 +449,9 @@ def main [ <span class="Delimiter">:(scenario get)</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">15</span>:number<span class="Special"> <- </span>get <span class="Constant">12</span>:point/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:offset <span class="Comment"># unsafe</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">15</span>:num<span class="Special"> <- </span>get <span class="Constant">12</span>:point/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:offset <span class="Comment"># unsafe</span> ] <span class="traceContains">+mem: storing 35 in location 15</span> @@ -527,19 +541,19 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario get_handles_nested_container_elements)</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> - <span class="Constant">15</span>:number<span class="Special"> <- </span>get <span class="Constant">12</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:offset <span class="Comment"># unsafe</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">15</span>:num<span class="Special"> <- </span>get <span class="Constant">12</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:offset <span class="Comment"># unsafe</span> ] <span class="traceContains">+mem: storing 36 in location 15</span> <span class="Delimiter">:(scenario get_out_of_bounds)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> get <span class="Constant">12</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:offset <span class="Comment"># point-number occupies 3 locations but has only 2 fields; out of bounds</span> ] <span class="traceContains">+error: main: invalid offset '2' for 'point-number'</span> @@ -547,9 +561,9 @@ def main [ <span class="Delimiter">:(scenario get_out_of_bounds_2)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> get <span class="Constant">12</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> -<span class="Constant">1</span>:offset ] <span class="traceContains">+error: main: invalid offset '-1' for 'point-number'</span> @@ -557,10 +571,10 @@ def main [ <span class="Delimiter">:(scenario get_product_type_mismatch)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> - <span class="Constant">15</span>:address:number<span class="Special"> <- </span>get <span class="Constant">12</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:offset + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">15</span>:address:num<span class="Special"> <- </span>get <span class="Constant">12</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:offset ] <span class="traceContains">+error: main: 'get 12:point-number/raw, 1:offset' should write to number but '15' has type (address number)</span> @@ -568,8 +582,8 @@ def main [ <span class="Delimiter">:(scenario get_without_product)</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> get <span class="Constant">12</span>:point/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:offset <span class="Comment"># unsafe</span> ] <span class="Comment"># just don't die</span> @@ -578,8 +592,8 @@ def main [ <span class="Delimiter">:(scenario put)</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> $clear-trace <span class="Constant">12</span>:point<span class="Special"> <- </span>put <span class="Constant">12</span>:point<span class="Delimiter">,</span> <span class="Constant">1</span>:offset<span class="Delimiter">,</span> <span class="Constant">36</span> ] @@ -679,8 +693,8 @@ def main [ <span class="Delimiter">:(scenarios load)</span> <span class="Delimiter">:(scenario container)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] <span class="traceContains">+parse: --- defining container foo</span> <span class="traceContains">+parse: element: {x: "number"}</span> @@ -688,12 +702,12 @@ container foo [ <span class="Delimiter">:(scenario container_use_before_definition)</span> container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar ] container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] <span class="traceContains">+parse: --- defining container foo</span> <span class="traceContains">+parse: type number: 1000</span> @@ -711,17 +725,17 @@ container bar [ <span class="Delimiter">:(scenarios run)</span> <span class="Delimiter">:(scenario container_extend)</span> container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num ] <span class="Comment"># add to previous definition</span> container foo [ - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">0</span>:offset - <span class="Constant">4</span>:number<span class="Special"> <- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">1</span>:offset + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">0</span>:offset + <span class="Constant">4</span>:num<span class="Special"> <- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> <span class="Constant">1</span>:offset ] <span class="traceContains">+mem: storing 34 in location 3</span> <span class="traceContains">+mem: storing 35 in location 4</span> @@ -777,6 +791,7 @@ Num_calls_to_transform_all_at_first_definition = -<span class="Constant">1</span <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>element<span class="Delimiter">));</span> + expand_type_abbreviations<span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>type<span class="Delimiter">);</span> <span class="Comment">// todo: use abbreviation before declaration</span> replace_unknown_types_with_unique_ordinals<span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>type<span class="Delimiter">,</span> info<span class="Delimiter">);</span> trace<span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">" element: "</span> << to_string<span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">())</span> << end<span class="Delimiter">();</span> <span class="Comment">// End Load Container Element Definition</span> @@ -813,7 +828,7 @@ Num_calls_to_transform_all_at_first_definition = -<span class="Constant">1</span <span class="Delimiter">:(scenario multi_word_line_in_container_declaration)</span> <span class="Special">% Hide_errors = true;</span> container foo [ - <span class="Normal">x</span>:number y:number + <span class="Normal">x</span>:num y:num ] <span class="traceContains">+error: container 'foo' contains multiple elements on a single line. Containers and exclusive containers must only contain elements, one to a line, no code.</span> @@ -825,7 +840,7 @@ container bar [ <span class="Normal">x</span>:foo ] def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Constant">2</span>:foo<span class="Special"> <- </span>get <span class="Constant">1</span>:bar/unsafe<span class="Delimiter">,</span> <span class="Constant">0</span>:offset ] <span class="traceContains">+mem: storing 34 in location 2</span> @@ -853,14 +868,14 @@ assert<span class="Delimiter">(</span>Next_type_ordinal < <span class="Consta <span class="Normal">void</span> test_error_on_transform_all_between_container_definition_and_extension<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Comment">// define a container</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" a:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" a:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> <span class="Comment">// try to extend the container after transform</span> transform_all<span class="Delimiter">();</span> CHECK_TRACE_DOESNT_CONTAIN_ERROR<span class="Delimiter">();</span> Hide_errors = <span class="Constant">true</span><span class="Delimiter">;</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" b:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" b:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> CHECK_TRACE_CONTAINS_ERROR<span class="Delimiter">();</span> <span class="Delimiter">}</span> @@ -881,7 +896,7 @@ def main [ <span class="Constant">1</span>:bar<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe ] container bar [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num ] $error: <span class="Constant">0</span> @@ -923,16 +938,16 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenario container_unknown_field)</span> <span class="Special">% Hide_errors = true;</span> container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar ] <span class="traceContains">+error: foo: unknown type in y</span> <span class="Delimiter">:(scenario read_container_with_bracket_in_comment)</span> container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Comment"># ']' in comment</span> - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] <span class="traceContains">+parse: --- defining container foo</span> <span class="traceContains">+parse: element: {x: "number"}</span> diff --git a/html/031merge.cc.html b/html/031merge.cc.html index 0642eab2..9f3e8440 100644 --- a/html/031merge.cc.html +++ b/html/031merge.cc.html @@ -37,8 +37,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario merge)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span> @@ -247,9 +247,9 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenario merge_check_product)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>merge <span class="Constant">3</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>merge <span class="Constant">3</span> ] -<span class="traceContains">+error: main: 'merge' should yield a container in '1:number <- merge 3'</span> +<span class="traceContains">+error: main: 'merge' should yield a container in '1:num <- merge 3'</span> <span class="Delimiter">:(before "End Includes")</span> <span class="PreProc">#include </span><span class="Constant"><stack></span> diff --git a/html/032array.cc.html b/html/032array.cc.html index 1a733068..77cfb88c 100644 --- a/html/032array.cc.html +++ b/html/032array.cc.html @@ -44,7 +44,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario create_array)</span> def main [ <span class="Comment"># create an array occupying locations 1 (for the size) and 2-4 (for the elements)</span> - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array ] <span class="traceContains">+run: creating array of size 4</span> @@ -112,11 +112,11 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Comment"># 'static' array, and one without a 'dynamic' array since it can contain</span> <span class="Comment"># arrays of many different sizes.</span> def main [ - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">5</span>:array:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:array:number:<span class="Constant">3</span> + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">5</span>:array:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:array:num:<span class="Constant">3</span> ] <span class="traceContains">+mem: storing 3 in location 5</span> <span class="traceContains">+mem: storing 14 in location 6</span> @@ -125,11 +125,11 @@ def main [ <span class="Delimiter">:(scenario stash_array)</span> def main [ - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - stash [foo:]<span class="Delimiter">,</span> <span class="Constant">1</span>:array:number:<span class="Constant">3</span> + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + stash [foo:]<span class="Delimiter">,</span> <span class="Constant">1</span>:array:num:<span class="Constant">3</span> ] <span class="traceContains">+app: foo: 3 14 15 16</span> @@ -155,14 +155,14 @@ def main [ <span class="Delimiter">:(scenario container_permits_static_array_element)</span> container foo [ - <span class="Normal">x</span>:array:number:<span class="Constant">3</span> + <span class="Normal">x</span>:array:num:<span class="Constant">3</span> ] $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario container_disallows_dynamic_array_element)</span> <span class="Special">% Hide_errors = true;</span> container foo [ - <span class="Normal">x</span>:array:number + <span class="Normal">x</span>:array:num ] <span class="traceContains">+error: container 'foo' cannot determine size of element 'x'</span> @@ -176,12 +176,12 @@ container foo [ <span class="Delimiter">:(scenario merge_static_array_into_container)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:array:number:<span class="Constant">3</span> + <span class="Normal">x</span>:num + <span class="Normal">y</span>:array:num:<span class="Constant">3</span> ] def main [ - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">10</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:array:number:<span class="Constant">3</span> + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">10</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>:array:num:<span class="Constant">3</span> ] <span class="Comment"># no errors</span> @@ -207,11 +207,11 @@ def main [ <span class="Delimiter">:(scenario code_inside_container)</span> <span class="Special">% Hide_errors = true;</span> container card [ - <span class="Normal">rank</span>:number<span class="Special"> <- </span>next-ingredient + <span class="Normal">rank</span>:num<span class="Special"> <- </span>next-ingredient ] def foo [ <span class="Constant">1</span>:card<span class="Special"> <- </span>merge <span class="Constant">3</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>get <span class="Constant">1</span>:card rank:offset + <span class="Constant">2</span>:num<span class="Special"> <- </span>get <span class="Constant">1</span>:card rank:offset ] <span class="Comment"># shouldn't die</span> @@ -219,32 +219,32 @@ def foo [ <span class="Delimiter">:(scenario index)</span> def main [ - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>index <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>index <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 14 in location 5</span> <span class="Delimiter">:(scenario index_compound_element)</span> def main [ <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">5</span>:address:number<span class="Special"> <- </span>index <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)},</span> <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">5</span>:address:num<span class="Special"> <- </span>index <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)},</span> <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 14 in location 5</span> <span class="Delimiter">:(scenario index_direct_offset)</span> def main [ - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">6</span>:number<span class="Special"> <- </span>index <span class="Constant">1</span>:array:number<span class="Delimiter">,</span> <span class="Constant">5</span>:number + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>index <span class="Constant">1</span>:array:num<span class="Delimiter">,</span> <span class="Constant">5</span>:num ] <span class="traceContains">+mem: storing 14 in location 6</span> @@ -313,7 +313,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(code)</span> type_tree* copy_array_element<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span> assert<span class="Delimiter">(</span>type<span class="Delimiter">-></span>right<span class="Delimiter">);</span> - <span class="Comment">// hack: don't require parens for either array:number:3 array:address:number</span> + <span class="Comment">// hack: don't require parens for either array:num:3 array:address:num</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-></span>right<span class="Delimiter">-></span>atom && type<span class="Delimiter">-></span>right<span class="Delimiter">-></span>right && type<span class="Delimiter">-></span>right<span class="Delimiter">-></span>right<span class="Delimiter">-></span>atom && is_integer<span class="Delimiter">(</span>type<span class="Delimiter">-></span>right<span class="Delimiter">-></span>right<span class="Delimiter">-></span>name<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*type<span class="Delimiter">-></span>right<span class="Delimiter">-></span>left<span class="Delimiter">);</span> <span class="Identifier">return</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*type<span class="Delimiter">-></span>right<span class="Delimiter">);</span> @@ -335,7 +335,7 @@ type_tree* copy_array_element<span class="Delimiter">(</span><span class="Normal put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">14</span><span class="Delimiter">);</span> put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">);</span> put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">16</span><span class="Delimiter">);</span> - reagent x<span class="Delimiter">(</span><span class="Constant">"1:array:address:number"</span><span class="Delimiter">);</span> <span class="Comment">// 3 types, but not a static array</span> + reagent x<span class="Delimiter">(</span><span class="Constant">"1:array:address:num"</span><span class="Delimiter">);</span> <span class="Comment">// 3 types, but not a static array</span> populate_value<span class="Delimiter">(</span>x<span class="Delimiter">);</span> CHECK_EQ<span class="Delimiter">(</span>array_length<span class="Delimiter">(</span>x<span class="Delimiter">),</span> <span class="Constant">3</span><span class="Delimiter">);</span> <span class="Delimiter">}</span> @@ -343,27 +343,27 @@ type_tree* copy_array_element<span class="Delimiter">(</span><span class="Normal <span class="Delimiter">:(scenario index_out_of_bounds)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">6</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">7</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - index <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span> <span class="Comment"># less than size of array in locations, but larger than its length in elements</span> + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">7</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + index <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span> <span class="Comment"># less than size of array in locations, but larger than its length in elements</span> ] -<span class="traceContains">+error: main: invalid index 4 in 'index 1:array:number:3, 4'</span> +<span class="traceContains">+error: main: invalid index 4 in 'index 1:array:num:3, 4'</span> <span class="Delimiter">:(scenario index_out_of_bounds_2)</span> <span class="Special">% Hide_errors = true;</span> def main [ <span class="Constant">1</span>:array:point:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">6</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">7</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">7</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> index <span class="Constant">1</span>:array:point<span class="Delimiter">,</span> -<span class="Constant">1</span> ] <span class="traceContains">+error: main: invalid index -1 in 'index 1:array:point, -1'</span> @@ -372,25 +372,25 @@ def main [ <span class="Special">% Hide_errors = true;</span> def main [ <span class="Constant">1</span>:array:point:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">6</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">7</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">9</span>:number<span class="Special"> <- </span>index <span class="Constant">1</span>:array:point<span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">7</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">9</span>:num<span class="Special"> <- </span>index <span class="Constant">1</span>:array:point<span class="Delimiter">,</span> <span class="Constant">0</span> ] -<span class="traceContains">+error: main: 'index' on '1:array:point' can't be saved in '9:number'; type should be 'point'</span> +<span class="traceContains">+error: main: 'index' on '1:array:point' can't be saved in '9:num'; type should be 'point'</span> <span class="Comment">//: we might want to call 'index' without saving the results, say in a sandbox</span> <span class="Delimiter">:(scenario index_without_product)</span> def main [ - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - index <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + index <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">0</span> ] <span class="Comment"># just don't die</span> @@ -398,11 +398,11 @@ def main [ <span class="Delimiter">:(scenario put_index)</span> def main [ - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">1</span>:array:number<span class="Special"> <- </span>put-index <span class="Constant">1</span>:array:number<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">1</span>:array:num<span class="Special"> <- </span>put-index <span class="Constant">1</span>:array:num<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span> ] <span class="traceContains">+mem: storing 34 in location 3</span> @@ -480,12 +480,12 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Special">% Hide_errors = true;</span> def main [ <span class="Constant">1</span>:array:point:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">6</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">7</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">7</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> <span class="Constant">8</span>:point<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> <span class="Constant">1</span>:array:point<span class="Special"> <- </span>put-index <span class="Constant">1</span>:array:point<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">8</span>:point <span class="Comment"># '4' is less than size of array in locations, but larger than its length in elements</span> ] @@ -495,12 +495,12 @@ def main [ <span class="Special">% Hide_errors = true;</span> def main [ <span class="Constant">1</span>:array:point:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">6</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">7</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">7</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> <span class="Constant">8</span>:point<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> <span class="Constant">1</span>:array:point<span class="Special"> <- </span>put-index <span class="Constant">1</span>:array:point<span class="Delimiter">,</span> -<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">8</span>:point ] @@ -511,20 +511,20 @@ def main [ def main [ local-scope load-ingredients - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">4</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>put-index <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">4</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>put-index <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">34</span> ] -<span class="traceContains">+error: main: product of 'put-index' must be first ingredient '1:array:number:3', but got '4:array:number:3'</span> +<span class="traceContains">+error: main: product of 'put-index' must be first ingredient '1:array:num:3', but got '4:array:num:3'</span> <span class="SalientComment">//:: compute the length of an array</span> <span class="Delimiter">:(scenario array_length)</span> def main [ - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>length <span class="Constant">1</span>:array:number:<span class="Constant">3</span> + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>length <span class="Constant">1</span>:array:num:<span class="Constant">3</span> ] <span class="traceContains">+mem: storing 3 in location 5</span> diff --git a/html/033exclusive_container.cc.html b/html/033exclusive_container.cc.html index 01cdfbfb..f0d129e3 100644 --- a/html/033exclusive_container.cc.html +++ b/html/033exclusive_container.cc.html @@ -56,9 +56,9 @@ get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> tmp<span <span class="Delimiter">:(scenario copy_exclusive_container)</span> <span class="Comment"># Copying exclusive containers copies all their contents and an extra location for the tag.</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> <span class="Comment"># 'point' variant</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> <span class="Comment"># 'point' variant</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> <span class="Constant">4</span>:number-<span class="Normal">or</span>-point<span class="Special"> <- </span>copy <span class="Constant">1</span>:number-<span class="Normal">or</span>-point/unsafe ] <span class="traceContains">+mem: storing 1 in location 4</span> @@ -105,10 +105,10 @@ put<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> <span class="Delimiter">:(scenario maybe_convert)</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> - <span class="Constant">20</span>:point<span class="Delimiter">,</span> <span class="Constant">22</span>:boolean<span class="Special"> <- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> <span class="Constant">1</span>:variant + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">20</span>:point<span class="Delimiter">,</span> <span class="Constant">22</span>:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> <span class="Constant">1</span>:variant ] <span class="Comment"># boolean</span> <span class="traceContains">+mem: storing 1 in location 22</span> @@ -118,10 +118,10 @@ def main [ <span class="Delimiter">:(scenario maybe_convert_fail)</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> - <span class="Constant">20</span>:number<span class="Delimiter">,</span> <span class="Constant">21</span>:boolean<span class="Special"> <- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> <span class="Constant">0</span>:variant + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">20</span>:num<span class="Delimiter">,</span> <span class="Constant">21</span>:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> <span class="Constant">0</span>:variant ] <span class="Comment"># boolean</span> <span class="traceContains">+mem: storing 0 in location 21</span> @@ -235,19 +235,19 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario maybe_convert_product_type_mismatch)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> - <span class="Constant">20</span>:number<span class="Delimiter">,</span> <span class="Constant">21</span>:boolean<span class="Special"> <- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> <span class="Constant">1</span>:variant + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">20</span>:num<span class="Delimiter">,</span> <span class="Constant">21</span>:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> <span class="Constant">1</span>:variant ] <span class="traceContains">+error: main: 'maybe-convert 12:number-or-point/unsafe, 1:variant' should write to point but '20' has type number</span> <span class="Delimiter">:(scenario maybe_convert_dummy_product)</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> - _<span class="Delimiter">,</span> <span class="Constant">21</span>:boolean<span class="Special"> <- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> <span class="Constant">1</span>:variant + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> + _<span class="Delimiter">,</span> <span class="Constant">21</span>:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> <span class="Constant">1</span>:variant ] $error: <span class="Constant">0</span> @@ -255,8 +255,8 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario exclusive_container)</span> exclusive-container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] <span class="traceContains">+parse: --- defining exclusive-container foo</span> <span class="traceContains">+parse: element: {x: "number"}</span> @@ -272,27 +272,27 @@ exclusive-container foo [ <span class="Delimiter">:(scenario exclusive_container_contains_array)</span> exclusive-container foo [ - <span class="Normal">x</span>:array:number:<span class="Constant">3</span> + <span class="Normal">x</span>:array:num:<span class="Constant">3</span> ] $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario exclusive_container_disallows_dynamic_array_element)</span> <span class="Special">% Hide_errors = true;</span> exclusive-container foo [ - <span class="Normal">x</span>:array:number + <span class="Normal">x</span>:array:num ] <span class="traceContains">+error: container 'foo' cannot determine size of element 'x'</span> <span class="SalientComment">//:: To construct exclusive containers out of variant types, use 'merge'.</span> <span class="Delimiter">:(scenario lift_to_exclusive_container)</span> exclusive-container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:number <span class="Comment"># tag must be a literal when merging exclusive containers</span> - <span class="Constant">4</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:num <span class="Comment"># tag must be a literal when merging exclusive containers</span> + <span class="Constant">4</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:num ] <span class="traceContains">+mem: storing 0 in location 2</span> <span class="traceContains">+mem: storing 34 in location 3</span> @@ -303,11 +303,11 @@ def main [ <span class="Delimiter">:(scenario merge_handles_exclusive_container)</span> exclusive-container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar ] container bar [ - <span class="Normal">z</span>:number + <span class="Normal">z</span>:num ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span> @@ -319,29 +319,29 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario merge_requires_literal_tag_for_exclusive_container)</span> <span class="Special">% Hide_errors = true;</span> exclusive-container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar ] container bar [ - <span class="Normal">z</span>:number + <span class="Normal">z</span>:num ] def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">34</span> ] -<span class="traceContains">+error: main: ingredient 0 of 'merge' should be a literal, for the tag of exclusive-container 'foo' in '2:foo <- merge 1:number, 34'</span> +<span class="traceContains">+error: main: ingredient 0 of 'merge' should be a literal, for the tag of exclusive-container 'foo' in '2:foo <- merge 1:num, 34'</span> <span class="Delimiter">:(scenario merge_handles_exclusive_container_inside_exclusive_container)</span> exclusive-container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar ] exclusive-container bar [ - <span class="Normal">a</span>:number - <span class="Normal">b</span>:number + <span class="Normal">a</span>:num + <span class="Normal">b</span>:num ] def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Constant">2</span>:bar<span class="Special"> <- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">34</span> <span class="Constant">4</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">2</span>:bar ] @@ -377,12 +377,12 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario merge_check_container_containing_exclusive_container)</span> container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar ] exclusive-container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">34</span> @@ -395,12 +395,12 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario merge_check_container_containing_exclusive_container_2)</span> <span class="Special">% Hide_errors = true;</span> container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar ] exclusive-container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> @@ -409,12 +409,12 @@ def main [ <span class="Delimiter">:(scenario merge_check_exclusive_container_containing_container)</span> exclusive-container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar ] container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">34</span> @@ -426,12 +426,12 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario merge_check_exclusive_container_containing_container_2)</span> exclusive-container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar ] container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">23</span> @@ -441,12 +441,12 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario merge_check_exclusive_container_containing_container_3)</span> <span class="Special">% Hide_errors = true;</span> exclusive-container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar ] container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">23</span> @@ -455,12 +455,12 @@ def main [ <span class="Delimiter">:(scenario merge_check_exclusive_container_containing_container_4)</span> exclusive-container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar ] container bar [ - <span class="Normal">a</span>:number - <span class="Normal">b</span>:number + <span class="Normal">a</span>:num + <span class="Normal">b</span>:num ] def main [ <span class="Constant">1</span>:bar<span class="Special"> <- </span>merge <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">24</span> @@ -485,18 +485,18 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario merge_exclusive_container_with_mismatched_sizes)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] exclusive-container bar [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:foo ] def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">3</span>:bar<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:number - <span class="Constant">6</span>:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>/foo<span class="Delimiter">,</span> <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">3</span>:bar<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:num + <span class="Constant">6</span>:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>/foo<span class="Delimiter">,</span> <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 0 in location 3</span> <span class="traceContains">+mem: storing 34 in location 4</span> diff --git a/html/034address.cc.html b/html/034address.cc.html index f809d2fb..ea739cf3 100644 --- a/html/034address.cc.html +++ b/html/034address.cc.html @@ -80,7 +80,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment">//: sufficient space to hold that type, and returns an address (bookmark)</span> <span class="Comment">//: to the allocated space.</span> <span class="Comment">//:</span> -<span class="Comment">//: x:address:number <- new number:type</span> +<span class="Comment">//: x:address:num <- new number:type</span> <span class="Comment">//:</span> <span class="Comment">//: +------------+</span> <span class="Comment">//: x -------> | number |</span> @@ -118,7 +118,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment">//: The refcount of 1 here indicates that this number has one bookmark</span> <span class="Comment">//: outstanding. If you then make a copy of x, the refcount increments:</span> <span class="Comment">//:</span> -<span class="Comment">//: y:address:number <- copy x</span> +<span class="Comment">//: y:address:num <- copy x</span> <span class="Comment">//:</span> <span class="Comment">//: x ---+ +---+------------+</span> <span class="Comment">//: +---> | 2 | number |</span> @@ -158,15 +158,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># call 'new' two times with identical types without modifying the results; you</span> <span class="Comment"># should get back different results</span> def main [ - <span class="Constant">1</span>:address:number/<span class="Special">raw <- </span><span class="Normal">new</span> number:type - <span class="Constant">2</span>:address:number/<span class="Special">raw <- </span><span class="Normal">new</span> number:type - <span class="Constant">3</span>:boolean/<span class="Special">raw <- </span>equal <span class="Constant">1</span>:address:number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:address:number/<span class="Special">raw</span> + <span class="Constant">1</span>:address:num/<span class="Special">raw <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:address:num/<span class="Special">raw <- </span><span class="Normal">new</span> number:type + <span class="Constant">3</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal <span class="Constant">1</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:address:num/<span class="Special">raw</span> ] <span class="traceContains">+mem: storing 0 in location 3</span> <span class="Delimiter">:(scenario dilated_reagent_with_new)</span> def main [ - <span class="Constant">1</span>:address:address:number<span class="Special"> <- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">}</span> + <span class="Constant">1</span>:address:address:num<span class="Special"> <- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">}</span> ] <span class="traceContains">+new: size of ("address" "number") is 1</span> @@ -376,15 +376,15 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Special">% Memory_allocated_until = 10;</span> <span class="Special">% put(Memory, Memory_allocated_until, 1);</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type ] <span class="traceContains">+mem: storing 0 in location 10</span> <span class="Delimiter">:(scenario new_array)</span> def main [ - <span class="Constant">1</span>:address:array:number/<span class="Special">raw <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">5</span> - <span class="Constant">2</span>:address:number/<span class="Special">raw <- </span><span class="Normal">new</span> number:type - <span class="Constant">3</span>:number/<span class="Special">raw <- </span>subtract <span class="Constant">2</span>:address:number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:number/<span class="Special">raw</span> + <span class="Constant">1</span>:address:array:num/<span class="Special">raw <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">2</span>:address:num/<span class="Special">raw <- </span><span class="Normal">new</span> number:type + <span class="Constant">3</span>:num/<span class="Special">raw <- </span>subtract <span class="Constant">2</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:num/<span class="Special">raw</span> ] <span class="traceContains">+run: {1: ("address" "array" "number"), "raw": ()} <- new {number: "type"}, {5: "literal"}</span> <span class="traceContains">+mem: array length is 5</span> @@ -393,9 +393,9 @@ def main [ <span class="Delimiter">:(scenario new_empty_array)</span> def main [ - <span class="Constant">1</span>:address:array:number/<span class="Special">raw <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">0</span> - <span class="Constant">2</span>:address:number/<span class="Special">raw <- </span><span class="Normal">new</span> number:type - <span class="Constant">3</span>:number/<span class="Special">raw <- </span>subtract <span class="Constant">2</span>:address:number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:number/<span class="Special">raw</span> + <span class="Constant">1</span>:address:array:num/<span class="Special">raw <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">2</span>:address:num/<span class="Special">raw <- </span><span class="Normal">new</span> number:type + <span class="Constant">3</span>:num/<span class="Special">raw <- </span>subtract <span class="Constant">2</span>:address:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:num/<span class="Special">raw</span> ] <span class="traceContains">+run: {1: ("address" "array" "number"), "raw": ()} <- new {number: "type"}, {0: "literal"}</span> <span class="traceContains">+mem: array length is 0</span> @@ -406,7 +406,7 @@ def main [ <span class="Delimiter">:(scenario new_overflow)</span> <span class="Special">% Initial_memory_per_routine = 3; // barely enough room for point allocation below</span> def main [ - <span class="Constant">1</span>:address:number/<span class="Special">raw <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num/<span class="Special">raw <- </span><span class="Normal">new</span> number:type <span class="Constant">2</span>:address:point/<span class="Special">raw <- </span><span class="Normal">new</span> point:type <span class="Comment"># not enough room in initial page</span> ] <span class="traceContains">+new: routine allocated memory from 1000 to 1003</span> diff --git a/html/035lookup.cc.html b/html/035lookup.cc.html index a06d93c6..967f4e6d 100644 --- a/html/035lookup.cc.html +++ b/html/035lookup.cc.html @@ -61,7 +61,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment">//:</span> <span class="Comment">//: You can also read from the payload in instructions like this:</span> <span class="Comment">//:</span> -<span class="Comment">//: z:number <- add *x, 1</span> +<span class="Comment">//: z:num <- add *x, 1</span> <span class="Comment">//:</span> <span class="Comment">//: After this instruction runs the value of z will be 35.</span> <span class="Comment">//:</span> @@ -70,10 +70,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario copy_indirect)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># This loads location 1 as an address and looks up *that* location.</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:number/lookup + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:num/lookup ] <span class="Comment"># 1 contains 10. Skip refcount and lookup location 11.</span> <span class="traceContains">+mem: storing 34 in location 2</span> @@ -85,8 +85,8 @@ canonize<span class="Delimiter">(</span>x<span class="Delimiter">);</span> <span class="Comment">//: 'lookup' property</span> <span class="Delimiter">:(scenario store_indirect)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">1</span>:address:number/lookup<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">1</span>:address:num/lookup<span class="Special"> <- </span>copy <span class="Constant">34</span> ] <span class="traceContains">+mem: storing 34 in location 11</span> @@ -97,11 +97,11 @@ canonize<span class="Delimiter">(</span>x<span class="Delimiter">);</span> <span class="Delimiter">:(scenario store_to_0_fails)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">1</span>:address:number/lookup<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:address:num/lookup<span class="Special"> <- </span>copy <span class="Constant">34</span> ] <span class="traceAbsent">-mem: storing 34 in location 0</span> -<span class="traceContains">+error: can't write to location 0 in '1:address:number/lookup <- copy 34'</span> +<span class="traceContains">+error: can't write to location 0 in '1:address:num/lookup <- copy 34'</span> <span class="Delimiter">:(code)</span> <span class="Normal">void</span> canonize<span class="Delimiter">(</span>reagent& x<span class="Delimiter">)</span> <span class="Delimiter">{</span> @@ -137,7 +137,7 @@ def main [ <span class="Delimiter">}</span> <span class="Normal">void</span> test_lookup_address_skips_refcount<span class="Delimiter">()</span> <span class="Delimiter">{</span> - reagent x<span class="Delimiter">(</span><span class="Constant">"*x:address:number"</span><span class="Delimiter">);</span> + reagent x<span class="Delimiter">(</span><span class="Constant">"*x:address:num"</span><span class="Delimiter">);</span> x<span class="Delimiter">.</span>set_value<span class="Delimiter">(</span><span class="Constant">34</span><span class="Delimiter">);</span> <span class="Comment">// unsafe</span> put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1000</span><span class="Delimiter">);</span> lookup_memory<span class="Delimiter">(</span>x<span class="Delimiter">);</span> @@ -146,7 +146,7 @@ def main [ <span class="Delimiter">}</span> <span class="Normal">void</span> test_lookup_zero_address_does_not_skip_refcount<span class="Delimiter">()</span> <span class="Delimiter">{</span> - reagent x<span class="Delimiter">(</span><span class="Constant">"*x:address:number"</span><span class="Delimiter">);</span> + reagent x<span class="Delimiter">(</span><span class="Constant">"*x:address:num"</span><span class="Delimiter">);</span> x<span class="Delimiter">.</span>set_value<span class="Delimiter">(</span><span class="Constant">34</span><span class="Delimiter">);</span> <span class="Comment">// unsafe</span> put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span> lookup_memory<span class="Delimiter">(</span>x<span class="Delimiter">);</span> @@ -221,9 +221,9 @@ assert<span class="Delimiter">(</span>!has_property<span class="Delimiter">(</sp def main [ <span class="Constant">1</span>:address:point<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>get <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0</span>:offset + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>get <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0</span>:offset ] <span class="traceContains">+mem: storing 34 in location 2</span> @@ -231,10 +231,10 @@ def main [ def main [ <span class="Constant">1</span>:address:point<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">2</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe - <span class="Constant">2</span>:address:number/lookup<span class="Special"> <- </span>get <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0</span>:offset + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">2</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe + <span class="Constant">2</span>:address:num/lookup<span class="Special"> <- </span>get <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0</span>:offset ] <span class="traceContains">+mem: storing 34 in location 21</span> @@ -242,9 +242,9 @@ def main [ def main [ <span class="Constant">1</span>:address:point<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>get <span class="Constant">1</span>:address:point/lookup/foo<span class="Delimiter">,</span> <span class="Constant">0</span>:offset + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>get <span class="Constant">1</span>:address:point/lookup/foo<span class="Delimiter">,</span> <span class="Constant">0</span>:offset ] <span class="traceContains">+mem: storing 34 in location 2</span> @@ -259,8 +259,8 @@ canonize<span class="Delimiter">(</span>base<span class="Delimiter">);</span> def main [ <span class="Constant">1</span>:address:point<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> <span class="Constant">1</span>:address:point/lookup<span class="Special"> <- </span>put <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0</span>:offset<span class="Delimiter">,</span> <span class="Constant">36</span> ] <span class="traceContains">+mem: storing 36 in location 11</span> @@ -277,8 +277,8 @@ canonize<span class="Delimiter">(</span>base<span class="Delimiter">);</span> def main [ <span class="Constant">1</span>:address:point<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> <span class="Constant">1</span>:address:point<span class="Special"> <- </span>put <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> x:offset<span class="Delimiter">,</span> <span class="Constant">36</span> ] <span class="traceContains">+error: main: product of 'put' must be first ingredient '1:address:point/lookup', but got '1:address:point'</span> @@ -296,9 +296,9 @@ reagent<span class="Comment">/*</span><span class="Comment">copy</span><span cla <span class="Delimiter">:(scenario new_error)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:num/<span class="Special">raw <- </span><span class="Normal">new</span> number:type ] -<span class="traceContains">+error: main: product of 'new' has incorrect type: '1:number/raw <- new number:type'</span> +<span class="traceContains">+error: main: product of 'new' has incorrect type: '1:num/raw <- new number:type'</span> <span class="Delimiter">:(after "Update NEW product in Check")</span> canonize_type<span class="Delimiter">(</span>product<span class="Delimiter">);</span> @@ -306,12 +306,12 @@ canonize_type<span class="Delimiter">(</span>product<span class="Delimiter">);</ <span class="Delimiter">:(scenario copy_array_indirect)</span> def main [ <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">2</span>:array:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:array:number/lookup + <span class="Constant">11</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">1</span>:address:array:num<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">2</span>:array:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:array:num/lookup ] <span class="traceContains">+mem: storing 3 in location 2</span> <span class="traceContains">+mem: storing 14 in location 3</span> @@ -320,9 +320,9 @@ def main [ <span class="Delimiter">:(scenario create_array_indirect)</span> def main [ - <span class="Constant">1000</span>:number/<span class="Special">raw <- </span>copy <span class="Constant">1</span> <span class="Comment"># pretend refcount</span> - <span class="Constant">1</span>:address:array:number:<span class="Constant">3</span><span class="Special"> <- </span>copy <span class="Constant">1000</span>/unsafe <span class="Comment"># pretend allocation</span> - <span class="Constant">1</span>:address:array:number:<span class="Constant">3</span>/lookup<span class="Special"> <- </span>create-array + <span class="Constant">1000</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">1</span> <span class="Comment"># pretend refcount</span> + <span class="Constant">1</span>:address:array:num:<span class="Constant">3</span><span class="Special"> <- </span>copy <span class="Constant">1000</span>/unsafe <span class="Comment"># pretend allocation</span> + <span class="Constant">1</span>:address:array:num:<span class="Constant">3</span>/lookup<span class="Special"> <- </span>create-array ] <span class="traceContains">+mem: storing 3 in location 1001</span> @@ -334,12 +334,12 @@ canonize<span class="Delimiter">(</span>product<span class="Delimiter">);</span> <span class="Delimiter">:(scenario index_indirect)</span> def main [ <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">2</span>:number<span class="Special"> <- </span>index <span class="Constant">1</span>:address:array:number/lookup<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">11</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">1</span>:address:array:num<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">2</span>:num<span class="Special"> <- </span>index <span class="Constant">1</span>:address:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 15 in location 2</span> @@ -358,25 +358,25 @@ canonize<span class="Delimiter">(</span>index<span class="Delimiter">);</span> <span class="Delimiter">:(scenario put_index_indirect)</span> def main [ <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">1</span>:address:array:number/lookup<span class="Special"> <- </span>put-index <span class="Constant">1</span>:address:array:number/lookup<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">11</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">1</span>:address:array:num<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">1</span>:address:array:num/lookup<span class="Special"> <- </span>put-index <span class="Constant">1</span>:address:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span> ] <span class="traceContains">+mem: storing 34 in location 13</span> <span class="Delimiter">:(scenario put_index_indirect_2)</span> def main [ - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">5</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">5</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>put-index <span class="Constant">1</span>:array:number:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span>:address:number/lookup<span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>put-index <span class="Constant">1</span>:array:num:<span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span>:address:num/lookup<span class="Delimiter">,</span> <span class="Constant">34</span> ] <span class="traceContains">+mem: storing 34 in location 3</span> @@ -384,14 +384,14 @@ def main [ <span class="Special">% Hide_errors = true;</span> def main [ <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span>put-index <span class="Constant">1</span>:address:array:number/lookup<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">11</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">1</span>:address:array:num<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">1</span>:address:array:num<span class="Special"> <- </span>put-index <span class="Constant">1</span>:address:array:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span> ] -<span class="traceContains">+error: main: product of 'put-index' must be first ingredient '1:address:array:number/lookup', but got '1:address:array:number'</span> +<span class="traceContains">+error: main: product of 'put-index' must be first ingredient '1:address:array:num/lookup', but got '1:address:array:num'</span> <span class="Delimiter">:(before "End PUT_INDEX Product Checks")</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> p = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> @@ -406,10 +406,10 @@ reagent<span class="Comment">/*</span><span class="Comment">copy</span><span cla <span class="Delimiter">:(scenario dilated_reagent_in_static_array)</span> def main [ <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> <- </span>create-array - <span class="Constant">5</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> <- </span>put-index <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)},</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">5</span>:address:number - *<span class="Constant">5</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">6</span>:number<span class="Special"> <- </span>copy *<span class="Constant">5</span>:address:number + <span class="Constant">5</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> <- </span>put-index <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)},</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">5</span>:address:num + *<span class="Constant">5</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>copy *<span class="Constant">5</span>:address:num ] <span class="traceContains">+run: creating array of size 4</span> <span class="traceContains">+mem: storing 34 in location 6</span> @@ -429,12 +429,12 @@ canonize<span class="Delimiter">(</span>index<span class="Delimiter">);</span> <span class="Delimiter">:(scenario length_indirect)</span> def main [ <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">14</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">15</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">16</span> - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">2</span>:number<span class="Special"> <- </span>length <span class="Constant">1</span>:address:array:number/lookup + <span class="Constant">11</span>:array:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">14</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">15</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">16</span> + <span class="Constant">1</span>:address:array:num<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">2</span>:num<span class="Special"> <- </span>length <span class="Constant">1</span>:address:array:num/lookup ] <span class="traceContains">+mem: storing 3 in location 2</span> @@ -448,7 +448,7 @@ def main [ <span class="Comment"># 10 reserved for refcount</span> <span class="Constant">11</span>:number-<span class="Normal">or</span>-point<span class="Special"> <- </span>merge <span class="Constant">0</span>/number<span class="Delimiter">,</span> <span class="Constant">34</span> <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">3</span>:boolean<span class="Special"> <- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> i:variant + <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> i:variant ] <span class="traceContains">+mem: storing 1 in location 3</span> <span class="traceContains">+mem: storing 34 in location 2</span> @@ -458,8 +458,8 @@ def main [ <span class="Comment"># 10 reserved for refcount</span> <span class="Constant">11</span>:number-<span class="Normal">or</span>-point<span class="Special"> <- </span>merge <span class="Constant">0</span>/number<span class="Delimiter">,</span> <span class="Constant">34</span> <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">2</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe - <span class="Constant">2</span>:address:number/lookup<span class="Delimiter">,</span> <span class="Constant">3</span>:boolean<span class="Special"> <- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> i:variant + <span class="Constant">2</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe + <span class="Constant">2</span>:address:num/lookup<span class="Delimiter">,</span> <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> i:variant ] <span class="traceContains">+mem: storing 1 in location 3</span> <span class="traceContains">+mem: storing 34 in location 21</span> @@ -469,8 +469,8 @@ def main [ <span class="Comment"># 10 reserved for refcount</span> <span class="Constant">11</span>:number-<span class="Normal">or</span>-point<span class="Special"> <- </span>merge <span class="Constant">0</span>/number<span class="Delimiter">,</span> <span class="Constant">34</span> <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">2</span>:address:boolean<span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe - <span class="Constant">3</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:address:boolean/lookup<span class="Special"> <- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> i:variant + <span class="Constant">2</span>:address:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe + <span class="Constant">3</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:address:<span class="Normal">bool</span>/lookup<span class="Special"> <- </span>maybe-convert <span class="Constant">1</span>:address:number-<span class="Normal">or</span>-point/lookup<span class="Delimiter">,</span> i:variant ] <span class="traceContains">+mem: storing 1 in location 21</span> <span class="traceContains">+mem: storing 34 in location 3</span> diff --git a/html/036refcount.cc.html b/html/036refcount.cc.html index ef642de8..2b42b63f 100644 --- a/html/036refcount.cc.html +++ b/html/036refcount.cc.html @@ -39,10 +39,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario refcounts)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">1000</span>/unsafe - <span class="Constant">2</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:number - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">1000</span>/unsafe + <span class="Constant">2</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:num + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+run: {1: ("address" "number")} <- copy {1000: "literal", "unsafe": ()}</span> <span class="traceContains">+mem: incrementing refcount of 1000: 0 -> 1</span> @@ -123,9 +123,9 @@ def main [ <span class="Delimiter">:(scenario refcounts_reflexive)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Comment"># idempotent copies leave refcount unchanged</span> - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:number + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:num ] <span class="traceContains">+run: {1: ("address" "number")} <- new {number: "type"}</span> <span class="traceContains">+mem: incrementing refcount of 1000: 0 -> 1</span> @@ -135,14 +135,14 @@ def main [ <span class="Delimiter">:(scenario refcounts_call)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Comment"># passing in addresses to recipes increments refcount</span> - foo <span class="Constant">1</span>:address:number + foo <span class="Constant">1</span>:address:num <span class="Comment"># return does NOT yet decrement refcount; memory must be explicitly managed</span> - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type ] def foo [ - <span class="Constant">2</span>:address:number<span class="Special"> <- </span>next-ingredient + <span class="Constant">2</span>:address:num<span class="Special"> <- </span>next-ingredient ] <span class="traceContains">+run: {1: ("address" "number")} <- new {number: "type"}</span> <span class="traceContains">+mem: incrementing refcount of 1000: 0 -> 1</span> @@ -158,12 +158,12 @@ def foo [ <span class="Delimiter">:(scenario refcounts_put)</span> container foo [ - <span class="Normal">x</span>:address:number + <span class="Normal">x</span>:address:num ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Constant">2</span>:address:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type - *<span class="Constant">2</span>:address:foo<span class="Special"> <- </span>put *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> x:offset<span class="Delimiter">,</span> <span class="Constant">1</span>:address:number + *<span class="Constant">2</span>:address:foo<span class="Special"> <- </span>put *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> x:offset<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num ] <span class="traceContains">+run: {1: ("address" "number")} <- new {number: "type"}</span> <span class="traceContains">+mem: incrementing refcount of 1000: 0 -> 1</span> @@ -181,9 +181,9 @@ update_any_refcounts<span class="Delimiter">(</span>element<span class="Delimite <span class="Delimiter">:(scenario refcounts_put_index)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Constant">2</span>:address:array:address:number<span class="Special"> <- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span> - *<span class="Constant">2</span>:address:array:address:number<span class="Special"> <- </span>put-index *<span class="Constant">2</span>:address:array:address:number<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:number + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:address:array:address:num<span class="Special"> <- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span> + *<span class="Constant">2</span>:address:array:address:num<span class="Special"> <- </span>put-index *<span class="Constant">2</span>:address:array:address:num<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num ] <span class="traceContains">+run: {1: ("address" "number")} <- new {number: "type"}</span> <span class="traceContains">+mem: incrementing refcount of 1000: 0 -> 1</span> @@ -198,13 +198,13 @@ update_any_refcounts<span class="Delimiter">(</span>element<span class="Delimite <span class="Delimiter">:(scenario refcounts_maybe_convert)</span> exclusive-container foo [ - <span class="Normal">x</span>:number - <span class="Normal">p</span>:address:number + <span class="Normal">x</span>:num + <span class="Normal">p</span>:address:num ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/p<span class="Delimiter">,</span> <span class="Constant">1</span>:address:number - <span class="Constant">4</span>:address:number<span class="Delimiter">,</span> <span class="Constant">5</span>:boolean<span class="Special"> <- </span>maybe-convert <span class="Constant">2</span>:foo<span class="Delimiter">,</span> <span class="Constant">1</span>:variant/p + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/p<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num + <span class="Constant">4</span>:address:num<span class="Delimiter">,</span> <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert <span class="Constant">2</span>:foo<span class="Delimiter">,</span> <span class="Constant">1</span>:variant/p ] <span class="traceContains">+run: {1: ("address" "number")} <- new {number: "type"}</span> <span class="traceContains">+mem: incrementing refcount of 1000: 0 -> 1</span> @@ -226,12 +226,12 @@ update_any_refcounts<span class="Delimiter">(</span>product<span class="Delimite <span class="Delimiter">:(scenario refcounts_copy_nested)</span> container foo [ - <span class="Normal">x</span>:address:number <span class="Comment"># address inside container</span> + <span class="Normal">x</span>:address:num <span class="Comment"># address inside container</span> ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Constant">2</span>:address:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type - *<span class="Constant">2</span>:address:foo<span class="Special"> <- </span>put *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> x:offset<span class="Delimiter">,</span> <span class="Constant">1</span>:address:number + *<span class="Constant">2</span>:address:foo<span class="Special"> <- </span>put *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> x:offset<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num <span class="Constant">3</span>:foo<span class="Special"> <- </span>copy *<span class="Constant">2</span>:address:foo ] <span class="traceContains">+transform: compute address offsets for container foo</span> @@ -350,7 +350,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">}</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-></span>left<span class="Delimiter">-></span>name == <span class="Constant">"array"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Normal">const</span> type_tree* element_type = type<span class="Delimiter">-></span>right<span class="Delimiter">;</span> - <span class="Comment">// hack: support both array:number:3 and array:address:number</span> + <span class="Comment">// hack: support both array:num:3 and array:address:num</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!element_type<span class="Delimiter">-></span>atom && element_type<span class="Delimiter">-></span>right && element_type<span class="Delimiter">-></span>right<span class="Delimiter">-></span>atom && is_integer<span class="Delimiter">(</span>element_type<span class="Delimiter">-></span>right<span class="Delimiter">-></span>name<span class="Delimiter">))</span> element_type = element_type<span class="Delimiter">-></span>left<span class="Delimiter">;</span> compute_container_address_offsets<span class="Delimiter">(</span>element_type<span class="Delimiter">);</span> @@ -464,7 +464,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Normal">int</span> old_size = SIZE<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span> <span class="Comment">// define a container with an address at offset 0 that we have the size for</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:address:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:address:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:foo"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> <span class="Comment">// need to first pre-populate the metadata</span> @@ -496,8 +496,8 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Normal">int</span> old_size = SIZE<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span> <span class="Comment">// define a container with an address at offset 1 that we have the size for</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" y:address:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" y:address:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:foo"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> <span class="Comment">// need to first pre-populate the metadata</span> @@ -529,8 +529,8 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Normal">int</span> old_size = SIZE<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span> <span class="Comment">// define a container with a nested container containing an address</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:address:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" y:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:address:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" y:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"container bar [</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" p:point</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -566,7 +566,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Normal">int</span> old_size = SIZE<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span> <span class="Comment">// define a container with an address at offset 0</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:address:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:address:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:address:foo"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> <span class="Comment">// need to first pre-populate the metadata</span> @@ -591,7 +591,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Normal">int</span> old_size = SIZE<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span> <span class="Comment">// define a container with an address at offset 0</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:address:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:address:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:array:foo"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> <span class="Comment">// need to first pre-populate the metadata</span> @@ -616,7 +616,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Normal">int</span> old_size = SIZE<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span> <span class="Comment">// define a container with an address at offset 0</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:address:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:address:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:address:array:foo"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> <span class="Comment">// need to first pre-populate the metadata</span> @@ -641,7 +641,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Normal">int</span> old_size = SIZE<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span> <span class="Comment">// define a container with an address at offset 0</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:address:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:address:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:array:foo:10"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> <span class="Comment">// need to first pre-populate the metadata</span> @@ -666,7 +666,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Normal">int</span> old_size = SIZE<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span> <span class="Comment">// define a container with an address at offset 0</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:address:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:address:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:address:array:foo:10"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> <span class="Comment">// need to first pre-populate the metadata</span> @@ -691,7 +691,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Normal">int</span> old_size = SIZE<span class="Delimiter">(</span>Container_metadata<span class="Delimiter">);</span> <span class="Comment">// define a container with an address at offset 0</span> run<span class="Delimiter">(</span><span class="Constant">"container foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:address:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:address:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> <span class="Comment">// scan a deep nest of 'address' and 'array' types modifying a container</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:address:array:address:address:array:foo:10"</span><span class="Delimiter">);</span> @@ -756,11 +756,11 @@ container foo [ <span class="Normal">a</span>:bar <span class="Comment"># contains an address</span> ] container bar [ - <span class="Normal">x</span>:address:number + <span class="Normal">x</span>:address:num ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Constant">2</span>:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>:address:number + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>:address:num <span class="Constant">3</span>:address:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type *<span class="Constant">3</span>:address:foo<span class="Special"> <- </span>put *<span class="Constant">3</span>:address:foo<span class="Delimiter">,</span> a:offset<span class="Delimiter">,</span> <span class="Constant">2</span>:bar ] @@ -774,11 +774,11 @@ def main [ <span class="Delimiter">:(scenario refcounts_put_index_array)</span> container bar [ - <span class="Normal">x</span>:address:number + <span class="Normal">x</span>:address:num ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Constant">2</span>:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>:address:number + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>:address:num <span class="Constant">3</span>:address:array:bar<span class="Special"> <- </span><span class="Normal">new</span> bar:type<span class="Delimiter">,</span> <span class="Constant">3</span> *<span class="Constant">3</span>:address:array:bar<span class="Special"> <- </span>put-index *<span class="Constant">3</span>:address:array:bar<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar ] @@ -792,17 +792,17 @@ def main [ <span class="Delimiter">:(scenario refcounts_maybe_convert_container)</span> exclusive-container foo [ - <span class="Normal">a</span>:number + <span class="Normal">a</span>:num <span class="Normal">b</span>:bar <span class="Comment"># contains an address</span> ] container bar [ - <span class="Normal">x</span>:address:number + <span class="Normal">x</span>:address:num ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Constant">2</span>:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>:address:number + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>:address:num <span class="Constant">3</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">2</span>:bar - <span class="Constant">5</span>:bar<span class="Delimiter">,</span> <span class="Constant">6</span>:boolean<span class="Special"> <- </span>maybe-convert <span class="Constant">3</span>:foo<span class="Delimiter">,</span> <span class="Constant">1</span>:variant/b + <span class="Constant">5</span>:bar<span class="Delimiter">,</span> <span class="Constant">6</span>:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert <span class="Constant">3</span>:foo<span class="Delimiter">,</span> <span class="Constant">1</span>:variant/b ] <span class="traceContains">+run: {1: ("address" "number")} <- new {number: "type"}</span> <span class="traceContains">+mem: incrementing refcount of 1000: 0 -> 1</span> @@ -819,17 +819,17 @@ container foo [ <span class="Normal">b</span>:curr <span class="Comment"># contains addresses</span> ] container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] container curr [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:address:number <span class="Comment"># address inside container inside container</span> + <span class="Normal">x</span>:num + <span class="Normal">y</span>:address:num <span class="Comment"># address inside container inside container</span> ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Constant">2</span>:address:curr<span class="Special"> <- </span><span class="Normal">new</span> curr:type - *<span class="Constant">2</span>:address:curr<span class="Special"> <- </span>put *<span class="Constant">2</span>:address:curr<span class="Delimiter">,</span> <span class="Constant">1</span>:offset/y<span class="Delimiter">,</span> <span class="Constant">1</span>:address:number + *<span class="Constant">2</span>:address:curr<span class="Special"> <- </span>put *<span class="Constant">2</span>:address:curr<span class="Delimiter">,</span> <span class="Constant">1</span>:offset/y<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num <span class="Constant">3</span>:address:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type *<span class="Constant">3</span>:address:foo<span class="Special"> <- </span>put *<span class="Constant">3</span>:address:foo<span class="Delimiter">,</span> <span class="Constant">1</span>:offset/b<span class="Delimiter">,</span> *<span class="Constant">2</span>:address:curr <span class="Constant">4</span>:foo<span class="Special"> <- </span>copy *<span class="Constant">3</span>:address:foo @@ -851,21 +851,21 @@ def main [ <span class="Delimiter">:(scenario refcounts_copy_exclusive_container_within_container)</span> container foo [ - <span class="Normal">a</span>:number + <span class="Normal">a</span>:num <span class="Normal">b</span>:bar ] exclusive-container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number - <span class="Normal">z</span>:address:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num + <span class="Normal">z</span>:address:num ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Constant">2</span>:bar<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span> <span class="Constant">3</span>:foo<span class="Special"> <- </span>merge <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">2</span>:bar <span class="Constant">5</span>:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">35</span> <span class="Constant">6</span>:foo<span class="Special"> <- </span>merge <span class="Constant">13</span><span class="Delimiter">,</span> <span class="Constant">5</span>:bar - <span class="Constant">8</span>:bar<span class="Special"> <- </span>merge <span class="Constant">2</span>/z<span class="Delimiter">,</span> <span class="Constant">1</span>:address:number + <span class="Constant">8</span>:bar<span class="Special"> <- </span>merge <span class="Constant">2</span>/z<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num <span class="Constant">9</span>:foo<span class="Special"> <- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">8</span>:bar <span class="Constant">11</span>:foo<span class="Special"> <- </span>copy <span class="Constant">9</span>:foo ] @@ -881,19 +881,19 @@ def main [ <span class="Delimiter">:(scenario refcounts_copy_container_within_exclusive_container)</span> exclusive-container foo [ - <span class="Normal">a</span>:number + <span class="Normal">a</span>:num <span class="Normal">b</span>:bar ] container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number - <span class="Normal">z</span>:address:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num + <span class="Normal">z</span>:address:num ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">34</span> <span class="Constant">6</span>:foo<span class="Special"> <- </span>merge <span class="Constant">0</span>/a<span class="Delimiter">,</span> <span class="Constant">35</span> - <span class="Constant">10</span>:bar<span class="Special"> <- </span>merge <span class="Constant">2</span>/x<span class="Delimiter">,</span> <span class="Constant">15</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:address:number + <span class="Constant">10</span>:bar<span class="Special"> <- </span>merge <span class="Constant">2</span>/x<span class="Delimiter">,</span> <span class="Constant">15</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num <span class="Constant">13</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">10</span>:bar <span class="Constant">17</span>:foo<span class="Special"> <- </span>copy <span class="Constant">13</span>:foo ] @@ -909,16 +909,16 @@ def main [ <span class="Delimiter">:(scenario refcounts_copy_exclusive_container_within_exclusive_container)</span> exclusive-container foo [ - <span class="Normal">a</span>:number + <span class="Normal">a</span>:num <span class="Normal">b</span>:bar ] exclusive-container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:address:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:address:num ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Constant">10</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:address:number + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">10</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/b<span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num <span class="Constant">20</span>:foo<span class="Special"> <- </span>copy <span class="Constant">10</span>:foo ] <span class="traceContains">+run: {1: ("address" "number")} <- new {number: "type"}</span> @@ -931,13 +931,13 @@ def main [ <span class="Delimiter">:(scenario refcounts_copy_array_within_container)</span> container foo [ - <span class="Normal">x</span>:address:array:number + <span class="Normal">x</span>:address:array:num ] def main [ - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">3</span> - <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>:address:array:number - <span class="Constant">3</span>:address:array:number<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">5</span> - <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">3</span>:address:array:number + <span class="Constant">1</span>:address:array:num<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">3</span> + <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>:address:array:num + <span class="Constant">3</span>:address:array:num<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">3</span>:address:array:num ] <span class="traceContains">+run: {1: ("address" "array" "number")} <- new {number: "type"}, {3: "literal"}</span> <span class="traceContains">+mem: incrementing refcount of 1000: 0 -> 1</span> @@ -948,24 +948,24 @@ def main [ <span class="Delimiter">:(scenario refcounts_handle_exclusive_containers_with_different_tags)</span> container foo1 [ - <span class="Normal">x</span>:address:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:address:num + <span class="Normal">y</span>:num ] container foo2 [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:address:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:address:num ] exclusive-container bar [ <span class="Normal">a</span>:foo1 <span class="Normal">b</span>:foo2 ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">12000</span>/unsafe <span class="Comment"># pretend allocation</span> - *<span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:bar<span class="Special"> <- </span>merge <span class="Constant">0</span>/foo1<span class="Delimiter">,</span> <span class="Constant">1</span>:address:number<span class="Delimiter">,</span> <span class="Constant">97</span> - <span class="Constant">5</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">13000</span>/unsafe <span class="Comment"># pretend allocation</span> - *<span class="Constant">5</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">6</span>:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>/foo2<span class="Delimiter">,</span> <span class="Constant">98</span><span class="Delimiter">,</span> <span class="Constant">5</span>:address:number + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">12000</span>/unsafe <span class="Comment"># pretend allocation</span> + *<span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:bar<span class="Special"> <- </span>merge <span class="Constant">0</span>/foo1<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num<span class="Delimiter">,</span> <span class="Constant">97</span> + <span class="Constant">5</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">13000</span>/unsafe <span class="Comment"># pretend allocation</span> + *<span class="Constant">5</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">6</span>:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>/foo2<span class="Delimiter">,</span> <span class="Constant">98</span><span class="Delimiter">,</span> <span class="Constant">5</span>:address:num <span class="Constant">2</span>:bar<span class="Special"> <- </span>copy <span class="Constant">6</span>:bar ] <span class="traceContains">+run: {2: "bar"} <- merge {0: "literal", "foo1": ()}, {1: ("address" "number")}, {97: "literal"}</span> diff --git a/html/037abandon.cc.html b/html/037abandon.cc.html index a6d10bee..6984c154 100644 --- a/html/037abandon.cc.html +++ b/html/037abandon.cc.html @@ -38,12 +38,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario new_reclaim)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:number <span class="Comment"># because 1 will get reset during abandon below</span> - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># abandon</span> - <span class="Constant">3</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Comment"># must be same size as abandoned memory to reuse</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span>:address:number - <span class="Constant">5</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">4</span>:number + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:num <span class="Comment"># because 1 will get reset during abandon below</span> + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># abandon</span> + <span class="Constant">3</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Comment"># must be same size as abandoned memory to reuse</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span>:address:num + <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">4</span>:num ] <span class="Comment"># both allocations should have returned the same address</span> <span class="traceContains">+mem: storing 1 in location 5</span> @@ -110,34 +110,34 @@ map<<span class="Normal">int</span><span class="Delimiter">,</span> <span cla <span class="Delimiter">:(scenario new_differing_size_no_reclaim)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:number - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># abandon</span> - <span class="Constant">3</span>:address:array:number<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">2</span> <span class="Comment"># different size</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span>:address:array:number - <span class="Constant">5</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">4</span>:number + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:num + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># abandon</span> + <span class="Constant">3</span>:address:array:num<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">2</span> <span class="Comment"># different size</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span>:address:array:num + <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">4</span>:num ] <span class="Comment"># no reuse</span> <span class="traceContains">+mem: storing 0 in location 5</span> <span class="Delimiter">:(scenario new_reclaim_array)</span> def main [ - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">2</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:array:number - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># abandon</span> - <span class="Constant">3</span>:address:array:number<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">2</span> <span class="Comment"># same size</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span>:address:array:number - <span class="Constant">5</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">4</span>:number + <span class="Constant">1</span>:address:array:num<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:array:num + <span class="Constant">1</span>:address:array:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># abandon</span> + <span class="Constant">3</span>:address:array:num<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">2</span> <span class="Comment"># same size</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span>:address:array:num + <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">4</span>:num ] <span class="Comment"># both calls to new returned identical addresses</span> <span class="traceContains">+mem: storing 1 in location 5</span> <span class="Delimiter">:(scenario abandon_on_overwrite)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Comment"># over-writing one allocation with another</span> - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+run: {1: ("address" "number")} <- new {number: "type"}</span> <span class="traceContains">+mem: incrementing refcount of 1000: 0 -> 1</span> @@ -146,15 +146,15 @@ def main [ <span class="Delimiter">:(scenario abandon_after_call)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Comment"># passing in addresses to recipes increments refcount</span> - foo <span class="Constant">1</span>:address:number - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + foo <span class="Constant">1</span>:address:num + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] def foo [ - <span class="Constant">2</span>:address:number<span class="Special"> <- </span>next-ingredient + <span class="Constant">2</span>:address:num<span class="Special"> <- </span>next-ingredient <span class="Comment"># return does NOT yet decrement refcount; memory must be explicitly managed</span> - <span class="Constant">2</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+run: {1: ("address" "number")} <- new {number: "type"}</span> <span class="traceContains">+mem: incrementing refcount of 1000: 0 -> 1</span> @@ -170,12 +170,12 @@ def foo [ <span class="Delimiter">:(scenario abandon_on_overwrite_array)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">30</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">30</span> <span class="Comment"># allocate an array</span> - <span class="Constant">10</span>:address:array:number<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">20</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span>:address:array:number <span class="Comment"># doesn't increment refcount</span> + <span class="Constant">10</span>:address:array:num<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">20</span> + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span>:address:array:num <span class="Comment"># doesn't increment refcount</span> <span class="Comment"># allocate another array in its place, implicitly freeing the previous allocation</span> - <span class="Constant">10</span>:address:array:number<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">25</span> + <span class="Constant">10</span>:address:array:num<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">25</span> ] <span class="traceContains">+run: {10: ("address" "array" "number")} <- new {number: "type"}, {25: "literal"}</span> <span class="Comment"># abandoned array is of old size (20, not 25)</span> @@ -184,13 +184,13 @@ def main [ <span class="Delimiter">:(scenario refcounts_abandon_address_in_container)</span> <span class="Comment"># container containing an address</span> container foo [ - <span class="Normal">x</span>:address:number + <span class="Normal">x</span>:address:num ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Constant">2</span>:address:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type - *<span class="Constant">2</span>:address:foo<span class="Special"> <- </span>put *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> x:offset<span class="Delimiter">,</span> <span class="Constant">1</span>:address:number - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + *<span class="Constant">2</span>:address:foo<span class="Special"> <- </span>put *<span class="Constant">2</span>:address:foo<span class="Delimiter">,</span> x:offset<span class="Delimiter">,</span> <span class="Constant">1</span>:address:num + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Constant">2</span>:address:foo<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+run: {1: ("address" "number")} <- new {number: "type"}</span> @@ -213,11 +213,11 @@ def main [ <span class="Comment"># todo: move past dilated reagent</span> <span class="Delimiter">:(scenario refcounts_abandon_address_in_array)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Constant">2</span>:address:array:address:number<span class="Special"> <- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span> - *<span class="Constant">2</span>:address:array:address:number<span class="Special"> <- </span>put-index *<span class="Constant">2</span>:address:array:address:number<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:number - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:address:array:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:address:array:address:num<span class="Special"> <- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span> + *<span class="Constant">2</span>:address:array:address:num<span class="Special"> <- </span>put-index *<span class="Constant">2</span>:address:array:address:num<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span>:address:num + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:address:array:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+run: {1: ("address" "number")} <- new {number: "type"}</span> <span class="traceContains">+mem: incrementing refcount of 1000: 0 -> 1</span> @@ -233,14 +233,14 @@ def main [ <span class="Delimiter">:(scenario refcounts_abandon_address_in_container_in_array)</span> <span class="Comment"># container containing an address</span> container foo [ - <span class="Normal">x</span>:address:number + <span class="Normal">x</span>:address:num ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:address:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Constant">2</span>:address:array:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type<span class="Delimiter">,</span> <span class="Constant">3</span> - <span class="Constant">3</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>:address:number + <span class="Constant">3</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>:address:num *<span class="Constant">2</span>:address:array:foo<span class="Special"> <- </span>put-index *<span class="Constant">2</span>:address:array:foo<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">3</span>:foo - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:address:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Constant">3</span>:foo<span class="Special"> <- </span>merge <span class="Constant">0</span> <span class="Constant">2</span>:address:array:foo<span class="Special"> <- </span>copy <span class="Constant">0</span> ] diff --git a/html/038new_text.cc.html b/html/038new_text.cc.html index f9565ba4..81b50bde 100644 --- a/html/038new_text.cc.html +++ b/html/038new_text.cc.html @@ -32,40 +32,44 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color </head> <body> <pre id='vimCodeElement'> -<span class="Comment">//: Extend 'new' to handle a unicode string literal argument.</span> +<span class="Comment">//: Extend 'new' to handle a unicode string literal argument or 'text'.</span> + +<span class="Comment">//: A Mu text is an address to an array of characters.</span> +<span class="Delimiter">:(before "End Mu Types Initialization")</span> +put<span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">"text"</span><span class="Delimiter">,</span> new_type_tree<span class="Delimiter">(</span><span class="Constant">"address:array:character"</span><span class="Delimiter">));</span> <span class="Delimiter">:(scenario new_string)</span> def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc def] - <span class="Constant">2</span>:character<span class="Special"> <- </span>index *<span class="Constant">1</span>:address:array:character<span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc def] + <span class="Constant">2</span>:<span class="Normal">char</span><span class="Special"> <- </span>index *<span class="Constant">1</span>:text<span class="Delimiter">,</span> <span class="Constant">5</span> ] <span class="Comment"># number code for 'e'</span> <span class="traceContains">+mem: storing 101 in location 2</span> <span class="Delimiter">:(scenario new_string_handles_unicode)</span> def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [a«c] - <span class="Constant">2</span>:number<span class="Special"> <- </span>length *<span class="Constant">1</span>:address:array:character - <span class="Constant">3</span>:character<span class="Special"> <- </span>index *<span class="Constant">1</span>:address:array:character<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [a«c] + <span class="Constant">2</span>:num<span class="Special"> <- </span>length *<span class="Constant">1</span>:text + <span class="Constant">3</span>:<span class="Normal">char</span><span class="Special"> <- </span>index *<span class="Constant">1</span>:text<span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 3 in location 2</span> <span class="Comment"># unicode for '«'</span> <span class="traceContains">+mem: storing 171 in location 3</span> <span class="Delimiter">:(before "End NEW Check Special-cases")</span> -<span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Identifier">break</span><span class="Delimiter">;</span> +<span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">:(before "Convert 'new' To 'allocate'")</span> -<span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">"new"</span> && is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> +<span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">"new"</span> && is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Delimiter">:(after "case NEW" following "Primitive Recipe Implementations")</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_text<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> - products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>new_mu_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">));</span> + products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>new_mu_text<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">));</span> trace<span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"new string alloc: "</span> << products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> <span class="Delimiter">:(code)</span> -<span class="Normal">int</span> new_mu_string<span class="Delimiter">(</span><span class="Normal">const</span> string& contents<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span class="Normal">int</span> new_mu_text<span class="Delimiter">(</span><span class="Normal">const</span> string& contents<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Comment">// allocate an array just large enough for it</span> <span class="Normal">int</span> string_length = unicode_length<span class="Delimiter">(</span>contents<span class="Delimiter">);</span> <span class="CommentedCode">//? Total_alloc += string_length+1;</span> @@ -96,48 +100,48 @@ def main [ <span class="Delimiter">:(scenario stash_string)</span> def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] - stash [foo:]<span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:character + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] + stash [foo:]<span class="Delimiter">,</span> <span class="Constant">1</span>:text ] <span class="traceContains">+app: foo: abc</span> <span class="Delimiter">:(before "End print Special-cases(r, data)")</span> -<span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_string<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_text<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Delimiter">{</span> assert<span class="Delimiter">(</span>scalar<span class="Delimiter">(</span>data<span class="Delimiter">));</span> - <span class="Identifier">return</span> read_mu_string<span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> + <span class="Identifier">return</span> read_mu_text<span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> <span class="Delimiter">}</span> <span class="Delimiter">:(scenario unicode_string)</span> def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [♠] - stash [foo:]<span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:character + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [♠] + stash [foo:]<span class="Delimiter">,</span> <span class="Constant">1</span>:text ] <span class="traceContains">+app: foo: ♠</span> <span class="Delimiter">:(scenario stash_space_after_string)</span> def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] - stash <span class="Constant">1</span>:address:array:character<span class="Delimiter">,</span> [foo] + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] + stash <span class="Constant">1</span>:text<span class="Delimiter">,</span> [foo] ] <span class="traceContains">+app: abc foo</span> <span class="Delimiter">:(scenario stash_string_as_array)</span> def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] - stash *<span class="Constant">1</span>:address:array:character + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] + stash *<span class="Constant">1</span>:text ] <span class="traceContains">+app: 3 97 98 99</span> <span class="Comment">//: fixes way more than just stash</span> -<span class="Delimiter">:(before "End Preprocess is_mu_string(reagent x)")</span> +<span class="Delimiter">:(before "End Preprocess is_mu_text(reagent x)")</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Comment">//: Allocate more to routine when initializing a literal string</span> <span class="Delimiter">:(scenario new_string_overflow)</span> <span class="Special">% Initial_memory_per_routine = 3;</span> def main [ - <span class="Constant">1</span>:address:number/<span class="Special">raw <- </span><span class="Normal">new</span> number:type - <span class="Constant">2</span>:address:array:character/<span class="Special">raw <- </span><span class="Normal">new</span> [a] <span class="Comment"># not enough room in initial page, if you take the refcount and array length into account</span> + <span class="Constant">1</span>:address:num/<span class="Special">raw <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:text/<span class="Special">raw <- </span><span class="Normal">new</span> [a] <span class="Comment"># not enough room in initial page, if you take the refcount and array length into account</span> ] <span class="traceContains">+new: routine allocated memory from 1000 to 1003</span> <span class="traceContains">+new: routine allocated memory from 1003 to 1006</span> @@ -156,7 +160,7 @@ def main [ <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span class="Delimiter">}</span> -string read_mu_string<span class="Delimiter">(</span><span class="Normal">int</span> address<span class="Delimiter">)</span> <span class="Delimiter">{</span> +string read_mu_text<span class="Delimiter">(</span><span class="Normal">int</span> address<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> ++address<span class="Delimiter">;</span> <span class="Comment">// skip refcount</span> <span class="Normal">int</span> size = get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">);</span> diff --git a/html/040brace.cc.html b/html/040brace.cc.html index 636f5d42..8ce5fff1 100644 --- a/html/040brace.cc.html +++ b/html/040brace.cc.html @@ -59,7 +59,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color def main [ <span class="Delimiter">{</span> <span class="Identifier">break</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> ] <span class="traceContains">+transform: --- transform braces for recipe main</span> @@ -181,10 +181,10 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenario loop)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> loop <span class="Delimiter">}</span> ] @@ -196,7 +196,7 @@ def main [ <span class="Delimiter">:(scenario break_empty_block)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="Identifier">break</span> <span class="Delimiter">}</span> @@ -207,7 +207,7 @@ def main [ <span class="Delimiter">:(scenario break_cascading)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="Identifier">break</span> <span class="Delimiter">}</span> @@ -222,11 +222,11 @@ def main [ <span class="Delimiter">:(scenario break_cascading_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="Identifier">break</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="Identifier">break</span> @@ -241,11 +241,11 @@ def main [ <span class="Delimiter">:(scenario break_if)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - <span class="Identifier">break</span>-<span class="Normal">if</span> <span class="Constant">2</span>:number - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Identifier">break</span>-<span class="Normal">if</span> <span class="Constant">2</span>:num + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="Identifier">break</span> @@ -260,36 +260,36 @@ def main [ <span class="Delimiter">:(scenario break_nested)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Identifier">break</span> <span class="Delimiter">{</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> ] <span class="traceContains">+transform: jump 4:offset</span> <span class="Delimiter">:(scenario break_nested_degenerate)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Identifier">break</span> <span class="Delimiter">{</span> <span class="Delimiter">}</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> ] <span class="traceContains">+transform: jump 3:offset</span> <span class="Delimiter">:(scenario break_nested_degenerate_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Identifier">break</span> <span class="Delimiter">{</span> <span class="Delimiter">}</span> @@ -300,7 +300,7 @@ def main [ <span class="Delimiter">:(scenario break_label)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="Identifier">break</span> +foo:offset <span class="Delimiter">}</span> @@ -309,11 +309,11 @@ def main [ <span class="Delimiter">:(scenario break_unless)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - <span class="Identifier">break</span>-unless <span class="Constant">2</span>:number - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Identifier">break</span>-unless <span class="Constant">2</span>:num + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> ] <span class="traceContains">+transform: --- transform braces for recipe main</span> @@ -324,11 +324,11 @@ def main [ <span class="Delimiter">:(scenario loop_unless)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - loop-unless <span class="Constant">2</span>:number - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + loop-unless <span class="Constant">2</span>:num + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> ] <span class="traceContains">+transform: --- transform braces for recipe main</span> @@ -339,14 +339,14 @@ def main [ <span class="Delimiter">:(scenario loop_nested)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> - loop-<span class="Normal">if</span> <span class="Constant">4</span>:boolean - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + loop-<span class="Normal">if</span> <span class="Constant">4</span>:<span class="Normal">bool</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> ] <span class="traceContains">+transform: --- transform braces for recipe main</span> @@ -354,9 +354,9 @@ def main [ <span class="Delimiter">:(scenario loop_label)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> +foo - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+transform: --- transform braces for recipe main</span> <span class="traceContains">+transform: copy ...</span> @@ -366,17 +366,17 @@ def main [ <span class="Delimiter">:(scenarios run)</span> <span class="Delimiter">:(scenario brace_conversion_and_run)</span> def test-factorial [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">5</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">5</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> <span class="Delimiter">{</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> - <span class="Identifier">break</span>-<span class="Normal">if</span> <span class="Constant">3</span>:boolean -<span class="Comment"># $print 1:number</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>multiply <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span>:number - <span class="Constant">1</span>:number<span class="Special"> <- </span>subtract <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Identifier">break</span>-<span class="Normal">if</span> <span class="Constant">3</span>:<span class="Normal">bool</span> +<span class="Comment"># $print 1:num</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>multiply <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span>:num + <span class="Constant">1</span>:num<span class="Special"> <- </span>subtract <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> loop <span class="Delimiter">}</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">2</span>:number <span class="Comment"># trigger a read</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">2</span>:num <span class="Comment"># trigger a read</span> ] <span class="traceContains">+mem: location 2 is 120</span> @@ -400,7 +400,7 @@ def main [ <span class="Delimiter">:(scenario return_if)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>test1 + <span class="Constant">1</span>:num<span class="Special"> <- </span>test1 ] def test1 [ <span class="Identifier">return</span>-<span class="Normal">if</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">34</span> @@ -410,7 +410,7 @@ def test1 [ <span class="Delimiter">:(scenario return_if_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>test1 + <span class="Constant">1</span>:num<span class="Special"> <- </span>test1 ] def test1 [ <span class="Identifier">return</span>-<span class="Normal">if</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span> diff --git a/html/041jump_target.cc.html b/html/041jump_target.cc.html index 8fb25054..766bd7da 100644 --- a/html/041jump_target.cc.html +++ b/html/041jump_target.cc.html @@ -45,7 +45,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario jump_to_label)</span> def main [ jump +target:label - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> +target ] <span class="traceAbsent">-mem: storing 0 in location 1</span> @@ -131,7 +131,7 @@ def main [ <span class="Delimiter">{</span> <span class="Delimiter">{</span> <span class="Identifier">break</span> +target:label - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> <span class="Delimiter">}</span> +target @@ -143,7 +143,7 @@ def main [ <span class="Delimiter">{</span> <span class="Delimiter">{</span> jump-<span class="Normal">if</span> <span class="Constant">1</span><span class="Delimiter">,</span> +target:label - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> <span class="Delimiter">}</span> +target @@ -155,7 +155,7 @@ def main [ <span class="Delimiter">{</span> <span class="Delimiter">{</span> loop-unless <span class="Constant">0</span><span class="Delimiter">,</span> +target:label <span class="Comment"># loop/break with a label don't care about braces</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> <span class="Delimiter">}</span> +target @@ -165,13 +165,13 @@ def main [ <span class="Delimiter">:(scenario jump_runs_code_after_label)</span> def main [ <span class="Comment"># first a few lines of padding to exercise the offset computation</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> jump +target:label - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> +target - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 0 in location 5</span> <span class="traceAbsent">-mem: storing 0 in location 4</span> @@ -194,9 +194,9 @@ def main [ <span class="Special">% Hide_errors = true;</span> def main [ +label - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> +label - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+error: main: duplicate label '+label'</span> @@ -204,13 +204,13 @@ def main [ <span class="Special">% Hide_errors = true;</span> def main [ <span class="Comment"># first a few lines of padding to exercise the offset computation</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> jump $target:label - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> $target - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+error: main: can't jump to label '$target'</span> </pre> diff --git a/html/042name.cc.html b/html/042name.cc.html index 97822b73..829cc216 100644 --- a/html/042name.cc.html +++ b/html/042name.cc.html @@ -41,7 +41,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario transform_names)</span> def main [ - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+name: assign x 1</span> <span class="traceContains">+mem: storing 0 in location 1</span> @@ -50,7 +50,7 @@ def main [ <span class="Delimiter">:(scenario transform_names_fails_on_use_before_define)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy y:number + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy y:num ] <span class="traceContains">+error: main: use before set: 'y'</span> <span class="Comment"># todo: detect conditional defines</span> @@ -193,7 +193,7 @@ type_ordinal skip_addresses<span class="Delimiter">(</span>type_tree* type<span <span class="Delimiter">:(scenario transform_names_supports_containers)</span> def main [ <span class="Normal">x</span>:point<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> - <span class="Normal">y</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Normal">y</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> ] <span class="traceContains">+name: assign x 1</span> <span class="Comment"># skip location 2 because x occupies two locations</span> @@ -201,8 +201,8 @@ def main [ <span class="Delimiter">:(scenario transform_names_supports_static_arrays)</span> def main [ - <span class="Normal">x</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array - <span class="Normal">y</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Normal">x</span>:@:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Normal">y</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> ] <span class="traceContains">+name: assign x 1</span> <span class="Comment"># skip locations 2, 3, 4 because x occupies four locations</span> @@ -211,7 +211,7 @@ def main [ <span class="Delimiter">:(scenario transform_names_passes_dummy)</span> <span class="Comment"># _ is just a dummy result that never gets consumed</span> def main [ - _<span class="Delimiter">,</span> x:number<span class="Special"> <- </span>copy <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span> + _<span class="Delimiter">,</span> x:num<span class="Special"> <- </span>copy <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+name: assign x 1</span> <span class="traceAbsent">-name: assign _ 1</span> @@ -221,37 +221,37 @@ def main [ <span class="Delimiter">:(scenario transform_names_passes_raw)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">x</span>:number/<span class="Special">raw <- </span>copy <span class="Constant">0</span> + <span class="Normal">x</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">0</span> ] <span class="traceAbsent">-name: assign x 1</span> -<span class="traceContains">+error: can't write to location 0 in 'x:number/raw <- copy 0'</span> +<span class="traceContains">+error: can't write to location 0 in 'x:num/raw <- copy 0'</span> <span class="Delimiter">:(scenarios transform)</span> <span class="Delimiter">:(scenario transform_names_fails_when_mixing_names_and_numeric_locations)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:number + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:num ] <span class="traceContains">+error: main: mixing variable names and numeric addresses</span> <span class="Delimiter">:(scenario transform_names_fails_when_mixing_names_and_numeric_locations_2)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy x:number + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy x:num ] <span class="traceContains">+error: main: mixing variable names and numeric addresses</span> <span class="Delimiter">:(scenario transform_names_does_not_fail_when_mixing_names_and_raw_locations)</span> def main [ - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:number/<span class="Special">raw</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:num/<span class="Special">raw</span> ] <span class="traceAbsent">-error: main: mixing variable names and numeric addresses</span> $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario transform_names_does_not_fail_when_mixing_names_and_literals)</span> def main [ - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> ] <span class="traceAbsent">-error: main: mixing variable names and numeric addresses</span> $error: <span class="Constant">0</span> @@ -261,9 +261,9 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario transform_names_transforms_container_elements)</span> def main [ - <span class="Normal">p</span>:address:point<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Normal">a</span>:number<span class="Special"> <- </span>get *p:address:point<span class="Delimiter">,</span> y:offset - <span class="Normal">b</span>:number<span class="Special"> <- </span>get *p:address:point<span class="Delimiter">,</span> x:offset + <span class="Normal">p</span>:&:point<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Normal">a</span>:num<span class="Special"> <- </span>get *p:&:point<span class="Delimiter">,</span> y:offset + <span class="Normal">b</span>:num<span class="Special"> <- </span>get *p:&:point<span class="Delimiter">,</span> x:offset ] <span class="traceContains">+name: element y of type point is at offset 1</span> <span class="traceContains">+name: element x of type point is at offset 0</span> @@ -295,7 +295,7 @@ def main [ <span class="Delimiter">:(scenario transform_names_handles_containers)</span> def main [ <span class="Normal">a</span>:point<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe - <span class="Normal">b</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe + <span class="Normal">b</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe ] <span class="traceContains">+name: assign a 1</span> <span class="traceContains">+name: assign b 3</span> @@ -305,10 +305,10 @@ def main [ <span class="Delimiter">:(scenarios run)</span> <span class="Delimiter">:(scenario transform_names_handles_exclusive_containers)</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> - <span class="Constant">20</span>:point<span class="Delimiter">,</span> <span class="Constant">22</span>:boolean<span class="Special"> <- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> p:variant + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">20</span>:point<span class="Delimiter">,</span> <span class="Constant">22</span>:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert <span class="Constant">12</span>:number-<span class="Normal">or</span>-point/unsafe<span class="Delimiter">,</span> p:variant ] <span class="traceContains">+name: variant p of type number-or-point has tag 1</span> <span class="traceContains">+mem: storing 1 in location 22</span> diff --git a/html/043space.cc.html b/html/043space.cc.html index 221f4ff2..036f7def 100644 --- a/html/043space.cc.html +++ b/html/043space.cc.html @@ -38,29 +38,35 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment">//: and all addresses in arguments are implicitly based on the 'default-space'</span> <span class="Comment">//: (unless they have the /raw property)</span> +<span class="Comment">//: A space is just an array of any scalar location.</span> +<span class="Delimiter">:(before "End Mu Types Initialization")</span> +put<span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">"space"</span><span class="Delimiter">,</span> new_type_tree<span class="Delimiter">(</span><span class="Constant">"address:array:location"</span><span class="Delimiter">));</span> +<span class="Comment">//: Spaces are often called 'scopes' in other languages.</span> +put<span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">"scope"</span><span class="Delimiter">,</span> new_type_tree<span class="Delimiter">(</span><span class="Constant">"address:array:location"</span><span class="Delimiter">));</span> + <span class="Delimiter">:(scenario set_default_space)</span> <span class="Comment"># if default-space is 10, and if an array of 5 locals lies from location 12 to 16 (inclusive),</span> <span class="Comment"># then local 0 is really location 12, local 1 is really location 13, and so on.</span> def main [ <span class="Comment"># pretend address:array:location; in practice we'll use new</span> - <span class="Constant">10</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> - <span class="Normal">default</span>-space:address:array:location<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">23</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> + <span class="Normal">default</span>-space:space<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">23</span> ] <span class="traceContains">+mem: storing 23 in location 13</span> <span class="Delimiter">:(scenario lookup_sidesteps_default_space)</span> def main [ <span class="Comment"># pretend pointer from outside (2000 reserved for refcount)</span> - <span class="Constant">2001</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2001</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># pretend address:array:location; in practice we'll use new</span> - <span class="Constant">1000</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> - <span class="Constant">1001</span>:number<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> + <span class="Constant">1000</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> + <span class="Constant">1001</span>:num<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> <span class="Comment"># actual start of this recipe</span> - <span class="Normal">default</span>-space:address:array:location<span class="Special"> <- </span>copy <span class="Constant">1000</span>/unsafe - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">2000</span>/unsafe <span class="Comment"># even local variables always contain raw addresses</span> - <span class="Constant">8</span>:number/<span class="Special">raw <- </span>copy *<span class="Constant">1</span>:address:number + <span class="Normal">default</span>-space:space<span class="Special"> <- </span>copy <span class="Constant">1000</span>/unsafe + <span class="Constant">1</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">2000</span>/unsafe <span class="Comment"># even local variables always contain raw addresses</span> + <span class="Constant">8</span>:num/<span class="Special">raw <- </span>copy *<span class="Constant">1</span>:&:num ] <span class="traceContains">+mem: storing 34 in location 8</span> @@ -68,7 +74,7 @@ def main [ <span class="Delimiter">:(scenario convert_names_passes_default_space)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">default</span>-space:number<span class="Delimiter">,</span> x:number<span class="Special"> <- </span>copy <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Normal">default</span>-space:num<span class="Delimiter">,</span> x:num<span class="Special"> <- </span>copy <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+name: assign x 1</span> <span class="traceAbsent">-name: assign default-space 1</span> @@ -131,8 +137,8 @@ absolutize<span class="Delimiter">(</span>x<span class="Delimiter">);</span> <span class="Delimiter">:(scenario get_default_space)</span> def main [ - <span class="Normal">default</span>-space:address:array:location<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">1</span>:address:array:location/<span class="Special">raw <- </span>copy <span class="Normal">default</span>-space:address:array:location + <span class="Normal">default</span>-space:space<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">1</span>:space/<span class="Special">raw <- </span>copy <span class="Normal">default</span>-space:space ] <span class="traceContains">+mem: storing 10 in location 1</span> @@ -148,15 +154,15 @@ def main [ <span class="Delimiter">:(scenario lookup_sidesteps_default_space_in_get)</span> def main [ <span class="Comment"># pretend pointer to container from outside (2000 reserved for refcount)</span> - <span class="Constant">2001</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2002</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">2001</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2002</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> <span class="Comment"># pretend address:array:location; in practice we'll use new</span> - <span class="Constant">1000</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> - <span class="Constant">1001</span>:number<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> + <span class="Constant">1000</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> + <span class="Constant">1001</span>:num<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> <span class="Comment"># actual start of this recipe</span> - <span class="Normal">default</span>-space:address:array:location<span class="Special"> <- </span>copy <span class="Constant">1000</span>/unsafe - <span class="Constant">1</span>:address:point<span class="Special"> <- </span>copy <span class="Constant">2000</span>/unsafe - <span class="Constant">9</span>:number/<span class="Special">raw <- </span>get *<span class="Constant">1</span>:address:point<span class="Delimiter">,</span> <span class="Constant">1</span>:offset + <span class="Normal">default</span>-space:space<span class="Special"> <- </span>copy <span class="Constant">1000</span>/unsafe + <span class="Constant">1</span>:&:point<span class="Special"> <- </span>copy <span class="Constant">2000</span>/unsafe + <span class="Constant">9</span>:num/<span class="Special">raw <- </span>get *<span class="Constant">1</span>:&:point<span class="Delimiter">,</span> <span class="Constant">1</span>:offset ] <span class="traceContains">+mem: storing 35 in location 9</span> @@ -168,16 +174,16 @@ element<span class="Delimiter">.</span>properties<span class="Delimiter">.</span <span class="Delimiter">:(scenario lookup_sidesteps_default_space_in_index)</span> def main [ <span class="Comment"># pretend pointer to array from outside (2000 reserved for refcount)</span> - <span class="Constant">2001</span>:number<span class="Special"> <- </span>copy <span class="Constant">2</span> <span class="Comment"># length</span> - <span class="Constant">2002</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2003</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">2001</span>:num<span class="Special"> <- </span>copy <span class="Constant">2</span> <span class="Comment"># length</span> + <span class="Constant">2002</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2003</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> <span class="Comment"># pretend address:array:location; in practice we'll use new</span> - <span class="Constant">1000</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> - <span class="Constant">1001</span>:number<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> + <span class="Constant">1000</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> + <span class="Constant">1001</span>:num<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> <span class="Comment"># actual start of this recipe</span> - <span class="Normal">default</span>-space:address:array:location<span class="Special"> <- </span>copy <span class="Constant">1000</span>/unsafe - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span>copy <span class="Constant">2000</span>/unsafe - <span class="Constant">9</span>:number/<span class="Special">raw <- </span>index *<span class="Constant">1</span>:address:array:number<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Normal">default</span>-space:space<span class="Special"> <- </span>copy <span class="Constant">1000</span>/unsafe + <span class="Constant">1</span>:&:@:num<span class="Special"> <- </span>copy <span class="Constant">2000</span>/unsafe + <span class="Constant">9</span>:num/<span class="Special">raw <- </span>index *<span class="Constant">1</span>:&:@:num<span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 35 in location 9</span> @@ -190,8 +196,8 @@ element<span class="Delimiter">.</span>properties<span class="Delimiter">.</span <span class="Delimiter">:(scenario new_default_space)</span> def main [ <span class="Normal">new</span>-<span class="Normal">default</span>-space - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Normal">y</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Normal">y</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> ] <span class="Comment"># allocate space for x and y, as well as the chaining slot at 0</span> <span class="traceContains">+mem: array length is 3</span> @@ -204,7 +210,7 @@ def main [ <span class="Delimiter">:(before "End Rewrite Instruction(curr, recipe result)")</span> <span class="Comment">// rewrite `new-default-space` to</span> -<span class="Comment">// `default-space:address:array:location <- new location:type, number-of-locals:literal`</span> +<span class="Comment">// `default-space:space <- new location:type, number-of-locals:literal`</span> <span class="Comment">// where N is Name[recipe][""]</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">"new-default-space"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> rewrite_default_space_instruction<span class="Delimiter">(</span>curr<span class="Delimiter">);</span> @@ -228,14 +234,14 @@ def main [ <span class="Delimiter">:(scenario local_scope)</span> def main [ - <span class="Constant">1</span>:address<span class="Special"> <- </span>foo - <span class="Constant">2</span>:address<span class="Special"> <- </span>foo - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:address<span class="Delimiter">,</span> <span class="Constant">2</span>:address + <span class="Constant">1</span>:&<span class="Special"> <- </span>foo + <span class="Constant">2</span>:&<span class="Special"> <- </span>foo + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:&<span class="Delimiter">,</span> <span class="Constant">2</span>:& ] def foo [ local-scope - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Identifier">return</span> <span class="Normal">default</span>-space:address:array:location + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Identifier">return</span> <span class="Normal">default</span>-space:space ] <span class="Comment"># both calls to foo should have received the same default-space</span> <span class="traceContains">+mem: storing 1 in location 3</span> @@ -243,9 +249,9 @@ def foo [ <span class="Delimiter">:(scenario local_scope_frees_up_addresses)</span> def main [ local-scope - <span class="Normal">x</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] + <span class="Normal">x</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] ] -<span class="traceContains">+mem: clearing x:address:array:character</span> +<span class="traceContains">+mem: clearing x:text</span> <span class="Delimiter">:(before "End Rewrite Instruction(curr, recipe result)")</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">"local-scope"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> @@ -340,21 +346,21 @@ Update_refcounts_in_write_memory = <span class="Constant">true</span><span class curr<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">"number-of-locals:literal"</span><span class="Delimiter">));</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> raise << <span class="Constant">"new-default-space can't take any results</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> - curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">"default-space:address:array:location"</span><span class="Delimiter">));</span> + curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">"default-space:space"</span><span class="Delimiter">));</span> <span class="Delimiter">}</span> <span class="Delimiter">:(scenario local_scope_frees_up_addresses_inside_containers)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:address:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:&:num ] def main [ local-scope - <span class="Normal">x</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Normal">y</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:address:number + <span class="Normal">x</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">y</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:&:num <span class="Comment"># x and y are both cleared when main returns</span> ] -<span class="traceContains">+mem: clearing x:address:number</span> +<span class="traceContains">+mem: clearing x:&:num</span> <span class="traceContains">+mem: decrementing refcount of 1006: 2 -> 1</span> <span class="traceContains">+mem: clearing y:foo</span> <span class="traceContains">+mem: decrementing refcount of 1006: 1 -> 0</span> @@ -362,24 +368,24 @@ def main [ <span class="Delimiter">:(scenario local_scope_returns_addresses_inside_containers)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:address:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:&:num ] def f [ local-scope - <span class="Normal">x</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - *x:address:number<span class="Special"> <- </span>copy <span class="Constant">12</span> - <span class="Normal">y</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:address:number + <span class="Normal">x</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + *x:&:num<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Normal">y</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> x:&:num <span class="Comment"># since y is 'escaping' f, it should not be cleared</span> <span class="Identifier">return</span> y:foo ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>f - <span class="Constant">3</span>:number<span class="Special"> <- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> x:offset - <span class="Constant">4</span>:address:number<span class="Special"> <- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> y:offset - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy *<span class="Constant">4</span>:address:number + <span class="Constant">3</span>:num<span class="Special"> <- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> x:offset + <span class="Constant">4</span>:&:num<span class="Special"> <- </span>get <span class="Constant">1</span>:foo<span class="Delimiter">,</span> y:offset + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy *<span class="Constant">4</span>:&:num <span class="Constant">1</span>:foo<span class="Special"> <- </span>put <span class="Constant">1</span>:foo<span class="Delimiter">,</span> y:offset<span class="Delimiter">,</span> <span class="Constant">0</span> - <span class="Constant">4</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 34 in location 1</span> <span class="traceContains">+mem: storing 1006 in location 2</span> @@ -399,8 +405,8 @@ def main [ <span class="Delimiter">:(scenario local_scope_claims_return_values_when_not_saved)</span> def f [ local-scope - <span class="Normal">x</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - reply x:address:number + <span class="Normal">x</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + reply x:&:num ] def main [ f <span class="Comment"># doesn't save result</span> diff --git a/html/044space_surround.cc.html b/html/044space_surround.cc.html index 66db51b3..bd9f07ef 100644 --- a/html/044space_surround.cc.html +++ b/html/044space_surround.cc.html @@ -42,16 +42,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># location 1 in space 1 refers to the space surrounding the default space, here 20.</span> def main [ <span class="Comment"># pretend address:array:location; in practice we'll use new</span> - <span class="Constant">10</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> <span class="Comment"># pretend address:array:location; in practice we'll use new</span> - <span class="Constant">20</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> - <span class="Constant">21</span>:number<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> + <span class="Constant">20</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> + <span class="Constant">21</span>:num<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> <span class="Comment"># actual start of this recipe</span> - <span class="Normal">default</span>-space:address:array:location<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">0</span>:address:array:location/names:dummy<span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe <span class="Comment"># later layers will explain the /names: property</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">32</span> - <span class="Constant">1</span>:number/space:<span class="Constant">1</span><span class="Special"> <- </span>copy <span class="Constant">33</span> + <span class="Normal">default</span>-space:space<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">0</span>:space/names:dummy<span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe <span class="Comment"># later layers will explain the /names: property</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">32</span> + <span class="Constant">1</span>:num/space:<span class="Constant">1</span><span class="Special"> <- </span>copy <span class="Constant">33</span> ] def dummy [ <span class="Comment"># just for the /names: property above</span> ] @@ -95,7 +95,7 @@ def dummy [ <span class="Comment"># just for the /names: property above</span> <span class="Delimiter">:(scenario permit_space_as_variable_name)</span> def main [ - <span class="Normal">space</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Normal">space</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] </pre> </body> diff --git a/html/045closure_name.cc.html b/html/045closure_name.cc.html index 9cc50979..c4f9a0ef 100644 --- a/html/045closure_name.cc.html +++ b/html/045closure_name.cc.html @@ -40,23 +40,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario closure)</span> def main [ - <span class="Normal">default</span>-space:address:array:location<span class="Special"> <- </span><span class="Normal">new</span> location:type<span class="Delimiter">,</span> <span class="Constant">30</span> - <span class="Constant">1</span>:address:array:location/names:<span class="Normal">new</span>-counter<span class="Special"> <- </span><span class="Normal">new</span>-counter - <span class="Constant">2</span>:number/<span class="Special">raw <- </span>increment-counter <span class="Constant">1</span>:address:array:location/names:<span class="Normal">new</span>-counter - <span class="Constant">3</span>:number/<span class="Special">raw <- </span>increment-counter <span class="Constant">1</span>:address:array:location/names:<span class="Normal">new</span>-counter + <span class="Normal">default</span>-space:space<span class="Special"> <- </span><span class="Normal">new</span> location:type<span class="Delimiter">,</span> <span class="Constant">30</span> + <span class="Constant">1</span>:space/names:<span class="Normal">new</span>-counter<span class="Special"> <- </span><span class="Normal">new</span>-counter + <span class="Constant">2</span>:num/<span class="Special">raw <- </span>increment-counter <span class="Constant">1</span>:space/names:<span class="Normal">new</span>-counter + <span class="Constant">3</span>:num/<span class="Special">raw <- </span>increment-counter <span class="Constant">1</span>:space/names:<span class="Normal">new</span>-counter ] def <span class="Normal">new</span>-counter [ - <span class="Normal">default</span>-space:address:array:location<span class="Special"> <- </span><span class="Normal">new</span> location:type<span class="Delimiter">,</span> <span class="Constant">30</span> - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">23</span> - <span class="Normal">y</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> <span class="Comment"># variable that will be incremented</span> - <span class="Identifier">return</span> <span class="Normal">default</span>-space:address:array:location + <span class="Normal">default</span>-space:space<span class="Special"> <- </span><span class="Normal">new</span> location:type<span class="Delimiter">,</span> <span class="Constant">30</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">23</span> + <span class="Normal">y</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> <span class="Comment"># variable that will be incremented</span> + <span class="Identifier">return</span> <span class="Normal">default</span>-space:space ] def increment-counter [ - <span class="Normal">default</span>-space:address:array:location<span class="Special"> <- </span><span class="Normal">new</span> location:type<span class="Delimiter">,</span> <span class="Constant">30</span> - <span class="Constant">0</span>:address:array:location/names:<span class="Normal">new</span>-counter<span class="Special"> <- </span>next-ingredient <span class="Comment"># outer space must be created by 'new-counter' above</span> - <span class="Normal">y</span>:number/space:<span class="Constant">1</span><span class="Special"> <- </span>add y:number/space:<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> <span class="Comment"># increment</span> - <span class="Normal">y</span>:number<span class="Special"> <- </span>copy <span class="Constant">234</span> <span class="Comment"># dummy</span> - <span class="Identifier">return</span> y:number/space:<span class="Constant">1</span> + <span class="Normal">default</span>-space:space<span class="Special"> <- </span><span class="Normal">new</span> location:type<span class="Delimiter">,</span> <span class="Constant">30</span> + <span class="Constant">0</span>:space/names:<span class="Normal">new</span>-counter<span class="Special"> <- </span>next-ingredient <span class="Comment"># outer space must be created by 'new-counter' above</span> + <span class="Normal">y</span>:num/space:<span class="Constant">1</span><span class="Special"> <- </span>add y:num/space:<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> <span class="Comment"># increment</span> + <span class="Normal">y</span>:num<span class="Special"> <- </span>copy <span class="Constant">234</span> <span class="Comment"># dummy</span> + <span class="Identifier">return</span> y:num/space:<span class="Constant">1</span> ] <span class="traceContains">+name: lexically surrounding space for recipe increment-counter comes from new-counter</span> <span class="traceContains">+mem: storing 5 in location 3</span> @@ -177,7 +177,7 @@ recipe_ordinal lookup_surrounding_recipe<span class="Delimiter">(</span><span cl <span class="Special">% Hide_errors = true;</span> def f [ local-scope - <span class="Normal">x</span>:number/space:<span class="Constant">1</span><span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Normal">x</span>:num/space:<span class="Constant">1</span><span class="Special"> <- </span>copy <span class="Constant">34</span> ] <span class="traceContains">+error: don't know surrounding recipe of 'f'</span> <span class="traceContains">+error: f: can't find a place to store 'x'</span> @@ -186,19 +186,19 @@ def f [ <span class="Delimiter">:(scenario local_scope_ignores_nonlocal_spaces)</span> def <span class="Normal">new</span>-scope [ <span class="Normal">new</span>-<span class="Normal">default</span>-space - <span class="Normal">x</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - *x:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Identifier">return</span> <span class="Normal">default</span>-space:address:array:location + <span class="Normal">x</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + *x:&:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Identifier">return</span> <span class="Normal">default</span>-space:space ] def use-scope [ local-scope - <span class="Normal">outer</span>:address:array:location<span class="Special"> <- </span>next-ingredient - <span class="Constant">0</span>:address:array:location/names:<span class="Normal">new</span>-scope<span class="Special"> <- </span>copy outer:address:array:location - <span class="Identifier">return</span> *x:address:number/space:<span class="Constant">1</span> + <span class="Normal">outer</span>:space<span class="Special"> <- </span>next-ingredient + <span class="Constant">0</span>:space/names:<span class="Normal">new</span>-scope<span class="Special"> <- </span>copy outer:space + <span class="Identifier">return</span> *x:&:num/space:<span class="Constant">1</span> ] def main [ - <span class="Constant">1</span>:address:array:location/<span class="Special">raw <- </span><span class="Normal">new</span>-scope - <span class="Constant">2</span>:number/<span class="Special">raw <- </span>use-scope <span class="Constant">1</span>:address:array:location/<span class="Special">raw</span> + <span class="Constant">1</span>:space/<span class="Special">raw <- </span><span class="Normal">new</span>-scope + <span class="Constant">2</span>:num/<span class="Special">raw <- </span>use-scope <span class="Constant">1</span>:space/<span class="Special">raw</span> ] <span class="traceContains">+mem: storing 34 in location 2</span> </pre> diff --git a/html/046global.cc.html b/html/046global.cc.html index 11a22b6b..df8ba426 100644 --- a/html/046global.cc.html +++ b/html/046global.cc.html @@ -46,16 +46,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario global_space)</span> def main [ <span class="Comment"># pretend address:array:location; in practice we'll use new</span> - <span class="Constant">10</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> <span class="Comment"># pretend address:array:location; in practice we'll use new</span> - <span class="Constant">20</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> - <span class="Constant">21</span>:number<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> + <span class="Constant">20</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># refcount</span> + <span class="Constant">21</span>:num<span class="Special"> <- </span>copy <span class="Constant">5</span> <span class="Comment"># length</span> <span class="Comment"># actual start of this recipe</span> - global-space:address:array:location<span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe - <span class="Normal">default</span>-space:address:array:location<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">23</span> - <span class="Constant">1</span>:number/space:global<span class="Special"> <- </span>copy <span class="Constant">24</span> + global-space:space<span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe + <span class="Normal">default</span>-space:space<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">23</span> + <span class="Constant">1</span>:num/space:global<span class="Special"> <- </span>copy <span class="Constant">24</span> ] <span class="Comment"># store to default space: 10 + (skip refcount and length) 2 + (index) 1</span> <span class="traceContains">+mem: storing 23 in location 13</span> @@ -97,9 +97,9 @@ global_space = <span class="Constant">0</span><span class="Delimiter">;</span> <span class="Delimiter">:(scenario global_space_with_names)</span> def main [ - global-space:address:array:location<span class="Special"> <- </span><span class="Normal">new</span> location:type<span class="Delimiter">,</span> <span class="Constant">10</span> - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">23</span> - <span class="Constant">1</span>:number/space:global<span class="Special"> <- </span>copy <span class="Constant">24</span> + global-space:space<span class="Special"> <- </span><span class="Normal">new</span> location:type<span class="Delimiter">,</span> <span class="Constant">10</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">23</span> + <span class="Constant">1</span>:num/space:global<span class="Special"> <- </span>copy <span class="Constant">24</span> ] <span class="Comment"># don't complain about mixing numeric addresses and names</span> $error: <span class="Constant">0</span> diff --git a/html/047check_type_by_name.cc.html b/html/047check_type_by_name.cc.html index c7927417..433b67aa 100644 --- a/html/047check_type_by_name.cc.html +++ b/html/047check_type_by_name.cc.html @@ -43,8 +43,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario transform_fails_on_reusing_name_with_different_type)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Normal">x</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Normal">x</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">1</span> ] <span class="traceContains">+error: main: 'x' used with multiple types</span> @@ -102,15 +102,15 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenario transform_fills_in_missing_types)</span> def main [ - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Normal">y</span>:number<span class="Special"> <- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Normal">y</span>:num<span class="Special"> <- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="Comment"># x is in location 1, y in location 2</span> <span class="traceContains">+mem: storing 2 in location 2</span> <span class="Delimiter">:(scenario transform_fills_in_missing_types_in_product)</span> def main [ - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> x<span class="Special"> <- </span>copy <span class="Constant">2</span> ] <span class="Comment"># x is in location 1</span> @@ -118,7 +118,7 @@ def main [ <span class="Delimiter">:(scenario transform_fills_in_missing_types_in_product_and_ingredient)</span> def main [ - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> x<span class="Special"> <- </span>add x<span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="Comment"># x is in location 1</span> @@ -128,22 +128,22 @@ def main [ <span class="Special">% Hide_errors = true;</span> def main [ x<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">2</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">2</span> ] <span class="traceContains">+error: main: missing type for 'x' in 'x <- copy 1'</span> <span class="Delimiter">:(scenario typo_in_address_type_fails)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">y</span>:address:charcter<span class="Special"> <- </span><span class="Normal">new</span> character:type + <span class="Normal">y</span>:&:charcter<span class="Special"> <- </span><span class="Normal">new</span> character:type *y<span class="Special"> <- </span>copy <span class="Constant">67</span> ] -<span class="traceContains">+error: main: unknown type charcter in 'y:address:charcter <- new character:type'</span> +<span class="traceContains">+error: main: unknown type charcter in 'y:&:charcter <- new character:type'</span> <span class="Delimiter">:(scenario array_type_without_size_fails)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">x</span>:array:number<span class="Special"> <- </span>merge <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">13</span> + <span class="Normal">x</span>:@:num<span class="Special"> <- </span>merge <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">13</span> ] <span class="traceContains">+error: main can't determine the size of array variable 'x'. Either allocate it separately and make the type of 'x' an address, or specify the length of the array in the type of 'x'.</span> @@ -153,9 +153,9 @@ def foo [ <span class="Comment"># dummy</span> ] def main [ local-scope - <span class="Constant">0</span>:address:array:location/names:foo<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># specify surrounding space</span> - <span class="Normal">x</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">1</span>/<span class="Constant">true</span> - <span class="Normal">x</span>:number/space:<span class="Constant">1</span><span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">0</span>:space/names:foo<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># specify surrounding space</span> + <span class="Normal">x</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">1</span>/<span class="Constant">true</span> + <span class="Normal">x</span>:num/space:<span class="Constant">1</span><span class="Special"> <- </span>copy <span class="Constant">34</span> x/space:<span class="Constant">1</span><span class="Special"> <- </span>copy <span class="Constant">35</span> ] $error: <span class="Constant">0</span> diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html index 9dcedc44..3130380a 100644 --- a/html/050scenario.cc.html +++ b/html/050scenario.cc.html @@ -45,7 +45,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario scenario_block)</span> scenario foo [ run [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">13</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">13</span> ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">13</span> @@ -56,13 +56,13 @@ scenario foo [ <span class="Delimiter">:(scenario scenario_multiple_blocks)</span> scenario foo [ run [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">13</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">13</span> ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">13</span> ] run [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">13</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">13</span> ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">13</span> @@ -74,7 +74,7 @@ scenario foo [ <span class="Delimiter">:(scenario scenario_check_memory_and_trace)</span> scenario foo [ run [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">13</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">13</span> trace <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [a b c] ] memory-should-contain [ @@ -131,13 +131,13 @@ scenario parse_scenario<span class="Delimiter">(</span>istream& in<span clas <span class="Delimiter">:(scenario read_scenario_with_bracket_in_comment)</span> scenario foo [ <span class="Comment"># ']' in comment</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+run: {1: "number"} <- copy {0: "literal"}</span> <span class="Delimiter">:(scenario read_scenario_with_bracket_in_comment_in_nested_string)</span> scenario foo [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [<span class="Comment"># not a comment]</span> + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [<span class="Comment"># not a comment]</span> ] <span class="traceContains">+run: {1: ("address" "array" "character")} <- new {"# not a comment": "literal-string"}</span> @@ -261,7 +261,7 @@ Name[r][<span class="Constant">"__maybe_make_raw_test__"</span>] = Res vector<recipe_ordinal> tmp = load<span class="Delimiter">(</span> <span class="Constant">"def scenario_foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" local-scope</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" __maybe_make_raw_test__:number <- copy 34</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" __maybe_make_raw_test__:num <- copy 34</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> mark_autogenerated<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</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> @@ -277,10 +277,10 @@ Name[r][<span class="Constant">"__maybe_make_raw_test__"</span>] = Res <span class="Special">% Hide_errors = true;</span> <span class="Special">% Disable_redefine_checks = true;</span> def scenario-foo [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> ] def scenario-foo [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> ] <span class="traceContains">+error: redefining recipe scenario-foo</span> @@ -295,7 +295,7 @@ def scenario-foo [ <span class="Delimiter">:(scenario run)</span> def main [ run [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">13</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">13</span> ] ] <span class="traceContains">+mem: storing 13 in location 1</span> @@ -332,10 +332,10 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario run_multiple)</span> def main [ run [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">13</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">13</span> ] run [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">13</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">13</span> ] ] <span class="traceContains">+mem: storing 13 in location 1</span> @@ -447,7 +447,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span trace<span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"checking string length at "</span> << address << end<span class="Delimiter">();</span> <span class="Normal">if</span> <span class="Delimiter">(</span>get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">)</span> != SIZE<span class="Delimiter">(</span>literal<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Current_scenario && !Scenario_testing_scenario<span class="Delimiter">)</span> - raise << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << Current_scenario<span class="Delimiter">-></span>name << <span class="Constant">": expected location '"</span> << address << <span class="Constant">"' to contain length "</span> << SIZE<span class="Delimiter">(</span>literal<span class="Delimiter">)</span> << <span class="Constant">" of string ["</span> << literal << <span class="Constant">"] but saw "</span> << no_scientific<span class="Delimiter">(</span>get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">))</span> << <span class="Constant">" ("</span> << read_mu_string<span class="Delimiter">(</span>address-<span class="Comment">/*</span><span class="Comment">fake refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">)</span> << <span class="Constant">")</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> + raise << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << Current_scenario<span class="Delimiter">-></span>name << <span class="Constant">": expected location '"</span> << address << <span class="Constant">"' to contain length "</span> << SIZE<span class="Delimiter">(</span>literal<span class="Delimiter">)</span> << <span class="Constant">" of string ["</span> << literal << <span class="Constant">"] but saw "</span> << no_scientific<span class="Delimiter">(</span>get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">))</span> << <span class="Constant">" ("</span> << read_mu_text<span class="Delimiter">(</span>address-<span class="Comment">/*</span><span class="Comment">fake refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">)</span> << <span class="Constant">")</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Normal">else</span> raise << <span class="Constant">"expected location '"</span> << address << <span class="Constant">"' to contain length "</span> << SIZE<span class="Delimiter">(</span>literal<span class="Delimiter">)</span> << <span class="Constant">" of string ["</span> << literal << <span class="Constant">"] but saw "</span> << no_scientific<span class="Delimiter">(</span>get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed = <span class="Constant">false</span><span class="Delimiter">;</span> @@ -486,10 +486,10 @@ def main [ <span class="Special">% Scenario_testing_scenario = true;</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">97</span> <span class="Comment"># 'a'</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">98</span> <span class="Comment"># 'b'</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">99</span> <span class="Comment"># 'c'</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">97</span> <span class="Comment"># 'a'</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">98</span> <span class="Comment"># 'b'</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">99</span> <span class="Comment"># 'c'</span> memory-should-contain [ <span class="Constant">1</span>:array:character<span class="Special"> <- </span>[ab] ] @@ -498,10 +498,10 @@ def main [ <span class="Delimiter">:(scenario memory_check_string)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">97</span> <span class="Comment"># 'a'</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">98</span> <span class="Comment"># 'b'</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">99</span> <span class="Comment"># 'c'</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">97</span> <span class="Comment"># 'a'</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">98</span> <span class="Comment"># 'b'</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">99</span> <span class="Comment"># 'c'</span> memory-should-contain [ <span class="Constant">1</span>:array:character<span class="Special"> <- </span>[abc] ] @@ -724,7 +724,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of 'check-trace-count-for-label' should be a number (count), but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"second ingredient of 'check-trace-count-for-label' should be a literal string (label), but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> diff --git a/html/051scenario_test.mu.html b/html/051scenario_test.mu.html index a1901a65..951c5858 100644 --- a/html/051scenario_test.mu.html +++ b/html/051scenario_test.mu.html @@ -32,7 +32,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> first_scenario_in_mu [ run [ - <span class="Constant">10</span>:number<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">4</span> @@ -42,7 +42,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> scenario_with_comment_in_mu [ run [ <span class="Comment"># comment</span> - <span class="Constant">10</span>:number<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">4</span> @@ -53,7 +53,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Comment"># comment1</span> <span class="Comment"># comment2</span> - <span class="Constant">10</span>:number<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">4</span> @@ -62,10 +62,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> check_text_in_memory [ run [ - <span class="Constant">10</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> - <span class="Constant">11</span>:character<span class="Special"> <- </span>copy <span class="Constant">97</span> <span class="Comment"># 'a'</span> - <span class="Constant">12</span>:character<span class="Special"> <- </span>copy <span class="Constant">98</span> <span class="Comment"># 'b'</span> - <span class="Constant">13</span>:character<span class="Special"> <- </span>copy <span class="Constant">99</span> <span class="Comment"># 'c'</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Constant">11</span>:char<span class="Special"> <- </span>copy <span class="Constant">97</span> <span class="Comment"># 'a'</span> + <span class="Constant">12</span>:char<span class="Special"> <- </span>copy <span class="Constant">98</span> <span class="Comment"># 'b'</span> + <span class="Constant">13</span>:char<span class="Special"> <- </span>copy <span class="Constant">99</span> <span class="Comment"># 'c'</span> ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> @@ -74,7 +74,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> check_trace [ run [ - <span class="Constant">10</span>:number<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> ] trace-should-contain [ mem: storing <span class="Constant">4</span> in location <span class="Constant">10</span> @@ -83,7 +83,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> check_trace_negative [ run [ - <span class="Constant">10</span>:number<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> ] trace-should-not-contain [ mem: storing <span class="Constant">3</span> in location <span class="Constant">10</span> diff --git a/html/052tangle.cc.html b/html/052tangle.cc.html index 03a0fd92..f3c04e19 100644 --- a/html/052tangle.cc.html +++ b/html/052tangle.cc.html @@ -43,12 +43,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario tangle_before)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <label1> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] before <label1> [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> <span class="traceContains">+mem: storing 0 in location 2</span> @@ -107,6 +107,7 @@ tangle_done = <span class="Constant">false</span><span class="Delimiter">;</span <span class="Delimiter">}</span> <span class="Normal">void</span> insert_fragments<span class="Delimiter">(</span>recipe& r<span class="Delimiter">)</span> <span class="Delimiter">{</span> + trace<span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"--- insert fragments into recipe "</span> << r<span class="Delimiter">.</span>name << end<span class="Delimiter">();</span> <span class="Normal">bool</span> made_progress = <span class="Constant">true</span><span class="Delimiter">;</span> <span class="Normal">int</span> pass = <span class="Constant">0</span><span class="Delimiter">;</span> <span class="Normal">while</span> <span class="Delimiter">(</span>made_progress<span class="Delimiter">)</span> <span class="Delimiter">{</span> @@ -126,11 +127,15 @@ tangle_done = <span class="Constant">false</span><span class="Delimiter">;</span prefix << <span class="Constant">'+'</span> << r<span class="Delimiter">.</span>name << <span class="Constant">'_'</span> << pass << <span class="Constant">'_'</span> << i<span class="Delimiter">;</span> <span class="Comment">// ok to use contains_key even though Before_fragments uses [],</span> <span class="Comment">// because appending an empty recipe is a noop</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Before_fragments<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">))</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Before_fragments<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">))</span> <span class="Delimiter">{</span> + trace<span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"insert fragments before label "</span> << inst<span class="Delimiter">.</span>label << end<span class="Delimiter">();</span> append_fragment<span class="Delimiter">(</span>result<span class="Delimiter">,</span> Before_fragments[inst<span class="Delimiter">.</span>label]<span class="Delimiter">.</span>steps<span class="Delimiter">,</span> prefix<span class="Delimiter">.</span>str<span class="Delimiter">());</span> + <span class="Delimiter">}</span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>inst<span class="Delimiter">);</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>After_fragments<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">))</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>After_fragments<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">))</span> <span class="Delimiter">{</span> + trace<span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"insert fragments after label "</span> << inst<span class="Delimiter">.</span>label << end<span class="Delimiter">();</span> append_fragment<span class="Delimiter">(</span>result<span class="Delimiter">,</span> After_fragments[inst<span class="Delimiter">.</span>label]<span class="Delimiter">.</span>steps<span class="Delimiter">,</span> prefix<span class="Delimiter">.</span>str<span class="Delimiter">());</span> + <span class="Delimiter">}</span> <span class="Delimiter">}</span> r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>result<span class="Delimiter">);</span> ++pass<span class="Delimiter">;</span> @@ -194,15 +199,15 @@ check_insert_fragments<span class="Delimiter">();</span> <span class="Delimiter">:(scenario tangle_before_and_after)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <label1> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] before <label1> [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] after <label1> [ - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> <span class="traceContains">+mem: storing 0 in location 2</span> @@ -215,33 +220,33 @@ $mem: <span class="Constant">4</span> <span class="Delimiter">:(scenario tangle_ignores_jump_target)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> +label1 - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] before +label1 [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+error: can't tangle before label +label1</span> <span class="Delimiter">:(scenario tangle_keeps_labels_separate)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <label1> <label2> - <span class="Constant">6</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] before <label1> [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] after <label1> [ - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] before <label2> [ - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] after <label2> [ - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> <span class="traceContains">+mem: storing 0 in location 2</span> @@ -257,21 +262,21 @@ $mem: <span class="Constant">6</span> <span class="Delimiter">:(scenario tangle_stacks_multiple_fragments)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <label1> - <span class="Constant">6</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] before <label1> [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] after <label1> [ - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] before <label1> [ - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] after <label1> [ - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> <span class="Comment"># 'before' fragments stack in order</span> @@ -287,17 +292,17 @@ $mem: <span class="Constant">6</span> <span class="Delimiter">:(scenario tangle_supports_fragments_with_multiple_instructions)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <label1> - <span class="Constant">6</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">6</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] before <label1> [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] after <label1> [ - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+mem: storing 0 in location 1</span> <span class="traceContains">+mem: storing 0 in location 2</span> @@ -311,21 +316,21 @@ $mem: <span class="Constant">6</span> <span class="Delimiter">:(scenario tangle_tangles_into_all_labels_with_same_name)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> <label1> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> recipe2 ] def recipe2 [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">11</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">11</span> <label1> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">11</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">11</span> ] before <label1> [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> ] after <label1> [ - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> ] <span class="traceContains">+mem: storing 10 in location 1</span> <span class="traceContains">+mem: storing 12 in location 2</span> @@ -343,16 +348,16 @@ $mem: <span class="Constant">8</span> <span class="Delimiter">:(scenario tangle_tangles_into_all_labels_with_same_name_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> <label1> <label1> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> ] before <label1> [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> ] after <label1> [ - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> ] <span class="traceContains">+mem: storing 10 in location 1</span> <span class="traceContains">+mem: storing 12 in location 2</span> @@ -367,16 +372,16 @@ $mem: <span class="Constant">6</span> <span class="Delimiter">:(scenario tangle_tangles_into_all_labels_with_same_name_3)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> <label1> <foo> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> ] before <label1> [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> ] after <label1> [ - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> ] after <foo> [ <label1> @@ -394,15 +399,15 @@ $mem: <span class="Constant">6</span> <span class="Delimiter">:(scenario tangle_handles_jump_target_inside_fragment)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> <label1> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> ] before <label1> [ jump +label2:label - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> +label2 - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> ] <span class="traceContains">+mem: storing 10 in location 1</span> <span class="Comment"># label1</span> @@ -415,16 +420,16 @@ $mem: <span class="Constant">3</span> <span class="Delimiter">:(scenario tangle_renames_jump_target)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> <label1> +label2 - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> ] before <label1> [ jump +label2:label - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> +label2 <span class="Comment"># renamed</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> ] <span class="traceContains">+mem: storing 10 in location 1</span> <span class="Comment"># label1</span> @@ -437,15 +442,15 @@ $mem: <span class="Constant">3</span> <span class="Delimiter">:(scenario tangle_jump_to_base_recipe)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> <label1> +label2 - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> ] before <label1> [ jump +label2:label - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">12</span> ] <span class="traceContains">+mem: storing 10 in location 1</span> <span class="Comment"># label1</span> @@ -466,14 +471,14 @@ $mem: <span class="Constant">2</span> <span class="Constant">" <label></span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"after <label> [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" 1:number/raw <- copy 34</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" 1:num/raw <- copy 34</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> transform_all<span class="Delimiter">();</span> CHECK_TRACE_DOESNT_CONTAIN_ERROR<span class="Delimiter">();</span> Hide_errors = <span class="Constant">true</span><span class="Delimiter">;</span> <span class="Comment">// try to tangle into recipe foo after transform</span> load<span class="Delimiter">(</span><span class="Constant">"before <label> [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" 2:number/raw <- copy 35</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" 2:num/raw <- copy 35</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> CHECK_TRACE_CONTAINS_ERROR<span class="Delimiter">();</span> <span class="Delimiter">}</span> diff --git a/html/053recipe_header.cc.html b/html/053recipe_header.cc.html index aa26c35c..f3beba5b 100644 --- a/html/053recipe_header.cc.html +++ b/html/053recipe_header.cc.html @@ -40,12 +40,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario recipe_with_header)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> ] -def add2 x:number<span class="Delimiter">,</span> y:number <span class="Delimiter">-></span> z:number [ +def add2 x:num<span class="Delimiter">,</span> y:num <span class="Delimiter">-></span> z:num [ local-scope load-ingredients - <span class="Normal">z</span>:number<span class="Special"> <- </span>add x<span class="Delimiter">,</span> y + <span class="Normal">z</span>:num<span class="Special"> <- </span>add x<span class="Delimiter">,</span> y <span class="Identifier">return</span> z ] <span class="traceContains">+mem: storing 8 in location 1</span> @@ -88,12 +88,12 @@ has_header = <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Delimiter">:(scenario recipe_handles_stray_comma)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> ] -def add2 x:number<span class="Delimiter">,</span> y:number <span class="Delimiter">-></span> z:number<span class="Delimiter">,</span> [ +def add2 x:num<span class="Delimiter">,</span> y:num <span class="Delimiter">-></span> z:num<span class="Delimiter">,</span> [ local-scope load-ingredients - <span class="Normal">z</span>:number<span class="Special"> <- </span>add x<span class="Delimiter">,</span> y + <span class="Normal">z</span>:num<span class="Special"> <- </span>add x<span class="Delimiter">,</span> y <span class="Identifier">return</span> z ] <span class="traceContains">+mem: storing 8 in location 1</span> @@ -103,16 +103,16 @@ def main [ foo ] def foo<span class="Delimiter">,</span> [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span> ] def bar [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">3</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">3</span> ] <span class="traceContains">+mem: storing 4 in location 1</span> <span class="Delimiter">:(scenario recipe_handles_wrong_arrow)</span> <span class="Special">% Hide_errors = true;</span> -def foo a:number<span class="Special"> <- </span>b:number [ +def foo a:num<span class="Special"> <- </span>b:num [ ] <span class="traceContains">+error: recipe foo should say '->' and not '<-'</span> @@ -156,7 +156,7 @@ out << <span class="Constant">"products:</span><span class="cSpecial" <span class="Delimiter">:(scenario recipe_without_ingredients_or_products_has_header)</span> def test [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> ] <span class="traceContains">+parse: recipe test has a header</span> @@ -182,13 +182,12 @@ def test [ <span class="Comment">//: Support type abbreviations in headers.</span> <span class="Delimiter">:(scenario type_abbreviations_in_recipe_headers)</span> -type string = address:array:character def main [ local-scope - <span class="Normal">a</span>:string<span class="Special"> <- </span>foo - <span class="Constant">1</span>:character/<span class="Special">raw <- </span>index *a<span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Normal">a</span>:text<span class="Special"> <- </span>foo + <span class="Constant">1</span>:<span class="Normal">char</span>/<span class="Special">raw <- </span>index *a<span class="Delimiter">,</span> <span class="Constant">0</span> ] -def foo <span class="Delimiter">-></span> a:string [ +def foo <span class="Delimiter">-></span> a:text [ <span class="Comment"># 'text' is an abbreviation</span> local-scope load-ingredients a<span class="Special"> <- </span><span class="Normal">new</span> [abc] @@ -255,21 +254,21 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario show_clear_error_on_bad_call)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>foo <span class="Constant">34</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>foo <span class="Constant">34</span> ] -def foo x:point <span class="Delimiter">-></span> y:number [ +def foo x:point <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> ] -<span class="traceContains">+error: main: ingredient 0 has the wrong type at '1:number <- foo 34'</span> +<span class="traceContains">+error: main: ingredient 0 has the wrong type at '1:num <- foo 34'</span> <span class="Delimiter">:(scenario show_clear_error_on_bad_call_2)</span> <span class="Special">% Hide_errors = true;</span> def main [ <span class="Constant">1</span>:point<span class="Special"> <- </span>foo <span class="Constant">34</span> ] -def foo x:number <span class="Delimiter">-></span> y:number [ +def foo x:num <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> x @@ -306,10 +305,10 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenarios transform)</span> <span class="Delimiter">:(scenario recipe_headers_are_checked)</span> <span class="Special">% Hide_errors = true;</span> -def add2 x:number<span class="Delimiter">,</span> y:number <span class="Delimiter">-></span> z:number [ +def add2 x:num<span class="Delimiter">,</span> y:num <span class="Delimiter">-></span> z:num [ local-scope load-ingredients - <span class="Normal">z</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe + <span class="Normal">z</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe <span class="Identifier">return</span> z ] <span class="traceContains">+error: add2: replied with the wrong type at 'return z'</span> @@ -338,17 +337,17 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenario recipe_headers_are_checked_2)</span> <span class="Special">% Hide_errors = true;</span> -def add2 x:number<span class="Delimiter">,</span> y:number [ +def add2 x:num<span class="Delimiter">,</span> y:num [ local-scope load-ingredients - <span class="Normal">z</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe + <span class="Normal">z</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe <span class="Identifier">return</span> z ] <span class="traceContains">+error: add2: replied with the wrong number of products at 'return z'</span> <span class="Delimiter">:(scenario recipe_headers_check_for_duplicate_names)</span> <span class="Special">% Hide_errors = true;</span> -def add2 x:number<span class="Delimiter">,</span> x:number <span class="Delimiter">-></span> z:number [ +def add2 x:num<span class="Delimiter">,</span> x:num <span class="Delimiter">-></span> z:num [ local-scope load-ingredients <span class="Identifier">return</span> z @@ -379,9 +378,9 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenarios run)</span> <span class="Delimiter">:(scenario deduce_instruction_types_from_recipe_header)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> ] -def add2 x:number<span class="Delimiter">,</span> y:number <span class="Delimiter">-></span> z:number [ +def add2 x:num<span class="Delimiter">,</span> y:num <span class="Delimiter">-></span> z:num [ local-scope load-ingredients z<span class="Special"> <- </span>add x<span class="Delimiter">,</span> y <span class="Comment"># no type for z</span> @@ -436,9 +435,9 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenario return_based_on_header)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> ] -def add2 x:number<span class="Delimiter">,</span> y:number <span class="Delimiter">-></span> z:number [ +def add2 x:num<span class="Delimiter">,</span> y:num <span class="Delimiter">-></span> z:num [ local-scope load-ingredients z<span class="Special"> <- </span>add x<span class="Delimiter">,</span> y @@ -487,9 +486,9 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenario explicit_reply_ignores_header)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:number/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">1</span>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:num/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> ] -def add2 a:number<span class="Delimiter">,</span> b:number <span class="Delimiter">-></span> y:number<span class="Delimiter">,</span> z:number [ +def add2 a:num<span class="Delimiter">,</span> b:num <span class="Delimiter">-></span> y:num<span class="Delimiter">,</span> z:num [ local-scope load-ingredients y<span class="Special"> <- </span>add a<span class="Delimiter">,</span> b @@ -501,9 +500,9 @@ def add2 a:number<span class="Delimiter">,</span> b:number <span class="Delimite <span class="Delimiter">:(scenario return_on_fallthrough_based_on_header)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> ] -def add2 x:number<span class="Delimiter">,</span> y:number <span class="Delimiter">-></span> z:number [ +def add2 x:num<span class="Delimiter">,</span> y:num <span class="Delimiter">-></span> z:num [ local-scope load-ingredients z<span class="Special"> <- </span>add x<span class="Delimiter">,</span> y @@ -513,23 +512,23 @@ def add2 x:number<span class="Delimiter">,</span> y:number <span class="Delimite <span class="Delimiter">:(scenario return_on_fallthrough_already_exists)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> ] -def add2 x:number<span class="Delimiter">,</span> y:number <span class="Delimiter">-></span> z:number [ +def add2 x:num<span class="Delimiter">,</span> y:num <span class="Delimiter">-></span> z:num [ local-scope load-ingredients z<span class="Special"> <- </span>add x<span class="Delimiter">,</span> y <span class="Comment"># no type for z</span> <span class="Identifier">return</span> z ] <span class="traceContains">+transform: instruction: return {z: ()}</span> -<span class="traceAbsent">-transform: instruction: reply z:number</span> +<span class="traceAbsent">-transform: instruction: reply z:num</span> <span class="traceContains">+mem: storing 8 in location 1</span> <span class="Delimiter">:(scenario return_after_conditional_reply_based_on_header)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>add2 <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">5</span> ] -def add2 x:number<span class="Delimiter">,</span> y:number <span class="Delimiter">-></span> z:number [ +def add2 x:num<span class="Delimiter">,</span> y:num <span class="Delimiter">-></span> z:num [ local-scope load-ingredients z<span class="Special"> <- </span>add x<span class="Delimiter">,</span> y <span class="Comment"># no type for z</span> @@ -540,15 +539,15 @@ def add2 x:number<span class="Delimiter">,</span> y:number <span class="Delimite <span class="Delimiter">:(scenario recipe_headers_perform_same_ingredient_check)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>add2 <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>add2 <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] -def add2 x:number<span class="Delimiter">,</span> y:number <span class="Delimiter">-></span> x:number [ +def add2 x:num<span class="Delimiter">,</span> y:num <span class="Delimiter">-></span> x:num [ local-scope load-ingredients ] -<span class="traceContains">+error: main: '3:number <- add2 1:number, 2:number' should write to '1:number' rather than '3:number'</span> +<span class="traceContains">+error: main: '3:num <- add2 1:num, 2:num' should write to '1:num' rather than '3:num'</span> <span class="Delimiter">:(before "End Includes")</span> <span class="Normal">using</span> std::min<span class="Delimiter">;</span> diff --git a/html/054static_dispatch.cc.html b/html/054static_dispatch.cc.html index 8e4e06cb..cfcbde40 100644 --- a/html/054static_dispatch.cc.html +++ b/html/054static_dispatch.cc.html @@ -39,12 +39,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario static_dispatch)</span> def main [ - <span class="Constant">7</span>:number/<span class="Special">raw <- </span>test <span class="Constant">3</span> + <span class="Constant">7</span>:num/<span class="Special">raw <- </span>test <span class="Constant">3</span> ] -def test a:number <span class="Delimiter">-></span> z:number [ +def test a:num <span class="Delimiter">-></span> z:num [ z<span class="Special"> <- </span>copy <span class="Constant">1</span> ] -def test a:number<span class="Delimiter">,</span> b:number <span class="Delimiter">-></span> z:number [ +def test a:num<span class="Delimiter">,</span> b:num <span class="Delimiter">-></span> z:num [ z<span class="Special"> <- </span>copy <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 1 in location 7</span> @@ -154,12 +154,12 @@ string next_unused_recipe_name<span class="Delimiter">(</span><span class="Norma <span class="Delimiter">:(scenario static_dispatch_picks_most_similar_variant)</span> def main [ - <span class="Constant">7</span>:number/<span class="Special">raw <- </span>test <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">7</span>:num/<span class="Special">raw <- </span>test <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">5</span> ] -def test a:number <span class="Delimiter">-></span> z:number [ +def test a:num <span class="Delimiter">-></span> z:num [ z<span class="Special"> <- </span>copy <span class="Constant">1</span> ] -def test a:number<span class="Delimiter">,</span> b:number <span class="Delimiter">-></span> z:number [ +def test a:num<span class="Delimiter">,</span> b:num <span class="Delimiter">-></span> z:num [ z<span class="Special"> <- </span>copy <span class="Constant">2</span> ] <span class="traceContains">+mem: storing 2 in location 7</span> @@ -421,17 +421,17 @@ vector<recipe_ordinal> matching_variants<span class="Delimiter">(</span><s <span class="Delimiter">:(scenario static_dispatch_disabled_in_recipe_without_variants)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>test <span class="Constant">3</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>test <span class="Constant">3</span> ] def test [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>next-ingredient <span class="Comment"># ensure no header</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>next-ingredient <span class="Comment"># ensure no header</span> <span class="Identifier">return</span> <span class="Constant">34</span> ] <span class="traceContains">+mem: storing 34 in location 1</span> <span class="Delimiter">:(scenario static_dispatch_disabled_on_headerless_definition)</span> <span class="Special">% Hide_errors = true;</span> -def test a:number <span class="Delimiter">-></span> z:number [ +def test a:num <span class="Delimiter">-></span> z:num [ z<span class="Special"> <- </span>copy <span class="Constant">1</span> ] def test [ @@ -444,22 +444,22 @@ def test [ def test [ <span class="Identifier">return</span> <span class="Constant">34</span> ] -def test a:number <span class="Delimiter">-></span> z:number [ +def test a:num <span class="Delimiter">-></span> z:num [ z<span class="Special"> <- </span>copy <span class="Constant">1</span> ] <span class="traceContains">+error: redefining recipe test</span> <span class="Delimiter">:(scenario static_dispatch_on_primitive_names)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number - <span class="Constant">4</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">0</span>/<span class="Constant">false</span> - <span class="Constant">5</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">0</span>/<span class="Constant">false</span> - <span class="Constant">6</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">4</span>:boolean<span class="Delimiter">,</span> <span class="Constant">5</span>:boolean + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num + <span class="Constant">4</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">0</span>/<span class="Constant">false</span> + <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">0</span>/<span class="Constant">false</span> + <span class="Constant">6</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">4</span>:<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Constant">5</span>:<span class="Normal">bool</span> ] <span class="Comment"># temporarily hardcode number equality to always fail</span> -def equal x:number<span class="Delimiter">,</span> y:number <span class="Delimiter">-></span> z:boolean [ +def equal x:num<span class="Delimiter">,</span> y:num <span class="Delimiter">-></span> z:<span class="Normal">bool</span> [ local-scope load-ingredients z<span class="Special"> <- </span>copy <span class="Constant">0</span>/<span class="Constant">false</span> @@ -473,12 +473,12 @@ def equal x:number<span class="Delimiter">,</span> y:number <span class="Delimit def main [ _<span class="Special"> <- </span>test <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span> ] -def test a:number <span class="Delimiter">-></span> z:point [ +def test a:num <span class="Delimiter">-></span> z:point [ local-scope load-ingredients z<span class="Special"> <- </span>merge a<span class="Delimiter">,</span> <span class="Constant">0</span> ] -def test a:number<span class="Delimiter">,</span> b:number <span class="Delimiter">-></span> z:point [ +def test a:num<span class="Delimiter">,</span> b:num <span class="Delimiter">-></span> z:point [ local-scope load-ingredients z<span class="Special"> <- </span>merge a<span class="Delimiter">,</span> b @@ -487,42 +487,42 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario static_dispatch_works_with_compound_type_containing_container_defined_after_first_use)</span> def main [ - <span class="Normal">x</span>:address:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type + <span class="Normal">x</span>:&:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type test x ] container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num ] -def test a:address:foo <span class="Delimiter">-></span> z:number [ +def test a:&:foo <span class="Delimiter">-></span> z:num [ local-scope load-ingredients - <span class="Normal">z</span>:number<span class="Special"> <- </span>get *a<span class="Delimiter">,</span> x:offset + <span class="Normal">z</span>:num<span class="Special"> <- </span>get *a<span class="Delimiter">,</span> x:offset ] $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario static_dispatch_works_with_compound_type_containing_container_defined_after_second_use)</span> def main [ - <span class="Normal">x</span>:address:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type + <span class="Normal">x</span>:&:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type test x ] -def test a:address:foo <span class="Delimiter">-></span> z:number [ +def test a:&:foo <span class="Delimiter">-></span> z:num [ local-scope load-ingredients - <span class="Normal">z</span>:number<span class="Special"> <- </span>get *a<span class="Delimiter">,</span> x:offset + <span class="Normal">z</span>:num<span class="Special"> <- </span>get *a<span class="Delimiter">,</span> x:offset ] container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num ] $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario static_dispatch_prefers_literals_to_be_numbers_rather_than_addresses)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>foo <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>foo <span class="Constant">0</span> ] -def foo x:address:number <span class="Delimiter">-></span> y:number [ +def foo x:&:num <span class="Delimiter">-></span> y:num [ <span class="Identifier">return</span> <span class="Constant">34</span> ] -def foo x:number <span class="Delimiter">-></span> y:number [ +def foo x:num <span class="Delimiter">-></span> y:num [ <span class="Identifier">return</span> <span class="Constant">35</span> ] <span class="traceContains">+mem: storing 35 in location 1</span> @@ -531,26 +531,26 @@ def foo x:number <span class="Delimiter">-></span> y:number [ <span class="Special">% Hide_errors = true;</span> def main [ local-scope - <span class="Normal">x</span>:character<span class="Special"> <- </span>copy <span class="Constant">10</span>/newline - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>foo x + <span class="Normal">x</span>:<span class="Normal">char</span><span class="Special"> <- </span>copy <span class="Constant">10</span>/newline + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>foo x ] -def foo x:number <span class="Delimiter">-></span> y:number [ +def foo x:num <span class="Delimiter">-></span> y:num [ load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] -<span class="traceContains">+error: main: ingredient 0 has the wrong type at '1:number/raw <- foo x'</span> +<span class="traceContains">+error: main: ingredient 0 has the wrong type at '1:num/raw <- foo x'</span> <span class="traceAbsent">-mem: storing 34 in location 1</span> <span class="Delimiter">:(scenario static_dispatch_dispatches_literal_to_boolean_before_character)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>foo <span class="Constant">0</span> <span class="Comment"># valid literal for boolean</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>foo <span class="Constant">0</span> <span class="Comment"># valid literal for boolean</span> ] -def foo x:character <span class="Delimiter">-></span> y:number [ +def foo x:<span class="Normal">char</span> <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] -def foo x:boolean <span class="Delimiter">-></span> y:number [ +def foo x:<span class="Normal">bool</span> <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> @@ -560,14 +560,14 @@ def foo x:boolean <span class="Delimiter">-></span> y:number [ <span class="Delimiter">:(scenario static_dispatch_dispatches_literal_to_character_when_out_of_boolean_range)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>foo <span class="Constant">97</span> <span class="Comment"># not a valid literal for boolean</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>foo <span class="Constant">97</span> <span class="Comment"># not a valid literal for boolean</span> ] -def foo x:character <span class="Delimiter">-></span> y:number [ +def foo x:<span class="Normal">char</span> <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] -def foo x:boolean <span class="Delimiter">-></span> y:number [ +def foo x:<span class="Normal">bool</span> <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> @@ -577,14 +577,14 @@ def foo x:boolean <span class="Delimiter">-></span> y:number [ <span class="Delimiter">:(scenario static_dispatch_dispatches_literal_to_number_if_at_all_possible)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>foo <span class="Constant">97</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>foo <span class="Constant">97</span> ] -def foo x:character <span class="Delimiter">-></span> y:number [ +def foo x:<span class="Normal">char</span> <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] -def foo x:number <span class="Delimiter">-></span> y:number [ +def foo x:num <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> @@ -609,20 +609,20 @@ string header_label<span class="Delimiter">(</span><span class="Normal">const</s <span class="Delimiter">:(scenario reload_variant_retains_other_variants)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>foo <span class="Constant">1</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>foo <span class="Constant">1</span>:num ] -def foo x:number <span class="Delimiter">-></span> y:number [ +def foo x:num <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] -def foo x:address:number <span class="Delimiter">-></span> y:number [ +def foo x:&:num <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> ] -def! foo x:address:number <span class="Delimiter">-></span> y:number [ +def! foo x:&:num <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">36</span> @@ -633,33 +633,32 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario dispatch_errors_come_after_unknown_name_errors)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">y</span>:number<span class="Special"> <- </span>foo x + <span class="Normal">y</span>:num<span class="Special"> <- </span>foo x ] -def foo a:number <span class="Delimiter">-></span> b:number [ +def foo a:num <span class="Delimiter">-></span> b:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] -def foo a:boolean <span class="Delimiter">-></span> b:number [ +def foo a:<span class="Normal">bool</span> <span class="Delimiter">-></span> b:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> ] -<span class="traceContains">+error: main: missing type for 'x' in 'y:number <- foo x'</span> -<span class="traceContains">+error: main: failed to find a matching call for 'y:number <- foo x'</span> +<span class="traceContains">+error: main: missing type for 'x' in 'y:num <- foo x'</span> +<span class="traceContains">+error: main: failed to find a matching call for 'y:num <- foo x'</span> <span class="Delimiter">:(scenario override_methods_with_type_abbreviations)</span> -type string = address:array:character def main [ local-scope - <span class="Normal">s</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>foo s + <span class="Normal">s</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>foo s ] def foo a:address:array:character <span class="Delimiter">-></span> result:number [ <span class="Identifier">return</span> <span class="Constant">34</span> ] -<span class="Comment"># identical to previous variant once you take type abbreviation into account</span> -def! foo a:string <span class="Delimiter">-></span> result:number [ +<span class="Comment"># identical to previous variant once you take type abbreviations into account</span> +def! foo a:text <span class="Delimiter">-></span> result:num [ <span class="Identifier">return</span> <span class="Constant">35</span> ] <span class="traceContains">+mem: storing 35 in location 1</span> diff --git a/html/055shape_shifting_container.cc.html b/html/055shape_shifting_container.cc.html index d6bc71c3..42065f9c 100644 --- a/html/055shape_shifting_container.cc.html +++ b/html/055shape_shifting_container.cc.html @@ -59,10 +59,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario size_of_shape_shifting_container)</span> container foo:_t [ <span class="Normal">x</span>:_t - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] def main [ - <span class="Constant">1</span>:foo:number<span class="Special"> <- </span>merge <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">13</span> + <span class="Constant">1</span>:foo:num<span class="Special"> <- </span>merge <span class="Constant">12</span><span class="Delimiter">,</span> <span class="Constant">13</span> <span class="Constant">3</span>:foo:point<span class="Special"> <- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">,</span> <span class="Constant">16</span> ] <span class="traceContains">+mem: storing 12 in location 1</span> @@ -78,7 +78,7 @@ container foo:_a:_b [ <span class="Normal">y</span>:_b ] def main [ - <span class="Constant">1</span>:foo:number:boolean<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>/<span class="Constant">true</span> + <span class="Constant">1</span>:foo:num:<span class="Normal">bool</span><span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">1</span>/<span class="Constant">true</span> ] $error: <span class="Constant">0</span> @@ -88,9 +88,9 @@ container foo:_a:_b [ <span class="Normal">y</span>:_b ] def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] <span class="Comment"># compound types for type ingredients</span> - <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span>address array character<span class="Delimiter">))}</span><span class="Special"> <- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:character/y + <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span>address array character<span class="Delimiter">))}</span><span class="Special"> <- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:text/y ] $error: <span class="Constant">0</span> @@ -104,8 +104,8 @@ container bar:_a:_b [ <span class="Delimiter">{</span>data: <span class="Delimiter">(</span>foo _a <span class="Delimiter">(</span>address _b<span class="Delimiter">))}</span> ] def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] - <span class="Constant">2</span>:bar:number:array:character<span class="Special"> <- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:character/y + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] + <span class="Constant">2</span>:bar:num:@:<span class="Normal">char</span><span class="Special"> <- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:text/y ] $error: <span class="Constant">0</span> @@ -131,7 +131,7 @@ container foo:_b [ <span class="Delimiter">:(scenario type_ingredient_must_start_with_underscore)</span> <span class="Special">% Hide_errors = true;</span> container foo:t [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num ] <span class="traceContains">+error: foo: type ingredient 't' must begin with an underscore</span> @@ -238,10 +238,10 @@ map<string<span class="Delimiter">,</span> type_ordinal> type_ingredient_n <span class="Delimiter">:(scenario size_of_shape_shifting_exclusive_container)</span> exclusive-container foo:_t [ <span class="Normal">x</span>:_t - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] def main [ - <span class="Constant">1</span>:foo:number<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">1</span>:foo:num<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span> <span class="Constant">3</span>:foo:point<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">,</span> <span class="Constant">16</span> <span class="Constant">6</span>:foo:point<span class="Special"> <- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">23</span> ] @@ -262,18 +262,18 @@ def main [ <span class="Delimiter">:(scenario get_on_shape_shifting_container)</span> container foo:_t [ <span class="Normal">x</span>:_t - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo:point<span class="Special"> <- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">,</span> <span class="Constant">16</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>get <span class="Constant">1</span>:foo:point<span class="Delimiter">,</span> y:offset + <span class="Constant">2</span>:num<span class="Special"> <- </span>get <span class="Constant">1</span>:foo:point<span class="Delimiter">,</span> y:offset ] <span class="traceContains">+mem: storing 16 in location 2</span> <span class="Delimiter">:(scenario get_on_shape_shifting_container_2)</span> container foo:_t [ <span class="Normal">x</span>:_t - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo:point<span class="Special"> <- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">,</span> <span class="Constant">16</span> @@ -285,26 +285,26 @@ def main [ <span class="Delimiter">:(scenario get_on_shape_shifting_container_3)</span> container foo:_t [ <span class="Normal">x</span>:_t - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] def main [ - <span class="Constant">1</span>:foo:address:point<span class="Special"> <- </span>merge <span class="Constant">34</span>/unsafe<span class="Delimiter">,</span> <span class="Constant">48</span> - <span class="Constant">3</span>:address:point<span class="Special"> <- </span>get <span class="Constant">1</span>:foo:address:point<span class="Delimiter">,</span> x:offset + <span class="Constant">1</span>:foo:&:point<span class="Special"> <- </span>merge <span class="Constant">34</span>/unsafe<span class="Delimiter">,</span> <span class="Constant">48</span> + <span class="Constant">3</span>:&:point<span class="Special"> <- </span>get <span class="Constant">1</span>:foo:&:point<span class="Delimiter">,</span> x:offset ] <span class="traceContains">+mem: storing 34 in location 3</span> <span class="Delimiter">:(scenario get_on_shape_shifting_container_inside_container)</span> container foo:_t [ <span class="Normal">x</span>:_t - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] container bar [ <span class="Normal">x</span>:foo:point - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:bar<span class="Special"> <- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">,</span> <span class="Constant">16</span><span class="Delimiter">,</span> <span class="Constant">17</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>get <span class="Constant">1</span>:bar<span class="Delimiter">,</span> <span class="Constant">1</span>:offset + <span class="Constant">2</span>:num<span class="Special"> <- </span>get <span class="Constant">1</span>:bar<span class="Delimiter">,</span> <span class="Constant">1</span>:offset ] <span class="traceContains">+mem: storing 17 in location 2</span> @@ -314,10 +314,10 @@ container foo:_a:_b [ <span class="Normal">y</span>:_b ] def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] - <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span>address array character<span class="Delimiter">))}</span><span class="Special"> <- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:address:array:character/y - <span class="Constant">3</span>:address:array:character<span class="Special"> <- </span>get <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span>address array character<span class="Delimiter">))},</span> y:offset - <span class="Constant">4</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:address:array:character<span class="Delimiter">,</span> <span class="Constant">3</span>:address:array:character + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] + <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span>address array character<span class="Delimiter">))}</span><span class="Special"> <- </span>merge <span class="Constant">34</span>/x<span class="Delimiter">,</span> <span class="Constant">1</span>:text/y + <span class="Constant">3</span>:text<span class="Special"> <- </span>get <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>foo number <span class="Delimiter">(</span>address array character<span class="Delimiter">))},</span> y:offset + <span class="Constant">4</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:text<span class="Delimiter">,</span> <span class="Constant">3</span>:text ] <span class="traceContains">+mem: storing 1 in location 4</span> @@ -403,7 +403,7 @@ assert<span class="Delimiter">(</span>!contains_type_ingredient<span class="Deli <span class="Normal">void</span> test_replace_type_ingredients_entire<span class="Delimiter">()</span> <span class="Delimiter">{</span> run<span class="Delimiter">(</span><span class="Constant">"container foo:_elem [</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" x:_elem</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" y:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" y:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent callsite<span class="Delimiter">(</span><span class="Constant">"x:foo:point"</span><span class="Delimiter">);</span> reagent element = element_type<span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span> @@ -439,7 +439,7 @@ assert<span class="Delimiter">(</span>!contains_type_ingredient<span class="Deli <span class="Constant">" x:_elem</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"container bar:_elem [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:foo:_elem:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:foo:_elem:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent callsite<span class="Delimiter">(</span><span class="Constant">"x:bar:address"</span><span class="Delimiter">);</span> reagent element = element_type<span class="Delimiter">(</span>callsite<span class="Delimiter">.</span>type<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span> @@ -485,7 +485,7 @@ assert<span class="Delimiter">(</span>!contains_type_ingredient<span class="Deli <span class="Normal">void</span> test_replace_middle_type_ingredient_with_multiple3<span class="Delimiter">()</span> <span class="Delimiter">{</span> run<span class="Delimiter">(</span><span class="Constant">"container foo_table:_key:_value [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" data:address:array:foo_table_row:_key:_value</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" data:&:@:foo_table_row:_key:_value</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"container foo_table_row:_key:_value [</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -509,11 +509,11 @@ assert<span class="Delimiter">(</span>!contains_type_ingredient<span class="Deli <span class="Special">% Hide_errors = true;</span> container foo:_t [ <span class="Normal">x</span>:_t - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] def main [ <span class="Constant">10</span>:foo:point<span class="Special"> <- </span>merge <span class="Constant">14</span><span class="Delimiter">,</span> <span class="Constant">15</span><span class="Delimiter">,</span> <span class="Constant">16</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>get <span class="Constant">10</span>:foo<span class="Delimiter">,</span> <span class="Constant">1</span>:offset + <span class="Constant">1</span>:num<span class="Special"> <- </span>get <span class="Constant">10</span>:foo<span class="Delimiter">,</span> <span class="Constant">1</span>:offset ] <span class="traceContains">+error: illegal type "foo" seems to be missing a type ingredient or three</span> @@ -538,7 +538,7 @@ type_info& info = get<span class="Delimiter">(</span>Type<span class="Delimi <span class="Delimiter">:(before "End Unit Tests")</span> <span class="Normal">void</span> test_container_sizes_shape_shifting_container<span class="Delimiter">()</span> <span class="Delimiter">{</span> run<span class="Delimiter">(</span><span class="Constant">"container foo:_t [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" y:_t</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:foo:point"</span><span class="Delimiter">);</span> @@ -548,23 +548,23 @@ type_info& info = get<span class="Delimiter">(</span>Type<span class="Delimi <span class="Normal">void</span> test_container_sizes_shape_shifting_exclusive_container<span class="Delimiter">()</span> <span class="Delimiter">{</span> run<span class="Delimiter">(</span><span class="Constant">"exclusive-container foo:_t [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" y:_t</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> reagent r<span class="Delimiter">(</span><span class="Constant">"x:foo:point"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> CHECK_EQ<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>size<span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">);</span> - reagent r2<span class="Delimiter">(</span><span class="Constant">"x:foo:number"</span><span class="Delimiter">);</span> + reagent r2<span class="Delimiter">(</span><span class="Constant">"x:foo:num"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r2<span class="Delimiter">);</span> CHECK_EQ<span class="Delimiter">(</span>r2<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>size<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span> <span class="Delimiter">}</span> <span class="Normal">void</span> test_container_sizes_compound_type_ingredient<span class="Delimiter">()</span> <span class="Delimiter">{</span> run<span class="Delimiter">(</span><span class="Constant">"container foo:_t [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" y:_t</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> - reagent r<span class="Delimiter">(</span><span class="Constant">"x:foo:address:point"</span><span class="Delimiter">);</span> + reagent r<span class="Delimiter">(</span><span class="Constant">"x:foo:&:point"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> CHECK_EQ<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>size<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span> <span class="Comment">// scan also pre-computes metadata for type ingredient</span> @@ -575,10 +575,10 @@ type_info& info = get<span class="Delimiter">(</span>Type<span class="Delimi <span class="Normal">void</span> test_container_sizes_recursive_shape_shifting_container<span class="Delimiter">()</span> <span class="Delimiter">{</span> run<span class="Delimiter">(</span><span class="Constant">"container foo:_t [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" y:address:foo:_t</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" y:&:foo:_t</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> - reagent r2<span class="Delimiter">(</span><span class="Constant">"x:foo:number"</span><span class="Delimiter">);</span> + reagent r2<span class="Delimiter">(</span><span class="Constant">"x:foo:num"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r2<span class="Delimiter">);</span> CHECK_EQ<span class="Delimiter">(</span>r2<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>size<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span> <span class="Delimiter">}</span> @@ -598,10 +598,10 @@ type_info& info = get<span class="Delimiter">(</span>Type<span class="Delimi <span class="Delimiter">:(before "End Unit Tests")</span> <span class="Normal">void</span> test_container_address_offsets_in_shape_shifting_container<span class="Delimiter">()</span> <span class="Delimiter">{</span> run<span class="Delimiter">(</span><span class="Constant">"container foo:_t [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" y:_t</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> - reagent r<span class="Delimiter">(</span><span class="Constant">"x:foo:address:number"</span><span class="Delimiter">);</span> + reagent r<span class="Delimiter">(</span><span class="Constant">"x:foo:&:num"</span><span class="Delimiter">);</span> compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">);</span> CHECK_EQ<span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>r<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>address<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span> @@ -615,14 +615,14 @@ type_info& info = get<span class="Delimiter">(</span>Type<span class="Delimi <span class="Normal">void</span> test_container_address_offsets_in_nested_shape_shifting_container<span class="Delimiter">()</span> <span class="Delimiter">{</span> run<span class="Delimiter">(</span><span class="Constant">"container foo:_t [</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" x:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" x:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" y:_t</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"container bar:_t [</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" x:_t</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" y:foo:_t</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> - reagent r<span class="Delimiter">(</span><span class="Constant">"x:bar:address:number"</span><span class="Delimiter">);</span> + reagent r<span class="Delimiter">(</span><span class="Constant">"x:bar:&:num"</span><span class="Delimiter">);</span> CLEAR_TRACE<span class="Delimiter">;</span> compute_container_sizes<span class="Delimiter">(</span>r<span class="Delimiter">);</span> compute_container_address_offsets<span class="Delimiter">(</span>r<span class="Delimiter">);</span> @@ -642,12 +642,12 @@ type_info& info = get<span class="Delimiter">(</span>Type<span class="Delimi <span class="Delimiter">:(scenario merge_check_shape_shifting_container_containing_exclusive_container)</span> container foo:_elem [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:_elem ] exclusive-container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo:bar<span class="Special"> <- </span>merge <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">34</span> @@ -660,12 +660,12 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario merge_check_shape_shifting_container_containing_exclusive_container_2)</span> <span class="Special">% Hide_errors = true;</span> container foo:_elem [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:_elem ] exclusive-container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo:bar<span class="Special"> <- </span>merge <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> @@ -674,12 +674,12 @@ def main [ <span class="Delimiter">:(scenario merge_check_shape_shifting_exclusive_container_containing_container)</span> exclusive-container foo:_elem [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:_elem ] container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">23</span><span class="Delimiter">,</span> <span class="Constant">34</span> @@ -691,12 +691,12 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario merge_check_shape_shifting_exclusive_container_containing_container_2)</span> exclusive-container foo:_elem [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:_elem ] container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo:bar<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">23</span> @@ -706,12 +706,12 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario merge_check_shape_shifting_exclusive_container_containing_container_3)</span> <span class="Special">% Hide_errors = true;</span> exclusive-container foo:_elem [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:_elem ] container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo:bar<span class="Special"> <- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> <span class="Constant">23</span> diff --git a/html/056shape_shifting_recipe.cc.html b/html/056shape_shifting_recipe.cc.html index 347be81a..2b120069 100644 --- a/html/056shape_shifting_recipe.cc.html +++ b/html/056shape_shifting_recipe.cc.html @@ -43,7 +43,7 @@ def main [ <span class="Constant">11</span>:point<span class="Special"> <- </span>foo <span class="Constant">10</span>:point ] <span class="Comment"># non-matching variant</span> -def foo a:number <span class="Delimiter">-></span> result:number [ +def foo a:num <span class="Delimiter">-></span> result:num [ local-scope load-ingredients result<span class="Special"> <- </span>copy <span class="Constant">34</span> @@ -286,7 +286,9 @@ recipe_ordinal new_variant<span class="Delimiter">(</span>recipe_ordinal exempla <span class="Comment">// a) perform tangle *before* replacing type ingredients, just in case</span> <span class="Comment">// inserted code involves type ingredients</span> insert_fragments<span class="Delimiter">(</span>new_recipe<span class="Delimiter">);</span> - <span class="Comment">// b) do the work of check_types_by_name while supporting type-ingredients</span> + <span class="Comment">// b) do the work of check_or_set_types_by_name (and its prerequisites)</span> + <span class="Comment">// while supporting type-ingredients</span> + expand_type_abbreviations<span class="Delimiter">(</span>new_recipe<span class="Delimiter">);</span> compute_type_names<span class="Delimiter">(</span>new_recipe<span class="Delimiter">);</span> <span class="Comment">// that gives enough information to replace type-ingredients with concrete types</span> <span class="Delimiter">{</span> @@ -305,7 +307,7 @@ recipe_ordinal new_variant<span class="Delimiter">(</span>recipe_ordinal exempla <span class="Delimiter">}</span> <span class="Normal">void</span> compute_type_names<span class="Delimiter">(</span>recipe& variant<span class="Delimiter">)</span> <span class="Delimiter">{</span> - trace<span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"compute type names: "</span> << variant<span class="Delimiter">.</span>name << end<span class="Delimiter">();</span> + trace<span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- compute type names: "</span> << variant<span class="Delimiter">.</span>name << end<span class="Delimiter">();</span> map<string<span class="Delimiter">,</span> type_tree*> type_names<span class="Delimiter">;</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 < SIZE<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> save_or_deduce_type_name<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">""</span><span class="Delimiter">);</span> @@ -516,6 +518,7 @@ string inspect<span class="Delimiter">(</span><span class="Normal">const</span> <span class="Delimiter">}</span> <span class="Normal">void</span> ensure_all_concrete_types<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> recipe& new_recipe<span class="Delimiter">,</span> <span class="Normal">const</span> recipe& exemplar<span class="Delimiter">)</span> <span class="Delimiter">{</span> + trace<span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- ensure all concrete types in recipe "</span> << new_recipe<span class="Delimiter">.</span>name << end<span class="Delimiter">();</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 < SIZE<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> ensure_all_concrete_types<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> exemplar<span class="Delimiter">);</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 < SIZE<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> @@ -547,7 +550,7 @@ def main [ <span class="Constant">11</span>:point<span class="Special"> <- </span>foo <span class="Constant">10</span>:point ] <span class="Comment"># non-matching shape-shifting variant</span> -def foo a:_t<span class="Delimiter">,</span> b:_t <span class="Delimiter">-></span> result:number [ +def foo a:_t<span class="Delimiter">,</span> b:_t <span class="Delimiter">-></span> result:num [ local-scope load-ingredients result<span class="Special"> <- </span>copy <span class="Constant">34</span> @@ -574,7 +577,7 @@ def bar a:foo:_t <span class="Delimiter">-></span> result:_t [ ] container foo:_t [ <span class="Normal">x</span>:_t - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] <span class="traceContains">+mem: storing 14 in location 20</span> <span class="traceContains">+mem: storing 15 in location 21</span> @@ -585,7 +588,7 @@ container c:_a:_b [ <span class="Normal">b</span>:_b ] def main [ - <span class="Normal">s</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] + <span class="Normal">s</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] <span class="Delimiter">{</span>x: <span class="Delimiter">(</span>c <span class="Delimiter">(</span>address array character<span class="Delimiter">)</span> number<span class="Delimiter">)}</span><span class="Special"> <- </span>merge s<span class="Delimiter">,</span> <span class="Constant">34</span> foo x ] @@ -603,12 +606,12 @@ def main [ def bar a:foo:_t <span class="Delimiter">-></span> result:_t [ local-scope load-ingredients - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> result<span class="Special"> <- </span>get a<span class="Delimiter">,</span> x:offset <span class="Comment"># shouldn't collide with other variable</span> ] container foo:_t [ <span class="Normal">x</span>:_t - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] <span class="traceContains">+mem: storing 14 in location 20</span> <span class="traceContains">+mem: storing 15 in location 21</span> @@ -624,14 +627,14 @@ def foo a:_t [ <span class="Delimiter">:(scenario shape_shifting_recipe_handles_shape_shifting_new_ingredient)</span> def main [ - <span class="Constant">1</span>:address:foo:point<span class="Special"> <- </span>bar <span class="Constant">3</span> - <span class="Constant">11</span>:foo:point<span class="Special"> <- </span>copy *<span class="Constant">1</span>:address:foo:point + <span class="Constant">1</span>:&:foo:point<span class="Special"> <- </span>bar <span class="Constant">3</span> + <span class="Constant">11</span>:foo:point<span class="Special"> <- </span>copy *<span class="Constant">1</span>:&:foo:point ] container foo:_t [ <span class="Normal">x</span>:_t - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] -def bar x:number <span class="Delimiter">-></span> result:address:foo:_t [ +def bar x:num <span class="Delimiter">-></span> result:&:foo:_t [ local-scope load-ingredients <span class="Comment"># new refers to _t in its ingredient *value*</span> @@ -643,10 +646,10 @@ def bar x:number <span class="Delimiter">-></span> result:address:foo:_t [ <span class="Delimiter">:(scenario shape_shifting_recipe_handles_shape_shifting_new_ingredient_2)</span> def main [ - <span class="Constant">1</span>:address:foo:point<span class="Special"> <- </span>bar <span class="Constant">3</span> - <span class="Constant">11</span>:foo:point<span class="Special"> <- </span>copy *<span class="Constant">1</span>:address:foo:point + <span class="Constant">1</span>:&:foo:point<span class="Special"> <- </span>bar <span class="Constant">3</span> + <span class="Constant">11</span>:foo:point<span class="Special"> <- </span>copy *<span class="Constant">1</span>:&:foo:point ] -def bar x:number <span class="Delimiter">-></span> result:address:foo:_t [ +def bar x:num <span class="Delimiter">-></span> result:&:foo:_t [ local-scope load-ingredients <span class="Comment"># new refers to _t in its ingredient *value*</span> @@ -655,7 +658,7 @@ def bar x:number <span class="Delimiter">-></span> result:address:foo:_t [ <span class="Comment"># container defined after use</span> container foo:_t [ <span class="Normal">x</span>:_t - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] <span class="traceContains">+mem: storing 0 in location 11</span> <span class="traceContains">+mem: storing 0 in location 12</span> @@ -665,7 +668,7 @@ container foo:_t [ def main [ _<span class="Special"> <- </span>bar <span class="Constant">34</span> ] -def bar x:_t <span class="Delimiter">-></span> result:address:_t [ +def bar x:_t <span class="Delimiter">-></span> result:&:_t [ local-scope load-ingredients result<span class="Special"> <- </span>copy <span class="Constant">0</span> @@ -679,7 +682,7 @@ $error: <span class="Constant">0</span> transform<span class="Delimiter">(</span><span class="Constant">"def barz x:_elem [</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" local-scope</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" load-ingredients</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" y:address:number <- new _elem:type</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" y:&:num <- new _elem:type</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"def fooz [</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" local-scope</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -689,7 +692,7 @@ $error: <span class="Constant">0</span> <span class="Comment">// type-ingredient</span> run<span class="Delimiter">(</span><span class="Constant">"container foo:_elem [</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">" x:_elem</span><span class="cSpecial">\n</span><span class="Constant">"</span> - <span class="Constant">" y:number</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">" y:num</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> <span class="Comment">// then it should work as usual</span> reagent callsite<span class="Delimiter">(</span><span class="Constant">"x:foo:point"</span><span class="Delimiter">);</span> @@ -701,10 +704,10 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario shape_shifting_recipe_supports_compound_types)</span> def main [ - <span class="Constant">1</span>:address:point<span class="Special"> <- </span><span class="Normal">new</span> point:type - *<span class="Constant">1</span>:address:point<span class="Special"> <- </span>put *<span class="Constant">1</span>:address:point<span class="Delimiter">,</span> y:offset<span class="Delimiter">,</span> <span class="Constant">34</span> - <span class="Constant">3</span>:address:point<span class="Special"> <- </span>bar <span class="Constant">1</span>:address:point <span class="Comment"># specialize _t to address:point</span> - <span class="Constant">4</span>:point<span class="Special"> <- </span>copy *<span class="Constant">3</span>:address:point + <span class="Constant">1</span>:&:point<span class="Special"> <- </span><span class="Normal">new</span> point:type + *<span class="Constant">1</span>:&:point<span class="Special"> <- </span>put *<span class="Constant">1</span>:&:point<span class="Delimiter">,</span> y:offset<span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">3</span>:&:point<span class="Special"> <- </span>bar <span class="Constant">1</span>:&:point <span class="Comment"># specialize _t to address:point</span> + <span class="Constant">4</span>:point<span class="Special"> <- </span>copy *<span class="Constant">3</span>:&:point ] def bar a:_t <span class="Delimiter">-></span> result:_t [ local-scope @@ -716,14 +719,14 @@ def bar a:_t <span class="Delimiter">-></span> result:_t [ <span class="Delimiter">:(scenario shape_shifting_recipe_error)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">a</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> - <span class="Normal">b</span>:address:number<span class="Special"> <- </span>foo a + <span class="Normal">a</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Normal">b</span>:&:num<span class="Special"> <- </span>foo a ] def foo a:_t <span class="Delimiter">-></span> b:_t [ load-ingredients b<span class="Special"> <- </span>copy a ] -<span class="traceContains">+error: main: no call found for 'b:address:number <- foo a'</span> +<span class="traceContains">+error: main: no call found for 'b:&:num <- foo a'</span> <span class="Delimiter">:(scenario specialize_inside_recipe_without_header)</span> def main [ @@ -731,8 +734,8 @@ def main [ ] def foo [ local-scope - <span class="Normal">x</span>:number<span class="Special"> <- </span>next-ingredient <span class="Comment"># ensure no header</span> - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>bar x <span class="Comment"># call a shape-shifting recipe</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>next-ingredient <span class="Comment"># ensure no header</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>bar x <span class="Comment"># call a shape-shifting recipe</span> ] def bar x:_elem <span class="Delimiter">-></span> y:_elem [ local-scope @@ -745,7 +748,7 @@ def bar x:_elem <span class="Delimiter">-></span> y:_elem [ def main [ local-scope <span class="Comment"># permit literal to map to number</span> - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>foo <span class="Constant">3</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>foo <span class="Constant">3</span> ] def foo x:_elem <span class="Delimiter">-></span> y:_elem [ local-scope @@ -758,7 +761,7 @@ def foo x:_elem <span class="Delimiter">-></span> y:_elem [ def main [ local-scope <span class="Comment"># permit literal to map to character</span> - <span class="Constant">1</span>:character/<span class="Special">raw <- </span>foo <span class="Constant">3</span> + <span class="Constant">1</span>:<span class="Normal">char</span>/<span class="Special">raw <- </span>foo <span class="Constant">3</span> ] def foo x:_elem <span class="Delimiter">-></span> y:_elem [ local-scope @@ -771,9 +774,9 @@ def foo x:_elem <span class="Delimiter">-></span> y:_elem [ def main [ local-scope <span class="Comment"># permit '0' to map to address to shape-shifting type-ingredient</span> - <span class="Constant">1</span>:address:character/<span class="Special">raw <- </span>foo <span class="Constant">0</span> + <span class="Constant">1</span>:&:<span class="Normal">char</span>/<span class="Special">raw <- </span>foo <span class="Constant">0</span> ] -def foo x:address:_elem <span class="Delimiter">-></span> y:address:_elem [ +def foo x:&:_elem <span class="Delimiter">-></span> y:&:_elem [ local-scope load-ingredients y<span class="Special"> <- </span>copy x @@ -788,7 +791,7 @@ def main [ <span class="Comment"># ambiguous call: what's the type of its ingredient?!</span> foo <span class="Constant">0</span> ] -def foo x:address:_elem <span class="Delimiter">-></span> y:address:_elem [ +def foo x:&:_elem <span class="Delimiter">-></span> y:&:_elem [ local-scope load-ingredients y<span class="Special"> <- </span>copy x @@ -802,25 +805,25 @@ def main [ def foo x:_elem<span class="Delimiter">,</span> y:_elem [ local-scope load-ingredients - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>add x<span class="Delimiter">,</span> y + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>add x<span class="Delimiter">,</span> y ] <span class="traceContains">+mem: storing 7 in location 1</span> <span class="Delimiter">:(scenario multiple_shape_shifting_variants)</span> <span class="Comment"># try to call two different shape-shifting recipes with the same name</span> def main [ - <span class="Normal">e1</span>:d1:number<span class="Special"> <- </span>merge <span class="Constant">3</span> - <span class="Normal">e2</span>:d2:number<span class="Special"> <- </span>merge <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">5</span> - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>foo e1 - <span class="Constant">2</span>:number/<span class="Special">raw <- </span>foo e2 + <span class="Normal">e1</span>:d1:num<span class="Special"> <- </span>merge <span class="Constant">3</span> + <span class="Normal">e2</span>:d2:num<span class="Special"> <- </span>merge <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">5</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>foo e1 + <span class="Constant">2</span>:num/<span class="Special">raw <- </span>foo e2 ] <span class="Comment"># the two shape-shifting definitions</span> -def foo a:d1:_elem <span class="Delimiter">-></span> b:number [ +def foo a:d1:_elem <span class="Delimiter">-></span> b:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] -def foo a:d2:_elem <span class="Delimiter">-></span> b:number [ +def foo a:d2:_elem <span class="Delimiter">-></span> b:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> @@ -830,7 +833,7 @@ container d1:_elem [ <span class="Normal">x</span>:_elem ] container d2:_elem [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:_elem ] <span class="traceContains">+mem: storing 34 in location 1</span> @@ -839,17 +842,17 @@ container d2:_elem [ <span class="Delimiter">:(scenario multiple_shape_shifting_variants_2)</span> <span class="Comment"># static dispatch between shape-shifting variants, _including pointer lookups_</span> def main [ - <span class="Normal">e1</span>:d1:number<span class="Special"> <- </span>merge <span class="Constant">3</span> - <span class="Normal">e2</span>:address:d2:number<span class="Special"> <- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>d2 number<span class="Delimiter">)</span>: type<span class="Delimiter">}</span> - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>foo e1 - <span class="Constant">2</span>:number/<span class="Special">raw <- </span>foo *e2 <span class="Comment"># different from previous scenario</span> + <span class="Normal">e1</span>:d1:num<span class="Special"> <- </span>merge <span class="Constant">3</span> + <span class="Normal">e2</span>:&:d2:num<span class="Special"> <- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>d2 number<span class="Delimiter">)</span>: type<span class="Delimiter">}</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>foo e1 + <span class="Constant">2</span>:num/<span class="Special">raw <- </span>foo *e2 <span class="Comment"># different from previous scenario</span> ] -def foo a:d1:_elem <span class="Delimiter">-></span> b:number [ +def foo a:d1:_elem <span class="Delimiter">-></span> b:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] -def foo a:d2:_elem <span class="Delimiter">-></span> b:number [ +def foo a:d2:_elem <span class="Delimiter">-></span> b:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> @@ -858,7 +861,7 @@ container d1:_elem [ <span class="Normal">x</span>:_elem ] container d2:_elem [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:_elem ] <span class="traceContains">+mem: storing 34 in location 1</span> @@ -867,10 +870,10 @@ container d2:_elem [ <span class="Delimiter">:(scenario missing_type_in_shape_shifting_recipe)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">a</span>:d1:number<span class="Special"> <- </span>merge <span class="Constant">3</span> + <span class="Normal">a</span>:d1:num<span class="Special"> <- </span>merge <span class="Constant">3</span> foo a ] -def foo a:d1:_elem <span class="Delimiter">-></span> b:number [ +def foo a:d1:_elem <span class="Delimiter">-></span> b:num [ local-scope load-ingredients copy e <span class="Comment"># no such variable</span> @@ -886,10 +889,10 @@ container d1:_elem [ <span class="Delimiter">:(scenario missing_type_in_shape_shifting_recipe_2)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Normal">a</span>:d1:number<span class="Special"> <- </span>merge <span class="Constant">3</span> + <span class="Normal">a</span>:d1:num<span class="Special"> <- </span>merge <span class="Constant">3</span> foo a ] -def foo a:d1:_elem <span class="Delimiter">-></span> b:number [ +def foo a:d1:_elem <span class="Delimiter">-></span> b:num [ local-scope load-ingredients get e<span class="Delimiter">,</span> x:offset <span class="Comment"># unknown variable in a 'get', which does some extra checking</span> @@ -905,15 +908,15 @@ container d1:_elem [ <span class="Delimiter">:(scenarios transform)</span> <span class="Delimiter">:(scenario specialize_recursive_shape_shifting_recipe)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>foo <span class="Constant">1</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>foo <span class="Constant">1</span>:num ] -def foo x:_elem <span class="Delimiter">-></span> y:number [ +def foo x:_elem <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Delimiter">{</span> <span class="Identifier">break</span> - <span class="Normal">y</span>:number<span class="Special"> <- </span>foo x + <span class="Normal">y</span>:num<span class="Special"> <- </span>foo x <span class="Delimiter">}</span> <span class="Identifier">return</span> y ] @@ -923,15 +926,15 @@ def foo x:_elem <span class="Delimiter">-></span> y:number [ <span class="Delimiter">:(scenarios run)</span> <span class="Delimiter">:(scenario specialize_most_similar_variant)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - <span class="Constant">2</span>:number<span class="Special"> <- </span>foo <span class="Constant">1</span>:address:number + <span class="Constant">1</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:num<span class="Special"> <- </span>foo <span class="Constant">1</span>:&:num ] -def foo x:_elem <span class="Delimiter">-></span> y:number [ +def foo x:_elem <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] -def foo x:address:_elem <span class="Delimiter">-></span> y:number [ +def foo x:&:_elem <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> @@ -941,18 +944,18 @@ def foo x:address:_elem <span class="Delimiter">-></span> y:number [ <span class="Delimiter">:(scenario specialize_most_similar_variant_2)</span> <span class="Comment"># version with headers padded with lots of unrelated concrete types</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">23</span> - <span class="Constant">2</span>:address:array:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>foo <span class="Constant">2</span>:address:array:number<span class="Delimiter">,</span> <span class="Constant">1</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">23</span> + <span class="Constant">2</span>:&:@:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>foo <span class="Constant">2</span>:&:@:num<span class="Delimiter">,</span> <span class="Constant">1</span>:num ] <span class="Comment"># variant with concrete type</span> -def foo dummy:address:array:number<span class="Delimiter">,</span> x:number <span class="Delimiter">-></span> y:number<span class="Delimiter">,</span> dummy:address:array:number [ +def foo dummy:&:@:num<span class="Delimiter">,</span> x:num <span class="Delimiter">-></span> y:num<span class="Delimiter">,</span> dummy:&:@:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] <span class="Comment"># shape-shifting variant</span> -def foo dummy:address:array:number<span class="Delimiter">,</span> x:_elem <span class="Delimiter">-></span> y:number<span class="Delimiter">,</span> dummy:address:array:number [ +def foo dummy:&:@:num<span class="Delimiter">,</span> x:_elem <span class="Delimiter">-></span> y:num<span class="Delimiter">,</span> dummy:&:@:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> @@ -962,28 +965,28 @@ def foo dummy:address:array:number<span class="Delimiter">,</span> x:_elem <span <span class="Delimiter">:(scenario specialize_most_similar_variant_3)</span> def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] - foo <span class="Constant">1</span>:address:array:character + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] + foo <span class="Constant">1</span>:text ] -def foo x:address:array:character [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> +def foo x:text [ + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> ] -def foo x:address:_elem [ - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> +def foo x:&:_elem [ + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> ] <span class="Comment"># make sure the more precise version was used</span> <span class="traceContains">+mem: storing 34 in location 2</span> <span class="Delimiter">:(scenario specialize_literal_as_number)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>foo <span class="Constant">23</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>foo <span class="Constant">23</span> ] -def foo x:_elem <span class="Delimiter">-></span> y:number [ +def foo x:_elem <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] -def foo x:character <span class="Delimiter">-></span> y:number [ +def foo x:<span class="Normal">char</span> <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> @@ -993,16 +996,16 @@ def foo x:character <span class="Delimiter">-></span> y:number [ <span class="Delimiter">:(scenario specialize_literal_as_number_2)</span> <span class="Comment"># version calling with literal</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>foo <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>foo <span class="Constant">0</span> ] <span class="Comment"># variant with concrete type</span> -def foo x:number <span class="Delimiter">-></span> y:number [ +def foo x:num <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] <span class="Comment"># shape-shifting variant</span> -def foo x:address:_elem <span class="Delimiter">-></span> y:number [ +def foo x:&:_elem <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> @@ -1012,16 +1015,16 @@ def foo x:address:_elem <span class="Delimiter">-></span> y:number [ <span class="Delimiter">:(scenario specialize_literal_as_address)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>foo <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>foo <span class="Constant">0</span> ] <span class="Comment"># variant with concrete address type</span> -def foo x:address:number <span class="Delimiter">-></span> y:number [ +def foo x:&:num <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">34</span> ] <span class="Comment"># shape-shifting variant</span> -def foo x:address:_elem <span class="Delimiter">-></span> y:number [ +def foo x:&:_elem <span class="Delimiter">-></span> y:num [ local-scope load-ingredients <span class="Identifier">return</span> <span class="Constant">35</span> @@ -1036,14 +1039,14 @@ def foo a:_elem [ ] <span class="Comment"># define a container with field 'z'</span> container foo2 [ - <span class="Normal">z</span>:number + <span class="Normal">z</span>:num ] def main [ local-scope <span class="Normal">x</span>:foo2<span class="Special"> <- </span>merge <span class="Constant">34</span> - <span class="Normal">y</span>:number<span class="Special"> <- </span>get x<span class="Delimiter">,</span> z:offse <span class="Comment"># typo in 'offset'</span> + <span class="Normal">y</span>:num<span class="Special"> <- </span>get x<span class="Delimiter">,</span> z:offse <span class="Comment"># typo in 'offset'</span> <span class="PreProc"> </span><span class="Comment"># define a variable with the same name 'z'</span> - <span class="Normal">z</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Normal">z</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># trigger specialization of the shape-shifting recipe</span> foo z ] @@ -1056,14 +1059,14 @@ def foo a:_elem [ ] <span class="Comment"># define a container with field 'z'</span> container foo2 [ - <span class="Normal">z</span>:number + <span class="Normal">z</span>:num ] def main [ local-scope <span class="Normal">x</span>:foo2<span class="Special"> <- </span>merge <span class="Constant">34</span> - <span class="Normal">y</span>:number<span class="Special"> <- </span>get x<span class="Delimiter">,</span> z:offse <span class="Comment"># typo in 'offset'</span> + <span class="Normal">y</span>:num<span class="Special"> <- </span>get x<span class="Delimiter">,</span> z:offse <span class="Comment"># typo in 'offset'</span> <span class="PreProc"> </span><span class="Comment"># define a variable with the same name 'z'</span> - <span class="Normal">z</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Normal">z</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># trigger specialization of the shape-shifting recipe</span> foo *z ] @@ -1087,9 +1090,27 @@ def main [ ] $error: <span class="Constant">0</span> +<span class="Delimiter">:(scenario tangle_shape_shifting_recipe_with_type_abbreviation)</span> +<span class="Comment"># shape-shifting recipe</span> +def foo a:_elem [ + local-scope + load-ingredients + <label1> +] +<span class="Comment"># tangle some code that refers to the type ingredient</span> +after <label1> [ + <span class="Normal">b</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># type abbreviation</span> +] +<span class="Comment"># trigger specialization</span> +def main [ + local-scope + foo <span class="Constant">34</span> +] +$error: <span class="Constant">0</span> + <span class="Delimiter">:(scenario shape_shifting_recipe_coexists_with_primitive)</span> <span class="Comment"># recipe overloading a primitive with a generic type</span> -def add a:address:foo:_elem [ +def add a:&:foo:_elem [ assert <span class="Constant">0</span><span class="Delimiter">,</span> [should <span class="Normal">not</span> get here] ] def main [ diff --git a/html/057immutable.cc.html b/html/057immutable.cc.html index 29d2ea86..b74dbcb5 100644 --- a/html/057immutable.cc.html +++ b/html/057immutable.cc.html @@ -55,11 +55,11 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario can_modify_ingredients_that_are_also_products_2)</span> def main [ local-scope - <span class="Normal">p</span>:address:point<span class="Special"> <- </span><span class="Normal">new</span> point:type + <span class="Normal">p</span>:&:point<span class="Special"> <- </span><span class="Normal">new</span> point:type p<span class="Special"> <- </span>foo p ] <span class="Comment"># mutable address to container</span> -def foo p:address:point <span class="Delimiter">-></span> p:address:point [ +def foo p:&:point <span class="Delimiter">-></span> p:&:point [ local-scope load-ingredients *p<span class="Special"> <- </span>put *p<span class="Delimiter">,</span> x:offset<span class="Delimiter">,</span> <span class="Constant">34</span> @@ -69,11 +69,11 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario can_modify_ingredients_that_are_also_products_3)</span> def main [ local-scope - <span class="Normal">p</span>:address:array:number<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">3</span> + <span class="Normal">p</span>:&:@:num<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">3</span> p<span class="Special"> <- </span>foo p ] <span class="Comment"># mutable address</span> -def foo p:address:array:number <span class="Delimiter">-></span> p:address:array:number [ +def foo p:&:@:num <span class="Delimiter">-></span> p:&:@:num [ local-scope load-ingredients *p<span class="Special"> <- </span>put-index *p<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">34</span> @@ -83,19 +83,19 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario ignore_literal_ingredients_for_immutability_checks)</span> def main [ local-scope - <span class="Normal">p</span>:address:d1<span class="Special"> <- </span><span class="Normal">new</span> d1:type - <span class="Normal">q</span>:number<span class="Special"> <- </span>foo p + <span class="Normal">p</span>:&:d1<span class="Special"> <- </span><span class="Normal">new</span> d1:type + <span class="Normal">q</span>:num<span class="Special"> <- </span>foo p ] -def foo p:address:d1 <span class="Delimiter">-></span> q:number [ +def foo p:&:d1 <span class="Delimiter">-></span> q:num [ local-scope load-ingredients - <span class="Normal">x</span>:address:d1<span class="Special"> <- </span><span class="Normal">new</span> d1:type + <span class="Normal">x</span>:&:d1<span class="Special"> <- </span><span class="Normal">new</span> d1:type *x<span class="Special"> <- </span>put *x<span class="Delimiter">,</span> p:offset<span class="Delimiter">,</span> <span class="Constant">34</span> <span class="Comment"># ignore this 'p'</span> reply <span class="Constant">36</span> ] container d1 [ - <span class="Normal">p</span>:number - <span class="Normal">q</span>:number + <span class="Normal">p</span>:num + <span class="Normal">q</span>:num ] $error: <span class="Constant">0</span> @@ -103,11 +103,11 @@ $error: <span class="Constant">0</span> <span class="Special">% Hide_errors = true;</span> def main [ local-scope - <span class="Normal">x</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">x</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type foo x ] <span class="Comment"># immutable address to primitive</span> -def foo x:address:number [ +def foo x:&:num [ local-scope load-ingredients *x<span class="Special"> <- </span>copy <span class="Constant">34</span> @@ -137,10 +137,10 @@ def foo x:point-number [ <span class="Delimiter">:(scenario can_modify_immutable_pointers)</span> def main [ local-scope - <span class="Normal">x</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">x</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type foo x ] -def foo x:address:number [ +def foo x:&:num [ local-scope load-ingredients <span class="Comment"># modify the address, not the payload</span> @@ -152,10 +152,10 @@ $error: <span class="Constant">0</span> <span class="Special">% Hide_errors = true;</span> def main [ local-scope - <span class="Normal">x</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">x</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type foo x ] -def foo x:address:number [ +def foo x:&:num [ local-scope load-ingredients <span class="Comment"># modify address; ok</span> @@ -170,15 +170,15 @@ def foo x:address:number [ <span class="Special">% Hide_errors = true;</span> def main [ local-scope - <span class="Normal">p</span>:address:point<span class="Special"> <- </span><span class="Normal">new</span> point:type + <span class="Normal">p</span>:&:point<span class="Special"> <- </span><span class="Normal">new</span> point:type foo p ] -def foo p:address:point [ +def foo p:&:point [ local-scope load-ingredients bar p ] -def bar p:address:point <span class="Delimiter">-></span> p:address:point [ +def bar p:&:point <span class="Delimiter">-></span> p:&:point [ local-scope load-ingredients <span class="Comment"># p could be modified here, but it doesn't have to be, it's already marked</span> @@ -190,13 +190,13 @@ def bar p:address:point <span class="Delimiter">-></span> p:address:point [ <span class="Special">% Hide_errors = true;</span> def main [ local-scope - <span class="Normal">p</span>:address:point<span class="Special"> <- </span><span class="Normal">new</span> point:type + <span class="Normal">p</span>:&:point<span class="Special"> <- </span><span class="Normal">new</span> point:type foo p ] -def foo p:address:point [ +def foo p:&:point [ local-scope load-ingredients - <span class="Normal">q</span>:address:point<span class="Special"> <- </span>copy p + <span class="Normal">q</span>:&:point<span class="Special"> <- </span>copy p *q<span class="Special"> <- </span>put *q<span class="Delimiter">,</span> x:offset<span class="Delimiter">,</span> <span class="Constant">34</span> ] <span class="traceContains">+error: foo: cannot modify 'q' in instruction '*q <- put *q, x:offset, 34' because that would modify p which is an ingredient of recipe foo but not also a product</span> @@ -204,13 +204,13 @@ def foo p:address:point [ <span class="Delimiter">:(scenario can_modify_copies_of_mutable_ingredients)</span> def main [ local-scope - <span class="Normal">p</span>:address:point<span class="Special"> <- </span><span class="Normal">new</span> point:type + <span class="Normal">p</span>:&:point<span class="Special"> <- </span><span class="Normal">new</span> point:type foo p ] -def foo p:address:point <span class="Delimiter">-></span> p:address:point [ +def foo p:&:point <span class="Delimiter">-></span> p:&:point [ local-scope load-ingredients - <span class="Normal">q</span>:address:point<span class="Special"> <- </span>copy p + <span class="Normal">q</span>:&:point<span class="Special"> <- </span>copy p *q<span class="Special"> <- </span>put *q<span class="Delimiter">,</span> x:offset<span class="Delimiter">,</span> <span class="Constant">34</span> ] $error: <span class="Constant">0</span> @@ -218,32 +218,32 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario cannot_modify_address_inside_immutable_ingredients)</span> <span class="Special">% Hide_errors = true;</span> container foo [ - <span class="Normal">x</span>:address:array:number <span class="Comment"># contains an address</span> + <span class="Normal">x</span>:&:@:num <span class="Comment"># contains an address</span> ] def main [ <span class="Comment"># don't run anything</span> ] -def foo a:address:foo [ +def foo a:&:foo [ local-scope load-ingredients - <span class="Normal">x</span>:address:array:number<span class="Special"> <- </span>get *a<span class="Delimiter">,</span> x:offset <span class="Comment"># just a regular get of the container</span> + <span class="Normal">x</span>:&:@:num<span class="Special"> <- </span>get *a<span class="Delimiter">,</span> x:offset <span class="Comment"># just a regular get of the container</span> *x<span class="Special"> <- </span>put-index *x<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">34</span> <span class="Comment"># but then a put-index on the result</span> ] <span class="traceContains">+error: foo: cannot modify 'x' in instruction '*x <- put-index *x, 0, 34' because that would modify a which is an ingredient of recipe foo but not also a product</span> <span class="Delimiter">:(scenario cannot_modify_address_inside_immutable_ingredients_2)</span> container foo [ - <span class="Normal">x</span>:address:array:number <span class="Comment"># contains an address</span> + <span class="Normal">x</span>:&:@:num <span class="Comment"># contains an address</span> ] def main [ <span class="Comment"># don't run anything</span> ] -def foo a:address:foo [ +def foo a:&:foo [ local-scope load-ingredients <span class="Normal">b</span>:foo<span class="Special"> <- </span>merge <span class="Constant">0</span> <span class="Comment"># modify b, completely unrelated to immutable ingredient a</span> - <span class="Normal">x</span>:address:array:number<span class="Special"> <- </span>get b<span class="Delimiter">,</span> x:offset + <span class="Normal">x</span>:&:@:num<span class="Special"> <- </span>get b<span class="Delimiter">,</span> x:offset *x<span class="Special"> <- </span>put-index *x<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">34</span> ] $error: <span class="Constant">0</span> @@ -251,51 +251,51 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario cannot_modify_address_inside_immutable_ingredients_3)</span> <span class="Special">% Hide_errors = true;</span> container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num ] def main [ <span class="Comment"># don't run anything</span> ] -def foo a:address:array:address:number [ +def foo a:&:@:&:num [ local-scope load-ingredients - <span class="Normal">x</span>:address:number<span class="Special"> <- </span>index *a<span class="Delimiter">,</span> <span class="Constant">0</span> <span class="Comment"># just a regular index of the array</span> + <span class="Normal">x</span>:&:num<span class="Special"> <- </span>index *a<span class="Delimiter">,</span> <span class="Constant">0</span> <span class="Comment"># just a regular index of the array</span> *x<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># but then modify the result</span> ] <span class="traceContains">+error: foo: cannot modify 'x' in instruction '*x <- copy 34' because that would modify a which is an ingredient of recipe foo but not also a product</span> <span class="Delimiter">:(scenario cannot_modify_address_inside_immutable_ingredients_4)</span> container foo [ - <span class="Normal">x</span>:address:array:number <span class="Comment"># contains an address</span> + <span class="Normal">x</span>:&:@:num <span class="Comment"># contains an address</span> ] def main [ <span class="Comment"># don't run anything</span> ] -def foo a:address:array:address:number [ +def foo a:&:@:&:num [ local-scope load-ingredients - <span class="Normal">b</span>:address:array:address:number<span class="Special"> <- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span> + <span class="Normal">b</span>:&:@:&:num<span class="Special"> <- </span><span class="Normal">new</span> <span class="Delimiter">{(</span>address number<span class="Delimiter">)</span>: type<span class="Delimiter">},</span> <span class="Constant">3</span> <span class="Comment"># modify b, completely unrelated to immutable ingredient a</span> - <span class="Normal">x</span>:address:number<span class="Special"> <- </span>index *b<span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Normal">x</span>:&:num<span class="Special"> <- </span>index *b<span class="Delimiter">,</span> <span class="Constant">0</span> *x<span class="Special"> <- </span>copy <span class="Constant">34</span> ] $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario can_traverse_immutable_ingredients)</span> container test-list [ - <span class="Normal">next</span>:address:test-list + <span class="Normal">next</span>:&:test-list ] def main [ local-scope - <span class="Normal">p</span>:address:test-list<span class="Special"> <- </span><span class="Normal">new</span> test-list:type + <span class="Normal">p</span>:&:test-list<span class="Special"> <- </span><span class="Normal">new</span> test-list:type foo p ] -def foo p:address:test-list [ +def foo p:&:test-list [ local-scope load-ingredients - <span class="Normal">p2</span>:address:test-list<span class="Special"> <- </span>bar p + <span class="Normal">p2</span>:&:test-list<span class="Special"> <- </span>bar p ] -def bar x:address:test-list <span class="Delimiter">-></span> y:address:test-list [ +def bar x:&:test-list <span class="Delimiter">-></span> y:&:test-list [ local-scope load-ingredients y<span class="Special"> <- </span>get *x<span class="Delimiter">,</span> next:offset @@ -304,11 +304,11 @@ $error: <span class="Constant">0</span> <span class="Delimiter">:(scenario treat_optional_ingredients_as_mutable)</span> def main [ - <span class="Normal">k</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">k</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type test k ] <span class="Comment"># recipe taking an immutable address ingredient</span> -def test k:address:number [ +def test k:&:num [ local-scope load-ingredients foo k @@ -317,7 +317,7 @@ def test k:address:number [ def foo <span class="Delimiter">-></span> [ local-scope load-ingredients - <span class="Normal">k</span>:address:number<span class="Delimiter">,</span> found?:boolean<span class="Special"> <- </span>next-ingredient + <span class="Normal">k</span>:&:num<span class="Delimiter">,</span> found?:<span class="Normal">bool</span><span class="Special"> <- </span>next-ingredient <span class="Comment"># we don't further check k for immutability, but assume it's mutable</span> ] $error: <span class="Constant">0</span> @@ -326,10 +326,10 @@ $error: <span class="Constant">0</span> <span class="Special">% Hide_errors = true;</span> def main [ local-scope - <span class="Normal">p</span>:address:point<span class="Special"> <- </span><span class="Normal">new</span> point:type + <span class="Normal">p</span>:&:point<span class="Special"> <- </span><span class="Normal">new</span> point:type foo p ] -def foo p:address:point [ +def foo p:&:point [ local-scope load-ingredients bar p @@ -337,28 +337,28 @@ def foo p:address:point [ def bar [ local-scope load-ingredients - <span class="Normal">p</span>:address:point<span class="Special"> <- </span>next-ingredient <span class="Comment"># optional ingredient; assumed to be mutable</span> + <span class="Normal">p</span>:&:point<span class="Special"> <- </span>next-ingredient <span class="Comment"># optional ingredient; assumed to be mutable</span> ] <span class="traceContains">+error: foo: cannot modify 'p' in instruction 'bar p' because it's an ingredient of recipe foo but not also a product</span> <span class="Comment">//: when checking for immutable ingredients, remember to take space into account</span> <span class="Delimiter">:(scenario check_space_of_reagents_in_immutability_checks)</span> def main [ - <span class="Normal">a</span>:address:array:location<span class="Special"> <- </span><span class="Normal">new</span>-closure - <span class="Normal">b</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - run-closure b:address:number<span class="Delimiter">,</span> a:address:array:location + <span class="Normal">a</span>:space<span class="Special"> <- </span><span class="Normal">new</span>-closure + <span class="Normal">b</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + run-closure b:&:num<span class="Delimiter">,</span> a:space ] def <span class="Normal">new</span>-closure [ <span class="Normal">new</span>-<span class="Normal">default</span>-space - <span class="Normal">x</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">x</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type <span class="Identifier">return</span> <span class="Normal">default</span>-space ] -def run-closure x:address:number<span class="Delimiter">,</span> s:address:array:location [ +def run-closure x:&:num<span class="Delimiter">,</span> s:space [ local-scope load-ingredients - <span class="Constant">0</span>:address:array:location/names:<span class="Normal">new</span>-closure<span class="Special"> <- </span>copy s + <span class="Constant">0</span>:space/names:<span class="Normal">new</span>-closure<span class="Special"> <- </span>copy s <span class="Comment"># different space; always mutable</span> - *x:address:number/space:<span class="Constant">1</span><span class="Special"> <- </span>copy <span class="Constant">34</span> + *x:&:num/space:<span class="Constant">1</span><span class="Special"> <- </span>copy <span class="Constant">34</span> ] $error: <span class="Constant">0</span> @@ -441,21 +441,21 @@ set<<span class="Normal">int</span>> scan_contained_in_product_indices<spa <span class="Delimiter">:(scenario immutability_infects_contained_in_variables)</span> <span class="Special">% Hide_errors = true;</span> container test-list [ - <span class="Normal">value</span>:number - <span class="Normal">next</span>:address:test-list + <span class="Normal">value</span>:num + <span class="Normal">next</span>:&:test-list ] def main [ local-scope - <span class="Normal">p</span>:address:test-list<span class="Special"> <- </span><span class="Normal">new</span> test-list:type + <span class="Normal">p</span>:&:test-list<span class="Special"> <- </span><span class="Normal">new</span> test-list:type foo p ] -def foo p:address:test-list [ <span class="Comment"># p is immutable</span> +def foo p:&:test-list [ <span class="Comment"># p is immutable</span> local-scope load-ingredients - <span class="Normal">p2</span>:address:test-list<span class="Special"> <- </span>test-next p <span class="Comment"># p2 is immutable</span> + <span class="Normal">p2</span>:&:test-list<span class="Special"> <- </span>test-next p <span class="Comment"># p2 is immutable</span> *p2<span class="Special"> <- </span>put *p2<span class="Delimiter">,</span> value:offset<span class="Delimiter">,</span> <span class="Constant">34</span> ] -def test-next x:address:test-list <span class="Delimiter">-></span> y:address:test-list/contained-in:x [ +def test-next x:&:test-list <span class="Delimiter">-></span> y:&:test-list/contained-in:x [ local-scope load-ingredients y<span class="Special"> <- </span>get *x<span class="Delimiter">,</span> next:offset @@ -561,26 +561,26 @@ set<<span class="Normal">int</span>> ingredient_indices<span class="Delimi <span class="Delimiter">:(scenarios transform)</span> <span class="Delimiter">:(scenario can_modify_contained_in_addresses)</span> container test-list [ - <span class="Normal">value</span>:number - <span class="Normal">next</span>:address:test-list + <span class="Normal">value</span>:num + <span class="Normal">next</span>:&:test-list ] def main [ local-scope - <span class="Normal">p</span>:address:test-list<span class="Special"> <- </span><span class="Normal">new</span> test-list:type + <span class="Normal">p</span>:&:test-list<span class="Special"> <- </span><span class="Normal">new</span> test-list:type foo p ] -def foo p:address:test-list <span class="Delimiter">-></span> p:address:test-list [ +def foo p:&:test-list <span class="Delimiter">-></span> p:&:test-list [ local-scope load-ingredients - <span class="Normal">p2</span>:address:test-list<span class="Special"> <- </span>test-next p + <span class="Normal">p2</span>:&:test-list<span class="Special"> <- </span>test-next p p<span class="Special"> <- </span>test-remove p2<span class="Delimiter">,</span> p ] -def test-next x:address:test-list <span class="Delimiter">-></span> y:address:test-list [ +def test-next x:&:test-list <span class="Delimiter">-></span> y:&:test-list [ local-scope load-ingredients y<span class="Special"> <- </span>get *x<span class="Delimiter">,</span> next:offset ] -def test-remove x:address:test-list/contained-in:from<span class="Delimiter">,</span> from:address:test-list <span class="Delimiter">-></span> from:address:test-list [ +def test-remove x:&:test-list/contained-in:from<span class="Delimiter">,</span> from:&:test-list <span class="Delimiter">-></span> from:&:test-list [ local-scope load-ingredients *x<span class="Special"> <- </span>put *x<span class="Delimiter">,</span> value:offset<span class="Delimiter">,</span> <span class="Constant">34</span> <span class="Comment"># can modify x</span> diff --git a/html/058to_text.cc.html b/html/058to_text.cc.html index c79ad7fc..33fb6060 100644 --- a/html/058to_text.cc.html +++ b/html/058to_text.cc.html @@ -34,9 +34,6 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment">//: Later layers will allow us to override this to do something smarter for</span> <span class="Comment">//: specific types.</span> -<span class="Delimiter">:(before "End Mu Types Initialization")</span> -put<span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">"text"</span><span class="Delimiter">,</span> new_type_tree<span class="Delimiter">(</span><span class="Constant">"address:array:character"</span><span class="Delimiter">));</span> - <span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> TO_TEXT<span class="Delimiter">,</span> <span class="Delimiter">:(before "End Primitive Recipe Numbers")</span> @@ -53,7 +50,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span class="Normal">case</span> TO_TEXT: <span class="Delimiter">{</span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> - products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>new_mu_string<span class="Delimiter">(</span>print_mu<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))));</span> + products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>new_mu_text<span class="Delimiter">(</span>print_mu<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))));</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> </pre> diff --git a/html/059to_text.mu.html b/html/059to_text.mu.html index b050f5e9..820a9b47 100644 --- a/html/059to_text.mu.html +++ b/html/059to_text.mu.html @@ -44,7 +44,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># variant for arrays (since we can't pass them around otherwise)</span> -<span class="muRecipe">def</span> array-to-text-line x:address:array:_elem<span class="muRecipe"> -> </span>y:text [ +<span class="muRecipe">def</span> array-to-text-line x:&:@:_elem<span class="muRecipe"> -> </span>y:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> y<span class="Special"> <- </span>to-text *x @@ -56,13 +56,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muScenario">scenario</span> array-to-text-line-early-warning-for-static-dispatch [ - n:address:array:number<span class="Special"> <- </span>new <span class="Constant">number:type</span>, <span class="Constant">3</span> + n:&:@:num<span class="Special"> <- </span>new <span class="Constant">number:type</span>, <span class="Constant">3</span> x:text<span class="Special"> <- </span>array-to-text-line n <span class="Comment"># just ensure there were no errors</span> ] <span class="Comment"># finally, a specialization for single characters</span> -<span class="muRecipe">def</span> to-text c:character<span class="muRecipe"> -> </span>y:text [ +<span class="muRecipe">def</span> to-text c:char<span class="muRecipe"> -> </span>y:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> y<span class="Special"> <- </span>new <span class="Constant">character:type</span>, <span class="Constant">1/capacity</span> @@ -70,9 +70,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muScenario">scenario</span> character-to-text [ - <span class="Constant">1</span>:character<span class="Special"> <- </span>copy <span class="Constant">111/o</span> - <span class="Constant">2</span>:text<span class="Special"> <- </span>to-text <span class="Constant">1</span>:character - <span class="Constant">3</span>:array:character<span class="Special"> <- </span>copy *<span class="Constant">2</span>:text + <span class="Constant">1</span>:char<span class="Special"> <- </span>copy <span class="Constant">111/o</span> + <span class="Constant">2</span>:text<span class="Special"> <- </span>to-text <span class="Constant">1</span>:char + <span class="Constant">3</span>:@:char<span class="Special"> <- </span>copy *<span class="Constant">2</span>:text memory-should-contain [ <span class="Constant">3</span>:array:character<span class="Special"> <- </span><span class="Constant">[o]</span> ] diff --git a/html/060rewrite_literal_string.cc.html b/html/060rewrite_literal_string.cc.html index 27c825fe..980157d8 100644 --- a/html/060rewrite_literal_string.cc.html +++ b/html/060rewrite_literal_string.cc.html @@ -35,9 +35,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario passing_literals_to_recipes)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>foo [abc] + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>foo [abc] ] -def foo x:address:array:character <span class="Delimiter">-></span> n:number [ +def foo x:text <span class="Delimiter">-></span> n:num [ local-scope load-ingredients n<span class="Special"> <- </span>length *x @@ -76,10 +76,10 @@ set<string> recipes_taking_literal_strings<span class="Delimiter">;</span> instruction& inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span class="Normal">if</span> <span class="Delimiter">(</span>recipes_taking_literal_strings<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name<span class="Delimiter">)</span> == recipes_taking_literal_strings<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Delimiter">{</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> instruction def<span class="Delimiter">;</span> ostringstream ingredient_name<span class="Delimiter">;</span> - ingredient_name << inst<span class="Delimiter">.</span>name << <span class="Constant">'_'</span> << i << <span class="Constant">'_'</span> << j << <span class="Constant">":address:array:character"</span><span class="Delimiter">;</span> + ingredient_name << inst<span class="Delimiter">.</span>name << <span class="Constant">'_'</span> << i << <span class="Constant">'_'</span> << j << <span class="Constant">":text"</span><span class="Delimiter">;</span> def<span class="Delimiter">.</span>name = <span class="Constant">"new"</span><span class="Delimiter">;</span> def<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span> def<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>ingredient_name<span class="Delimiter">.</span>str<span class="Delimiter">()));</span> diff --git a/html/061text.mu.html b/html/061text.mu.html index 0a0e41bf..0c97fd78 100644 --- a/html/061text.mu.html +++ b/html/061text.mu.html @@ -34,28 +34,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <pre id='vimCodeElement'> <span class="Comment"># Some useful helpers for dealing with text (arrays of characters)</span> -<span class="muRecipe">def</span> equal a:text, b:text<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> equal a:text, b:text<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - a-len:number<span class="Special"> <- </span>length *a - b-len:number<span class="Special"> <- </span>length *b + a-len:num<span class="Special"> <- </span>length *a + b-len:num<span class="Special"> <- </span>length *b <span class="Comment"># compare lengths</span> <span class="Delimiter">{</span> trace <span class="Constant">99</span>, <span class="Constant">[text-equal]</span>, <span class="Constant">[comparing lengths]</span> - length-equal?:boolean<span class="Special"> <- </span>equal a-len, b-len + length-equal?:bool<span class="Special"> <- </span>equal a-len, b-len <span class="muControl">break-if</span> length-equal? <span class="muControl">return</span> <span class="Constant">0</span> <span class="Delimiter">}</span> <span class="Comment"># compare each corresponding character</span> trace <span class="Constant">99</span>, <span class="Constant">[text-equal]</span>, <span class="Constant">[comparing characters]</span> - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, a-len + done?:bool<span class="Special"> <- </span>greater-or-equal i, a-len <span class="muControl">break-if</span> done? - a2:character<span class="Special"> <- </span>index *a, i - b2:character<span class="Special"> <- </span>index *b, i + a2:char<span class="Special"> <- </span>index *a, i + b2:char<span class="Special"> <- </span>index *b, i <span class="Delimiter">{</span> - chars-match?:boolean<span class="Special"> <- </span>equal a2, b2 + chars-match?:bool<span class="Special"> <- </span>equal a2, b2 <span class="muControl">break-if</span> chars-match? <span class="muControl">return</span> <span class="Constant">0</span> <span class="Delimiter">}</span> @@ -69,7 +69,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal x, x + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal x, x ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># x == x for all x</span> @@ -81,7 +81,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal x, y + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal x, y ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># abc == abc</span> @@ -93,7 +93,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[abcd]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal x, y + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal x, y ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># abc != abcd</span> @@ -111,7 +111,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[abcd]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal x, y + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal x, y ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># "" != abcd</span> @@ -123,7 +123,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[abd]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal x, y + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal x, y ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># abc != abd</span> @@ -132,11 +132,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># A new type to help incrementally construct texts.</span> <span class="muData">container</span> buffer [ - length:number + length:num data:text ] -<span class="muRecipe">def</span> new-buffer capacity:number<span class="muRecipe"> -> </span>result:address:buffer [ +<span class="muRecipe">def</span> new-buffer capacity:num<span class="muRecipe"> -> </span>result:&:buffer [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> result<span class="Special"> <- </span>new <span class="Constant">buffer:type</span> @@ -151,62 +151,62 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> result ] -<span class="muRecipe">def</span> grow-buffer buf:address:buffer<span class="muRecipe"> -> </span>buf:address:buffer [ +<span class="muRecipe">def</span> grow-buffer buf:&:buffer<span class="muRecipe"> -> </span>buf:&:buffer [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># double buffer size</span> olddata:text<span class="Special"> <- </span>get *buf, <span class="Constant">data:offset</span> - oldlen:number<span class="Special"> <- </span>length *olddata - newlen:number<span class="Special"> <- </span>multiply oldlen, <span class="Constant">2</span> + oldlen:num<span class="Special"> <- </span>length *olddata + newlen:num<span class="Special"> <- </span>multiply oldlen, <span class="Constant">2</span> newdata:text<span class="Special"> <- </span>new <span class="Constant">character:type</span>, newlen *buf<span class="Special"> <- </span>put *buf, <span class="Constant">data:offset</span>, newdata <span class="Comment"># copy old contents</span> - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, oldlen + done?:bool<span class="Special"> <- </span>greater-or-equal i, oldlen <span class="muControl">break-if</span> done? - src:character<span class="Special"> <- </span>index *olddata, i + src:char<span class="Special"> <- </span>index *olddata, i *newdata<span class="Special"> <- </span>put-index *newdata, i, src i<span class="Special"> <- </span>add i, <span class="Constant">1</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> buffer-full? in:address:buffer<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> buffer-full? in:&:buffer<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - len:number<span class="Special"> <- </span>get *in, <span class="Constant">length:offset</span> + len:num<span class="Special"> <- </span>get *in, <span class="Constant">length:offset</span> s:text<span class="Special"> <- </span>get *in, <span class="Constant">data:offset</span> - capacity:number<span class="Special"> <- </span>length *s + capacity:num<span class="Special"> <- </span>length *s result<span class="Special"> <- </span>greater-or-equal len, capacity ] <span class="Comment"># most broadly applicable definition of append to a buffer: just call to-text</span> -<span class="muRecipe">def</span> append buf:address:buffer, x:_elem<span class="muRecipe"> -> </span>buf:address:buffer [ +<span class="muRecipe">def</span> append buf:&:buffer, x:_elem<span class="muRecipe"> -> </span>buf:&:buffer [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> text:text<span class="Special"> <- </span>to-text x - len:number<span class="Special"> <- </span>length *text - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + len:num<span class="Special"> <- </span>length *text + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? - c:character<span class="Special"> <- </span>index *text, i + c:char<span class="Special"> <- </span>index *text, i buf<span class="Special"> <- </span>append buf, c i<span class="Special"> <- </span>add i, <span class="Constant">1</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> append buf:address:buffer, c:character<span class="muRecipe"> -> </span>buf:address:buffer [ +<span class="muRecipe">def</span> append buf:&:buffer, c:char<span class="muRecipe"> -> </span>buf:&:buffer [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - len:number<span class="Special"> <- </span>get *buf, <span class="Constant">length:offset</span> + len:num<span class="Special"> <- </span>get *buf, <span class="Constant">length:offset</span> <span class="Delimiter">{</span> <span class="Comment"># backspace? just drop last character if it exists and return</span> - backspace?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">8/backspace</span> + backspace?:bool<span class="Special"> <- </span>equal c, <span class="Constant">8/backspace</span> <span class="muControl">break-unless</span> backspace? - empty?:boolean<span class="Special"> <- </span>lesser-or-equal len, <span class="Constant">0</span> + empty?:bool<span class="Special"> <- </span>lesser-or-equal len, <span class="Constant">0</span> <span class="muControl">return-if</span> empty? len<span class="Special"> <- </span>subtract len, <span class="Constant">1</span> *buf<span class="Special"> <- </span>put *buf, <span class="Constant">length:offset</span>, len @@ -214,7 +214,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="Comment"># grow buffer if necessary</span> - full?:boolean<span class="Special"> <- </span>buffer-full? buf + full?:bool<span class="Special"> <- </span>buffer-full? buf <span class="muControl">break-unless</span> full? buf<span class="Special"> <- </span>grow-buffer buf <span class="Delimiter">}</span> @@ -224,15 +224,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *buf<span class="Special"> <- </span>put *buf, <span class="Constant">length:offset</span>, len ] -<span class="muRecipe">def</span> append buf:address:buffer, t:text<span class="muRecipe"> -> </span>buf:address:buffer [ +<span class="muRecipe">def</span> append buf:&:buffer, t:text<span class="muRecipe"> -> </span>buf:&:buffer [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - len:number<span class="Special"> <- </span>length *t - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + len:num<span class="Special"> <- </span>length *t + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? - c:character<span class="Special"> <- </span>index *t, i + c:char<span class="Special"> <- </span>index *t, i buf<span class="Special"> <- </span>append buf, c i<span class="Special"> <- </span>add i, <span class="Constant">1</span> <span class="muControl">loop</span> @@ -242,24 +242,24 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> buffer-append-works [ run [ <span class="Constant">local-scope</span> - x:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">3</span> + x:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">3</span> s1:text<span class="Special"> <- </span>get *x, <span class="Constant">data:offset</span> - c:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + c:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> x<span class="Special"> <- </span>append x, c - c:character<span class="Special"> <- </span>copy <span class="Constant">98/b</span> + c:char<span class="Special"> <- </span>copy <span class="Constant">98/b</span> x<span class="Special"> <- </span>append x, c - c:character<span class="Special"> <- </span>copy <span class="Constant">99/c</span> + c:char<span class="Special"> <- </span>copy <span class="Constant">99/c</span> x<span class="Special"> <- </span>append x, c s2:text<span class="Special"> <- </span>get *x, <span class="Constant">data:offset</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal s1, s2 - <span class="Constant">11</span>:array:character/<span class="Special">raw <- </span>copy *s2 + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal s1, s2 + <span class="Constant">11</span>:@:char/<span class="Special">raw <- </span>copy *s2 <span class="Constant"> +buffer-filled</span> - c:character<span class="Special"> <- </span>copy <span class="Constant">100/d</span> + c:char<span class="Special"> <- </span>copy <span class="Constant">100/d</span> x<span class="Special"> <- </span>append x, c s3:text<span class="Special"> <- </span>get *x, <span class="Constant">data:offset</span> - <span class="Constant">20</span>:boolean/<span class="Special">raw <- </span>equal s1, s3 - <span class="Constant">21</span>:number/<span class="Special">raw <- </span>get *x, <span class="Constant">length:offset</span> - <span class="Constant">30</span>:array:character/<span class="Special">raw <- </span>copy *s3 + <span class="Constant">20</span>:bool/<span class="Special">raw <- </span>equal s1, s3 + <span class="Constant">21</span>:num/<span class="Special">raw <- </span>get *x, <span class="Constant">length:offset</span> + <span class="Constant">30</span>:@:char/<span class="Special">raw <- </span>copy *s3 ] memory-should-contain [ <span class="Comment"># before +buffer-filled</span> @@ -284,8 +284,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> buffer-append-to-empty [ run [ <span class="Constant">local-scope</span> - x:address:buffer<span class="Special"> <- </span>new-buffer - c:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + x:&:buffer<span class="Special"> <- </span>new-buffer + c:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> x<span class="Special"> <- </span>append x, c ] ] @@ -293,15 +293,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> buffer-append-handles-backspace [ run [ <span class="Constant">local-scope</span> - x:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">3</span> - c:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + x:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">3</span> + c:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> x<span class="Special"> <- </span>append x, c - c:character<span class="Special"> <- </span>copy <span class="Constant">98/b</span> + c:char<span class="Special"> <- </span>copy <span class="Constant">98/b</span> x<span class="Special"> <- </span>append x, c - c:character<span class="Special"> <- </span>copy <span class="Constant">8/backspace</span> + c:char<span class="Special"> <- </span>copy <span class="Constant">8/backspace</span> x<span class="Special"> <- </span>append x, c s:text<span class="Special"> <- </span>buffer-to-array x - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *s + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *s ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># length</span> @@ -310,7 +310,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -<span class="muRecipe">def</span> buffer-to-array in:address:buffer<span class="muRecipe"> -> </span>result:text [ +<span class="muRecipe">def</span> buffer-to-array in:&:buffer<span class="muRecipe"> -> </span>result:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> @@ -318,15 +318,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">break-if</span> in <span class="muControl">return</span> <span class="Constant">0</span> <span class="Delimiter">}</span> - len:number<span class="Special"> <- </span>get *in, <span class="Constant">length:offset</span> + len:num<span class="Special"> <- </span>get *in, <span class="Constant">length:offset</span> s:text<span class="Special"> <- </span>get *in, <span class="Constant">data:offset</span> <span class="Comment"># we can't just return s because it is usually the wrong length</span> result<span class="Special"> <- </span>new <span class="Constant">character:type</span>, len - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? - src:character<span class="Special"> <- </span>index *s, i + src:char<span class="Special"> <- </span>index *s, i *result<span class="Special"> <- </span>put-index *result, i, src i<span class="Special"> <- </span>add i, <span class="Constant">1</span> <span class="muControl">loop</span> @@ -344,7 +344,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">def</span> append first:text<span class="muRecipe"> -> </span>result:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - buf:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> + buf:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> <span class="Comment"># append first ingredient</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> first @@ -352,7 +352,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="Comment"># append remaining ingredients</span> <span class="Delimiter">{</span> - arg:text, arg-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + arg:text, arg-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="muControl">break-unless</span> arg-found? <span class="muControl">loop-unless</span> arg buf<span class="Special"> <- </span>append buf, arg @@ -367,7 +367,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color x:text<span class="Special"> <- </span>new <span class="Constant">[hello,]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[ world!]</span> z:text<span class="Special"> <- </span>append x, y - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *z + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *z ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[hello, world!]</span> @@ -380,7 +380,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color x:text<span class="Special"> <- </span>copy <span class="Constant">0</span> y:text<span class="Special"> <- </span>new <span class="Constant">[ world!]</span> z:text<span class="Special"> <- </span>append x, y - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *z + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *z ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[ world!]</span> @@ -393,7 +393,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color x:text<span class="Special"> <- </span>new <span class="Constant">[hello,]</span> y:text<span class="Special"> <- </span>copy <span class="Constant">0</span> z:text<span class="Special"> <- </span>append x, y - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *z + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *z ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[hello,]</span> @@ -407,7 +407,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color y:text<span class="Special"> <- </span>new <span class="Constant">[world]</span> z:text<span class="Special"> <- </span>new <span class="Constant">[!]</span> z:text<span class="Special"> <- </span>append x, y, z - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *z + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *z ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[hello, world!]</span> @@ -419,19 +419,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> x<span class="Special"> <- </span>replace x, <span class="Constant">98/b</span>, <span class="Constant">122/z</span> - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *x + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *x ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[azc]</span> ] ] -<span class="muRecipe">def</span> replace s:text, oldc:character, newc:character, from:number/optional<span class="muRecipe"> -> </span>s:text [ +<span class="muRecipe">def</span> replace s:text, oldc:char, newc:char, from:num/optional<span class="muRecipe"> -> </span>s:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - len:number<span class="Special"> <- </span>length *s - i:number<span class="Special"> <- </span>find-next s, oldc, from - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + len:num<span class="Special"> <- </span>length *s + i:num<span class="Special"> <- </span>find-next s, oldc, from + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">return-if</span> done?, s/same-as-ingredient:<span class="Constant">0</span> *s<span class="Special"> <- </span>put-index *s, i, newc i<span class="Special"> <- </span>add i, <span class="Constant">1</span> @@ -443,7 +443,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> x<span class="Special"> <- </span>replace x, <span class="Constant">97/a</span>, <span class="Constant">122/z</span> - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *x + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *x ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[zbc]</span> @@ -455,7 +455,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> x<span class="Special"> <- </span>replace x, <span class="Constant">99/c</span>, <span class="Constant">122/z</span> - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *x + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *x ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[abz]</span> @@ -467,7 +467,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> x<span class="Special"> <- </span>replace x, <span class="Constant">100/d</span>, <span class="Constant">122/z</span> - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *x + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *x ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> @@ -479,7 +479,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[banana]</span> x<span class="Special"> <- </span>replace x, <span class="Constant">97/a</span>, <span class="Constant">122/z</span> - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *x + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *x ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[bznznz]</span> @@ -491,14 +491,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># consume just the template</span> <span class="Comment"># compute result-len, space to allocate for result</span> - tem-len:number<span class="Special"> <- </span>length *template - result-len:number<span class="Special"> <- </span>copy tem-len + tem-len:num<span class="Special"> <- </span>length *template + result-len:num<span class="Special"> <- </span>copy tem-len <span class="Delimiter">{</span> <span class="Comment"># while ingredients remain</span> - a:text, arg-received?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + a:text, arg-received?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="muControl">break-unless</span> arg-received? <span class="Comment"># result-len = result-len + arg.length - 1 (for the 'underscore' being replaced)</span> - a-len:number<span class="Special"> <- </span>length *a + a-len:num<span class="Special"> <- </span>length *a result-len<span class="Special"> <- </span>add result-len, a-len result-len<span class="Special"> <- </span>subtract result-len, <span class="Constant">1</span> <span class="muControl">loop</span> @@ -507,20 +507,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color _<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Comment"># skip template</span> result<span class="Special"> <- </span>new <span class="Constant">character:type</span>, result-len <span class="Comment"># repeatedly copy sections of template and 'holes' into result</span> - result-idx:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + result-idx:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="Comment"># while arg received</span> - a:text, arg-received?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + a:text, arg-received?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="muControl">break-unless</span> arg-received? <span class="Comment"># copy template into result until '_'</span> <span class="Delimiter">{</span> <span class="Comment"># while i < template.length</span> - tem-done?:boolean<span class="Special"> <- </span>greater-or-equal i, tem-len + tem-done?:bool<span class="Special"> <- </span>greater-or-equal i, tem-len <span class="muControl">break-if</span> tem-done?, <span class="Constant">+done:label</span> <span class="Comment"># while template[i] != '_'</span> - in:character<span class="Special"> <- </span>index *template, i - underscore?:boolean<span class="Special"> <- </span>equal in, <span class="Constant">95/_</span> + in:char<span class="Special"> <- </span>index *template, i + underscore?:bool<span class="Special"> <- </span>equal in, <span class="Constant">95/_</span> <span class="muControl">break-if</span> underscore? <span class="Comment"># result[result-idx] = template[i]</span> *result<span class="Special"> <- </span>put-index *result, result-idx, in @@ -529,13 +529,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">loop</span> <span class="Delimiter">}</span> <span class="Comment"># copy 'a' into result</span> - j:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + j:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="Comment"># while j < a.length</span> - arg-done?:boolean<span class="Special"> <- </span>greater-or-equal j, a-len + arg-done?:bool<span class="Special"> <- </span>greater-or-equal j, a-len <span class="muControl">break-if</span> arg-done? <span class="Comment"># result[result-idx] = a[j]</span> - in:character<span class="Special"> <- </span>index *a, j + in:char<span class="Special"> <- </span>index *a, j *result<span class="Special"> <- </span>put-index *result, result-idx, in j<span class="Special"> <- </span>add j, <span class="Constant">1</span> result-idx<span class="Special"> <- </span>add result-idx, <span class="Constant">1</span> @@ -549,10 +549,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># done with holes; copy rest of template directly into result</span> <span class="Delimiter">{</span> <span class="Comment"># while i < template.length</span> - tem-done?:boolean<span class="Special"> <- </span>greater-or-equal i, tem-len + tem-done?:bool<span class="Special"> <- </span>greater-or-equal i, tem-len <span class="muControl">break-if</span> tem-done? <span class="Comment"># result[result-idx] = template[i]</span> - in:character<span class="Special"> <- </span>index *template, i + in:char<span class="Special"> <- </span>index *template, i *result<span class="Special"> <- </span>put-index *result, result-idx, in i<span class="Special"> <- </span>add i, <span class="Constant">1</span> result-idx<span class="Special"> <- </span>add result-idx, <span class="Constant">1</span> @@ -566,7 +566,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color x:text<span class="Special"> <- </span>new <span class="Constant">[abc_ghi]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[def]</span> z:text<span class="Special"> <- </span>interpolate x, y - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *z + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *z ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[abcdefghi]</span> @@ -579,7 +579,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color x:text<span class="Special"> <- </span>new <span class="Constant">[_, hello!]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> z:text<span class="Special"> <- </span>interpolate x, y - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *z + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *z ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc, hello!]</span> @@ -592,15 +592,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color x:text<span class="Special"> <- </span>new <span class="Constant">[hello, _]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> z:text<span class="Special"> <- </span>interpolate x, y - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *z + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *z ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[hello, abc]</span> ] ] -<span class="Comment"># result:boolean <- space? c:character</span> -<span class="muRecipe">def</span> space? c:character<span class="muRecipe"> -> </span>result:boolean [ +<span class="Comment"># result:bool <- space? c:char</span> +<span class="muRecipe">def</span> space? c:char<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># most common case first</span> @@ -664,45 +664,45 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">def</span> trim s:text<span class="muRecipe"> -> </span>result:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - len:number<span class="Special"> <- </span>length *s + len:num<span class="Special"> <- </span>length *s <span class="Comment"># left trim: compute start</span> - start:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + start:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="Delimiter">{</span> - at-end?:boolean<span class="Special"> <- </span>greater-or-equal start, len + at-end?:bool<span class="Special"> <- </span>greater-or-equal start, len <span class="muControl">break-unless</span> at-end? result<span class="Special"> <- </span>new <span class="Constant">character:type</span>, <span class="Constant">0</span> <span class="muControl">return</span> <span class="Delimiter">}</span> - curr:character<span class="Special"> <- </span>index *s, start - whitespace?:boolean<span class="Special"> <- </span>space? curr + curr:char<span class="Special"> <- </span>index *s, start + whitespace?:bool<span class="Special"> <- </span>space? curr <span class="muControl">break-unless</span> whitespace? start<span class="Special"> <- </span>add start, <span class="Constant">1</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> <span class="Comment"># right trim: compute end</span> - end:number<span class="Special"> <- </span>subtract len, <span class="Constant">1</span> + end:num<span class="Special"> <- </span>subtract len, <span class="Constant">1</span> <span class="Delimiter">{</span> - not-at-start?:boolean<span class="Special"> <- </span>greater-than end, start + not-at-start?:bool<span class="Special"> <- </span>greater-than end, start assert not-at-start?, <span class="Constant">[end ran up against start]</span> - curr:character<span class="Special"> <- </span>index *s, end - whitespace?:boolean<span class="Special"> <- </span>space? curr + curr:char<span class="Special"> <- </span>index *s, end + whitespace?:bool<span class="Special"> <- </span>space? curr <span class="muControl">break-unless</span> whitespace? end<span class="Special"> <- </span>subtract end, <span class="Constant">1</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> <span class="Comment"># result = new character[end+1 - start]</span> - new-len:number<span class="Special"> <- </span>subtract end, start, <span class="Constant">-1</span> + new-len:num<span class="Special"> <- </span>subtract end, start, <span class="Constant">-1</span> result:text<span class="Special"> <- </span>new <span class="Constant">character:type</span>, new-len <span class="Comment"># copy the untrimmed parts between start and end</span> - i:number<span class="Special"> <- </span>copy start - j:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + i:num<span class="Special"> <- </span>copy start + j:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="Comment"># while i <= end</span> - done?:boolean<span class="Special"> <- </span>greater-than i, end + done?:bool<span class="Special"> <- </span>greater-than i, end <span class="muControl">break-if</span> done? <span class="Comment"># result[j] = s[i]</span> - src:character<span class="Special"> <- </span>index *s, i + src:char<span class="Special"> <- </span>index *s, i *result<span class="Special"> <- </span>put-index *result, j, src i<span class="Special"> <- </span>add i, <span class="Constant">1</span> j<span class="Special"> <- </span>add j, <span class="Constant">1</span> @@ -715,7 +715,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>trim x - <span class="Constant">1</span>:array:character/<span class="Special">raw <- </span>copy *y + <span class="Constant">1</span>:@:char/<span class="Special">raw <- </span>copy *y ] memory-should-contain [ <span class="Constant">1</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> @@ -727,7 +727,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[ abc]</span> y:text<span class="Special"> <- </span>trim x - <span class="Constant">1</span>:array:character/<span class="Special">raw <- </span>copy *y + <span class="Constant">1</span>:@:char/<span class="Special">raw <- </span>copy *y ] memory-should-contain [ <span class="Constant">1</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> @@ -739,7 +739,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc ]</span> y:text<span class="Special"> <- </span>trim x - <span class="Constant">1</span>:array:character/<span class="Special">raw <- </span>copy *y + <span class="Constant">1</span>:@:char/<span class="Special">raw <- </span>copy *y ] memory-should-contain [ <span class="Constant">1</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> @@ -751,7 +751,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[ abc ]</span> y:text<span class="Special"> <- </span>trim x - <span class="Constant">1</span>:array:character/<span class="Special">raw <- </span>copy *y + <span class="Constant">1</span>:@:char/<span class="Special">raw <- </span>copy *y ] memory-should-contain [ <span class="Constant">1</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> @@ -764,22 +764,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color x:text<span class="Special"> <- </span>new <span class="Constant">[ abc</span> <span class="Constant">]</span> y:text<span class="Special"> <- </span>trim x - <span class="Constant">1</span>:array:character/<span class="Special">raw <- </span>copy *y + <span class="Constant">1</span>:@:char/<span class="Special">raw <- </span>copy *y ] memory-should-contain [ <span class="Constant">1</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> ] ] -<span class="muRecipe">def</span> find-next text:text, pattern:character, idx:number<span class="muRecipe"> -> </span>next-index:number [ +<span class="muRecipe">def</span> find-next text:text, pattern:char, idx:num<span class="muRecipe"> -> </span>next-index:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - len:number<span class="Special"> <- </span>length *text + len:num<span class="Special"> <- </span>length *text <span class="Delimiter">{</span> - eof?:boolean<span class="Special"> <- </span>greater-or-equal idx, len + eof?:bool<span class="Special"> <- </span>greater-or-equal idx, len <span class="muControl">break-if</span> eof? - curr:character<span class="Special"> <- </span>index *text, idx - found?:boolean<span class="Special"> <- </span>equal curr, pattern + curr:char<span class="Special"> <- </span>index *text, idx + found?:bool<span class="Special"> <- </span>equal curr, pattern <span class="muControl">break-if</span> found? idx<span class="Special"> <- </span>add idx, <span class="Constant">1</span> <span class="muControl">loop</span> @@ -791,7 +791,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[a/b]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -802,7 +802,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> @@ -813,7 +813,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[/abc]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># prefix match</span> @@ -824,7 +824,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc/]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">3</span> <span class="Comment"># suffix match</span> @@ -835,7 +835,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abcd]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">4</span> <span class="Comment"># no match</span> @@ -846,7 +846,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">4/start-index</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">4/start-index</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">4</span> <span class="Comment"># no change</span> @@ -857,7 +857,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[ab/c/]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">0/start-index</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">2</span> <span class="Comment"># first '/' of multiple</span> @@ -868,7 +868,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[ab/c/]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">3/start-index</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, <span class="Constant">47/slash</span>, <span class="Constant">3/start-index</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">4</span> <span class="Comment"># second '/' of multiple</span> @@ -877,17 +877,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># search for a pattern of multiple characters</span> <span class="Comment"># fairly dumb algorithm</span> -<span class="muRecipe">def</span> find-next text:text, pattern:text, idx:number<span class="muRecipe"> -> </span>next-index:number [ +<span class="muRecipe">def</span> find-next text:text, pattern:text, idx:num<span class="muRecipe"> -> </span>next-index:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - first:character<span class="Special"> <- </span>index *pattern, <span class="Constant">0</span> + first:char<span class="Special"> <- </span>index *pattern, <span class="Constant">0</span> <span class="Comment"># repeatedly check for match at current idx</span> - len:number<span class="Special"> <- </span>length *text + len:num<span class="Special"> <- </span>length *text <span class="Delimiter">{</span> <span class="Comment"># does some unnecessary work checking even when there isn't enough of text left</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal idx, len + done?:bool<span class="Special"> <- </span>greater-or-equal idx, len <span class="muControl">break-if</span> done? - found?:boolean<span class="Special"> <- </span>match-at text, pattern, idx + found?:bool<span class="Special"> <- </span>match-at text, pattern, idx <span class="muControl">break-if</span> found? idx<span class="Special"> <- </span>add idx, <span class="Constant">1</span> <span class="Comment"># optimization: skip past indices that definitely won't match</span> @@ -902,7 +902,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[bc]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, y, <span class="Constant">0</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, y, <span class="Constant">0</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -914,7 +914,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abcd]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[bc]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, y, <span class="Constant">1</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, y, <span class="Constant">1</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -926,7 +926,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[bd]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, y, <span class="Constant">0</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, y, <span class="Constant">0</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">3</span> <span class="Comment"># not found</span> @@ -938,7 +938,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abcd]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[cd]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, y, <span class="Constant">0</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, y, <span class="Constant">0</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -950,7 +950,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abcd]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[cde]</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>find-next x, y, <span class="Constant">0</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>find-next x, y, <span class="Constant">0</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">4</span> <span class="Comment"># not found</span> @@ -958,27 +958,27 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># checks if pattern matches at index 'idx'</span> -<span class="muRecipe">def</span> match-at text:text, pattern:text, idx:number<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> match-at text:text, pattern:text, idx:num<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - pattern-len:number<span class="Special"> <- </span>length *pattern + pattern-len:num<span class="Special"> <- </span>length *pattern <span class="Comment"># check that there's space left for the pattern</span> <span class="Delimiter">{</span> - x:number<span class="Special"> <- </span>length *text + x:num<span class="Special"> <- </span>length *text x<span class="Special"> <- </span>subtract x, pattern-len - enough-room?:boolean<span class="Special"> <- </span>lesser-or-equal idx, x + enough-room?:bool<span class="Special"> <- </span>lesser-or-equal idx, x <span class="muControl">break-if</span> enough-room? <span class="muControl">return</span> <span class="Constant">0/not-found</span> <span class="Delimiter">}</span> <span class="Comment"># check each character of pattern</span> - pattern-idx:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + pattern-idx:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal pattern-idx, pattern-len + done?:bool<span class="Special"> <- </span>greater-or-equal pattern-idx, pattern-len <span class="muControl">break-if</span> done? - c:character<span class="Special"> <- </span>index *text, idx - exp:character<span class="Special"> <- </span>index *pattern, pattern-idx + c:char<span class="Special"> <- </span>index *text, idx + exp:char<span class="Special"> <- </span>index *pattern, pattern-idx <span class="Delimiter">{</span> - match?:boolean<span class="Special"> <- </span>equal c, exp + match?:bool<span class="Special"> <- </span>equal c, exp <span class="muControl">break-if</span> match? <span class="muControl">return</span> <span class="Constant">0/not-found</span> <span class="Delimiter">}</span> @@ -994,7 +994,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[ab]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">0</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">0</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># match found</span> @@ -1005,7 +1005,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>match-at x, x, <span class="Constant">0</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>match-at x, x, <span class="Constant">0</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># match found</span> @@ -1017,7 +1017,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[a]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">4</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">4</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># never matches</span> @@ -1029,7 +1029,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">0</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">0</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># always matches empty pattern given a valid index</span> @@ -1041,7 +1041,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">4</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">4</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># no match</span> @@ -1053,7 +1053,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">0</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">0</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># no match</span> @@ -1064,7 +1064,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>match-at x, x, <span class="Constant">0</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>match-at x, x, <span class="Constant">0</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># matches because pattern is also empty</span> @@ -1076,7 +1076,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[bc]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">1</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">1</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># match</span> @@ -1088,30 +1088,30 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[bc]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">0</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>match-at x, y, <span class="Constant">0</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># no match</span> ] ] -<span class="muRecipe">def</span> split s:text, delim:character<span class="muRecipe"> -> </span>result:address:array:text [ +<span class="muRecipe">def</span> split s:text, delim:char<span class="muRecipe"> -> </span>result:&:@:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># empty text? return empty array</span> - len:number<span class="Special"> <- </span>length *s + len:num<span class="Special"> <- </span>length *s <span class="Delimiter">{</span> - empty?:boolean<span class="Special"> <- </span>equal len, <span class="Constant">0</span> + empty?:bool<span class="Special"> <- </span>equal len, <span class="Constant">0</span> <span class="muControl">break-unless</span> empty? result<span class="Special"> <- </span>new <span class="Delimiter">{</span>(address array character): type<span class="Delimiter">}</span>, <span class="Constant">0</span> <span class="muControl">return</span> <span class="Delimiter">}</span> <span class="Comment"># count #pieces we need room for</span> - count:number<span class="Special"> <- </span>copy <span class="Constant">1</span> <span class="Comment"># n delimiters = n+1 pieces</span> - idx:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + count:num<span class="Special"> <- </span>copy <span class="Constant">1</span> <span class="Comment"># n delimiters = n+1 pieces</span> + idx:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> idx<span class="Special"> <- </span>find-next s, delim, idx - done?:boolean<span class="Special"> <- </span>greater-or-equal idx, len + done?:bool<span class="Special"> <- </span>greater-or-equal idx, len <span class="muControl">break-if</span> done? idx<span class="Special"> <- </span>add idx, <span class="Constant">1</span> count<span class="Special"> <- </span>add count, <span class="Constant">1</span> @@ -1120,13 +1120,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># allocate space</span> result<span class="Special"> <- </span>new <span class="Delimiter">{</span>(address array character): type<span class="Delimiter">}</span>, count <span class="Comment"># repeatedly copy slices start..end until delimiter into result[curr-result]</span> - curr-result:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - start:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + curr-result:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + start:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="Comment"># while next delim exists</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal start, len + done?:bool<span class="Special"> <- </span>greater-or-equal start, len <span class="muControl">break-if</span> done? - end:number<span class="Special"> <- </span>find-next s, delim, start + end:num<span class="Special"> <- </span>find-next s, delim, start <span class="Comment"># copy start..end into result[curr-result]</span> dest:text<span class="Special"> <- </span>copy-range s, start, end *result<span class="Special"> <- </span>put-index *result, curr-result, dest @@ -1141,12 +1141,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[a/b]</span> - y:address:array:text<span class="Special"> <- </span>split x, <span class="Constant">47/slash</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>length *y + y:&:@:text<span class="Special"> <- </span>split x, <span class="Constant">47/slash</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>length *y a:text<span class="Special"> <- </span>index *y, <span class="Constant">0</span> b:text<span class="Special"> <- </span>index *y, <span class="Constant">1</span> - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *a - <span class="Constant">30</span>:array:character/<span class="Special">raw <- </span>copy *b + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *a + <span class="Constant">30</span>:@:char/<span class="Special">raw <- </span>copy *b ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">2</span> <span class="Comment"># length of result</span> @@ -1159,14 +1159,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[a/b/c]</span> - y:address:array:text<span class="Special"> <- </span>split x, <span class="Constant">47/slash</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>length *y + y:&:@:text<span class="Special"> <- </span>split x, <span class="Constant">47/slash</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>length *y a:text<span class="Special"> <- </span>index *y, <span class="Constant">0</span> b:text<span class="Special"> <- </span>index *y, <span class="Constant">1</span> c:text<span class="Special"> <- </span>index *y, <span class="Constant">2</span> - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *a - <span class="Constant">30</span>:array:character/<span class="Special">raw <- </span>copy *b - <span class="Constant">40</span>:array:character/<span class="Special">raw <- </span>copy *c + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *a + <span class="Constant">30</span>:@:char/<span class="Special">raw <- </span>copy *b + <span class="Constant">40</span>:@:char/<span class="Special">raw <- </span>copy *c ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">3</span> <span class="Comment"># length of result</span> @@ -1180,10 +1180,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - y:address:array:text<span class="Special"> <- </span>split x, <span class="Constant">47/slash</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>length *y + y:&:@:text<span class="Special"> <- </span>split x, <span class="Constant">47/slash</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>length *y a:text<span class="Special"> <- </span>index *y, <span class="Constant">0</span> - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *a + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *a ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># length of result</span> @@ -1195,8 +1195,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - y:address:array:text<span class="Special"> <- </span>split x, <span class="Constant">47/slash</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>length *y + y:&:@:text<span class="Special"> <- </span>split x, <span class="Constant">47/slash</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>length *y ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># empty result</span> @@ -1207,16 +1207,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[a/b//c]</span> - y:address:array:text<span class="Special"> <- </span>split x:text, <span class="Constant">47/slash</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>length *y + y:&:@:text<span class="Special"> <- </span>split x:text, <span class="Constant">47/slash</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>length *y a:text<span class="Special"> <- </span>index *y, <span class="Constant">0</span> b:text<span class="Special"> <- </span>index *y, <span class="Constant">1</span> c:text<span class="Special"> <- </span>index *y, <span class="Constant">2</span> d:text<span class="Special"> <- </span>index *y, <span class="Constant">3</span> - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *a - <span class="Constant">30</span>:array:character/<span class="Special">raw <- </span>copy *b - <span class="Constant">40</span>:array:character/<span class="Special">raw <- </span>copy *c - <span class="Constant">50</span>:array:character/<span class="Special">raw <- </span>copy *d + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *a + <span class="Constant">30</span>:@:char/<span class="Special">raw <- </span>copy *b + <span class="Constant">40</span>:@:char/<span class="Special">raw <- </span>copy *c + <span class="Constant">50</span>:@:char/<span class="Special">raw <- </span>copy *d ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">4</span> <span class="Comment"># length of result</span> @@ -1227,19 +1227,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -<span class="muRecipe">def</span> split-first text:text, delim:character<span class="muRecipe"> -> </span>x:text, y:text [ +<span class="muRecipe">def</span> split-first text:text, delim:char<span class="muRecipe"> -> </span>x:text, y:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># empty text? return empty texts</span> - len:number<span class="Special"> <- </span>length *text + len:num<span class="Special"> <- </span>length *text <span class="Delimiter">{</span> - empty?:boolean<span class="Special"> <- </span>equal len, <span class="Constant">0</span> + empty?:bool<span class="Special"> <- </span>equal len, <span class="Constant">0</span> <span class="muControl">break-unless</span> empty? x:text<span class="Special"> <- </span>new <span class="Constant">[]</span> y:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="muControl">return</span> <span class="Delimiter">}</span> - idx:number<span class="Special"> <- </span>find-next text, delim, <span class="Constant">0</span> + idx:num<span class="Special"> <- </span>find-next text, delim, <span class="Constant">0</span> x:text<span class="Special"> <- </span>copy-range text, <span class="Constant">0</span>, idx idx<span class="Special"> <- </span>add idx, <span class="Constant">1</span> y:text<span class="Special"> <- </span>copy-range text, idx, len @@ -1250,8 +1250,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[a/b]</span> y:text, z:text<span class="Special"> <- </span>split-first x, <span class="Constant">47/slash</span> - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *y - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *z + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *y + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *z ] memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span><span class="Constant">[a]</span> @@ -1259,22 +1259,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -<span class="muRecipe">def</span> copy-range buf:text, start:number, end:number<span class="muRecipe"> -> </span>result:text [ +<span class="muRecipe">def</span> copy-range buf:text, start:num, end:num<span class="muRecipe"> -> </span>result:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if end is out of bounds, trim it</span> - len:number<span class="Special"> <- </span>length *buf - end:number<span class="Special"> <- </span>min len, end + len:num<span class="Special"> <- </span>length *buf + end:num<span class="Special"> <- </span>min len, end <span class="Comment"># allocate space for result</span> len<span class="Special"> <- </span>subtract end, start result:text<span class="Special"> <- </span>new <span class="Constant">character:type</span>, len <span class="Comment"># copy start..end into result[curr-result]</span> - src-idx:number<span class="Special"> <- </span>copy start - dest-idx:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + src-idx:num<span class="Special"> <- </span>copy start + dest-idx:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal src-idx, end + done?:bool<span class="Special"> <- </span>greater-or-equal src-idx, end <span class="muControl">break-if</span> done? - src:character<span class="Special"> <- </span>index *buf, src-idx + src:char<span class="Special"> <- </span>index *buf, src-idx *result<span class="Special"> <- </span>put-index *result, dest-idx, src src-idx<span class="Special"> <- </span>add src-idx, <span class="Constant">1</span> dest-idx<span class="Special"> <- </span>add dest-idx, <span class="Constant">1</span> @@ -1287,7 +1287,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>copy-range x, <span class="Constant">1</span>, <span class="Constant">3</span> - <span class="Constant">1</span>:array:character/<span class="Special">raw <- </span>copy *y + <span class="Constant">1</span>:@:char/<span class="Special">raw <- </span>copy *y ] memory-should-contain [ <span class="Constant">1</span>:array:character<span class="Special"> <- </span><span class="Constant">[bc]</span> @@ -1299,7 +1299,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>copy-range x, <span class="Constant">2</span>, <span class="Constant">4</span> - <span class="Constant">1</span>:array:character/<span class="Special">raw <- </span>copy *y + <span class="Constant">1</span>:@:char/<span class="Special">raw <- </span>copy *y ] memory-should-contain [ <span class="Constant">1</span>:array:character<span class="Special"> <- </span><span class="Constant">[c]</span> @@ -1311,7 +1311,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> x:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> y:text<span class="Special"> <- </span>copy-range x, <span class="Constant">3</span>, <span class="Constant">3</span> - <span class="Constant">1</span>:array:character/<span class="Special">raw <- </span>copy *y + <span class="Constant">1</span>:@:char/<span class="Special">raw <- </span>copy *y ] memory-should-contain [ <span class="Constant">1</span>:array:character<span class="Special"> <- </span><span class="Constant">[]</span> diff --git a/html/062convert_ingredients_to_text.cc.html b/html/062convert_ingredients_to_text.cc.html index 34ef34f0..2228229c 100644 --- a/html/062convert_ingredients_to_text.cc.html +++ b/html/062convert_ingredients_to_text.cc.html @@ -38,7 +38,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario rewrite_stashes_to_text)</span> def main [ local-scope - <span class="Normal">n</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Normal">n</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> stash n ] <span class="traceContains">+transform: {stash_2_0: ("address" "array" "character")} <- to-text-line {n: "number"}</span> @@ -47,7 +47,7 @@ def main [ <span class="Delimiter">:(scenario rewrite_traces_to_text)</span> def main [ local-scope - <span class="Normal">n</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Normal">n</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> trace <span class="Constant">2</span><span class="Delimiter">,</span> [app]<span class="Delimiter">,</span> n ] <span class="traceContains">+transform: {trace_2_2: ("address" "array" "character")} <- to-text-line {n: "number"}</span> @@ -59,7 +59,7 @@ def main [ <span class="Delimiter">:(scenario rewrite_stashes_of_arrays)</span> def main [ local-scope - <span class="Normal">n</span>:address:array:number<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">3</span> + <span class="Normal">n</span>:&:@:num<span class="Special"> <- </span><span class="Normal">new</span> number:type<span class="Delimiter">,</span> <span class="Constant">3</span> stash *n ] <span class="traceContains">+transform: {stash_2_0: ("address" "array" "character")} <- array-to-text-line {n: ("address" "array" "number")}</span> @@ -68,14 +68,14 @@ def main [ <span class="Delimiter">:(scenario ignore_stashes_of_static_arrays)</span> def main [ local-scope - <span class="Normal">n</span>:array:number:<span class="Constant">3</span><span class="Special"> <- </span>create-array + <span class="Normal">n</span>:@:num:<span class="Constant">3</span><span class="Special"> <- </span>create-array stash n ] <span class="traceContains">+transform: stash {n: ("array" "number" "3")}</span> <span class="Delimiter">:(scenario rewrite_stashes_of_recipe_header_products)</span> container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num ] def bar <span class="Delimiter">-></span> x:foo [ local-scope @@ -107,7 +107,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Comment">// all these cases are getting hairy. how can we make this extensible?</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">"stash"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> ostringstream ingredient_name<span class="Delimiter">;</span> ingredient_name << <span class="Constant">"stash_"</span> << i << <span class="Constant">'_'</span> << j << <span class="Constant">":address:array:character"</span><span class="Delimiter">;</span> convert_ingredient_to_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> new_instructions<span class="Delimiter">,</span> ingredient_name<span class="Delimiter">.</span>str<span class="Delimiter">());</span> @@ -115,7 +115,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">}</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">"trace"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Comment">/*</span><span class="Comment">skip</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> ostringstream ingredient_name<span class="Delimiter">;</span> ingredient_name << <span class="Constant">"trace_"</span> << i << <span class="Constant">'_'</span> << j << <span class="Constant">":address:array:character"</span><span class="Delimiter">;</span> convert_ingredient_to_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> new_instructions<span class="Delimiter">,</span> ingredient_name<span class="Delimiter">.</span>str<span class="Delimiter">());</span> @@ -127,7 +127,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Comment">// new variants that match:</span> <span class="Comment">// append _:text, ___</span> <span class="Comment">// will never ever get used.</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> || is_mu_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> || is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> ostringstream ingredient_name<span class="Delimiter">;</span> ingredient_name << <span class="Constant">"append_"</span> << i << <span class="Constant">'_'</span> << j << <span class="Constant">":address:array:character"</span><span class="Delimiter">;</span> @@ -145,7 +145,7 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Comment">// replace r with converted text</span> <span class="Normal">void</span> convert_ingredient_to_text<span class="Delimiter">(</span>reagent& r<span class="Delimiter">,</span> vector<instruction>& out<span class="Delimiter">,</span> <span class="Normal">const</span> string& tmp_var<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// error; will be handled elsewhere</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_string<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_text<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// don't try to extend static arrays</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_static_array<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> instruction def<span class="Delimiter">;</span> @@ -182,11 +182,11 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa <span class="Delimiter">:(scenario append_other_types_to_text)</span> def main [ local-scope - <span class="Normal">n</span>:number<span class="Special"> <- </span>copy <span class="Constant">11</span> + <span class="Normal">n</span>:num<span class="Special"> <- </span>copy <span class="Constant">11</span> <span class="Normal">c</span>:character<span class="Special"> <- </span>copy <span class="Constant">111</span>/o <span class="Normal">a</span>:text<span class="Special"> <- </span>append [abc]<span class="Delimiter">,</span> <span class="Constant">10</span><span class="Delimiter">,</span> n<span class="Delimiter">,</span> c <span class="Normal">expected</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc1011o] - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal a<span class="Delimiter">,</span> expected + <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal a<span class="Delimiter">,</span> expected ] <span class="Comment">//: Make sure that the new system is strictly better than just the 'stash'</span> @@ -195,8 +195,8 @@ def main [ <span class="Delimiter">:(scenario rewrite_stash_continues_to_fall_back_to_default_implementation)</span> <span class="Comment"># type without a to-text implementation</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ local-scope diff --git a/html/063array.mu.html b/html/063array.mu.html index 75ed8c88..9b32f88d 100644 --- a/html/063array.mu.html +++ b/html/063array.mu.html @@ -34,8 +34,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> array-from-args [ run [ <span class="Constant">local-scope</span> - x:address:array:character<span class="Special"> <- </span>new-array <span class="Constant">0</span>, <span class="Constant">1</span>, <span class="Constant">2</span> - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *x + x:text<span class="Special"> <- </span>new-array <span class="Constant">0</span>, <span class="Constant">1</span>, <span class="Constant">2</span> + <span class="Constant">10</span>:@:char/<span class="Special">raw <- </span>copy *x ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">3</span> <span class="Comment"># array length</span> @@ -46,24 +46,24 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># create an array out of a list of scalar args</span> -<span class="muRecipe">def</span> new-array<span class="muRecipe"> -> </span>result:address:array:character [ +<span class="muRecipe">def</span> new-array<span class="muRecipe"> -> </span>result:text [ <span class="Constant">local-scope</span> - capacity:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + capacity:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="Comment"># while read curr-value</span> - curr-value:character, exists?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + curr-value:char, exists?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="muControl">break-unless</span> exists? capacity<span class="Special"> <- </span>add capacity, <span class="Constant">1</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> result<span class="Special"> <- </span>new <span class="Constant">character:type</span>, capacity <span class="Constant">rewind-ingredients</span> - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="Comment"># while read curr-value</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, capacity + done?:bool<span class="Special"> <- </span>greater-or-equal i, capacity <span class="muControl">break-if</span> done? - curr-value:character, exists?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + curr-value:char, exists?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> assert exists?, <span class="Constant">[error in rewinding ingredients to new-array]</span> *result<span class="Special"> <- </span>put-index *result, i, curr-value i<span class="Special"> <- </span>add i, <span class="Constant">1</span> diff --git a/html/064list.mu.html b/html/064list.mu.html index 5c24849e..b9e0e18d 100644 --- a/html/064list.mu.html +++ b/html/064list.mu.html @@ -39,23 +39,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muData">container</span> list:_elem [ value:_elem - next:address:list:_elem + next:&:list:_elem ] -<span class="muRecipe">def</span> push x:_elem, in:address:list:_elem<span class="muRecipe"> -> </span>result:address:list:_elem [ +<span class="muRecipe">def</span> push x:_elem, in:&:list:_elem<span class="muRecipe"> -> </span>result:&:list:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> result<span class="Special"> <- </span>new <span class="Delimiter">{</span>(list _elem): type<span class="Delimiter">}</span> *result<span class="Special"> <- </span>merge x, in ] -<span class="muRecipe">def</span> first in:address:list:_elem<span class="muRecipe"> -> </span>result:_elem [ +<span class="muRecipe">def</span> first in:&:list:_elem<span class="muRecipe"> -> </span>result:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> result<span class="Special"> <- </span>get *in, <span class="Constant">value:offset</span> ] -<span class="muRecipe">def</span> rest in:address:list:_elem<span class="muRecipe"> -> </span>result:address:list:_elem/contained-in:in [ +<span class="muRecipe">def</span> rest in:&:list:_elem<span class="muRecipe"> -> </span>result:&:list:_elem/contained-in:in [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> result<span class="Special"> <- </span>get *in, <span class="Constant">next:offset</span> @@ -64,15 +64,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> list-handling [ run [ <span class="Constant">local-scope</span> - x:address:list:number<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + x:&:list:num<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> x<span class="Special"> <- </span>push <span class="Constant">4</span>, x x<span class="Special"> <- </span>push <span class="Constant">5</span>, x - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>first x + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>first x x<span class="Special"> <- </span>rest x - <span class="Constant">11</span>:number/<span class="Special">raw <- </span>first x + <span class="Constant">11</span>:num/<span class="Special">raw <- </span>first x x<span class="Special"> <- </span>rest x - <span class="Constant">12</span>:number/<span class="Special">raw <- </span>first x - <span class="Constant">20</span>:address:list:number/<span class="Special">raw <- </span>rest x + <span class="Constant">12</span>:num/<span class="Special">raw <- </span>first x + <span class="Constant">20</span>:&:list:num/<span class="Special">raw <- </span>rest x ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">5</span> @@ -82,22 +82,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -<span class="muRecipe">def</span> length l:address:list:_elem<span class="muRecipe"> -> </span>result:number [ +<span class="muRecipe">def</span> length l:&:list:_elem<span class="muRecipe"> -> </span>result:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> l, <span class="Constant">0</span> - rest:address:list:_elem<span class="Special"> <- </span>rest l - length-of-rest:number<span class="Special"> <- </span>length rest + rest:&:list:_elem<span class="Special"> <- </span>rest l + length-of-rest:num<span class="Special"> <- </span>length rest result<span class="Special"> <- </span>add length-of-rest, <span class="Constant">1</span> ] <span class="Comment"># insert 'x' after 'in'</span> -<span class="muRecipe">def</span> insert x:_elem, in:address:list:_elem<span class="muRecipe"> -> </span>in:address:list:_elem [ +<span class="muRecipe">def</span> insert x:_elem, in:&:list:_elem<span class="muRecipe"> -> </span>in:&:list:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - new-node:address:list:_elem<span class="Special"> <- </span>new <span class="Delimiter">{</span>(list _elem): type<span class="Delimiter">}</span> + new-node:&:list:_elem<span class="Special"> <- </span>new <span class="Delimiter">{</span>(list _elem): type<span class="Delimiter">}</span> *new-node<span class="Special"> <- </span>put *new-node, <span class="Constant">value:offset</span>, x - next-node:address:list:_elem<span class="Special"> <- </span>get *in, <span class="Constant">next:offset</span> + next-node:&:list:_elem<span class="Special"> <- </span>get *in, <span class="Constant">next:offset</span> *in<span class="Special"> <- </span>put *in, <span class="Constant">next:offset</span>, new-node *new-node<span class="Special"> <- </span>put *new-node, <span class="Constant">next:offset</span>, next-node ] @@ -105,20 +105,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> inserting-into-list [ run [ <span class="Constant">local-scope</span> - list:address:list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list - list2:address:list:character<span class="Special"> <- </span>rest list <span class="Comment"># inside list</span> + list2:&:list:char<span class="Special"> <- </span>rest list <span class="Comment"># inside list</span> list2<span class="Special"> <- </span>insert <span class="Constant">6</span>, list2 <span class="Comment"># check structure</span> list2<span class="Special"> <- </span>copy list - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">13</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">13</span>:char/<span class="Special">raw <- </span>first list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">5</span> <span class="Comment"># scanning next</span> @@ -131,21 +131,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> inserting-at-end-of-list [ run [ <span class="Constant">local-scope</span> - list:address:list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list - list2:address:list:character<span class="Special"> <- </span>rest list <span class="Comment"># inside list</span> + list2:&:list:char<span class="Special"> <- </span>rest list <span class="Comment"># inside list</span> list2<span class="Special"> <- </span>rest list2 <span class="Comment"># now at end of list</span> list2<span class="Special"> <- </span>insert <span class="Constant">6</span>, list2 <span class="Comment"># check structure like before</span> list2<span class="Special"> <- </span>copy list - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">13</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">13</span>:char/<span class="Special">raw <- </span>first list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">5</span> <span class="Comment"># scanning next</span> @@ -158,19 +158,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> inserting-after-start-of-list [ run [ <span class="Constant">local-scope</span> - list:address:list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list list<span class="Special"> <- </span>insert <span class="Constant">6</span>, list <span class="Comment"># check structure like before</span> - list2:address:list:character<span class="Special"> <- </span>copy list - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>first list2 + list2:&:list:char<span class="Special"> <- </span>copy list + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">13</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">13</span>:char/<span class="Special">raw <- </span>first list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">5</span> <span class="Comment"># scanning next</span> @@ -184,23 +184,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment">#</span> <span class="Comment"># Returns null if and only if list is empty. Beware: in that case any other</span> <span class="Comment"># pointers to the head are now invalid.</span> -<span class="muRecipe">def</span> remove x:address:list:_elem/contained-in:in, in:address:list:_elem<span class="muRecipe"> -> </span>in:address:list:_elem [ +<span class="muRecipe">def</span> remove x:&:list:_elem/contained-in:in, in:&:list:_elem<span class="muRecipe"> -> </span>in:&:list:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if 'x' is null, return</span> <span class="muControl">return-unless</span> x - next-node:address:list:_elem<span class="Special"> <- </span>rest x + next-node:&:list:_elem<span class="Special"> <- </span>rest x <span class="Comment"># clear next pointer of 'x'</span> *x<span class="Special"> <- </span>put *x, <span class="Constant">next:offset</span>, <span class="Constant">0</span> <span class="Comment"># if 'x' is at the head of 'in', return the new head</span> - at-head?:boolean<span class="Special"> <- </span>equal x, in + at-head?:bool<span class="Special"> <- </span>equal x, in <span class="muControl">return-if</span> at-head?, next-node <span class="Comment"># compute prev-node</span> - prev-node:address:list:_elem<span class="Special"> <- </span>copy in - curr:address:list:_elem<span class="Special"> <- </span>rest prev-node + prev-node:&:list:_elem<span class="Special"> <- </span>copy in + curr:&:list:_elem<span class="Special"> <- </span>rest prev-node <span class="Delimiter">{</span> <span class="muControl">return-unless</span> curr - found?:boolean<span class="Special"> <- </span>equal curr, x + found?:bool<span class="Special"> <- </span>equal curr, x <span class="muControl">break-if</span> found? prev-node<span class="Special"> <- </span>copy curr curr<span class="Special"> <- </span>rest curr @@ -212,18 +212,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> removing-from-list [ run [ <span class="Constant">local-scope</span> - list:address:list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list - list2:address:list:character<span class="Special"> <- </span>rest list <span class="Comment"># second element</span> + list2:&:list:char<span class="Special"> <- </span>rest list <span class="Comment"># second element</span> list<span class="Special"> <- </span>remove list2, list - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal list2, <span class="Constant">0</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal list2, <span class="Constant">0</span> <span class="Comment"># check structure like before</span> list2<span class="Special"> <- </span>copy list - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">20</span>:address:list:character/<span class="Special">raw <- </span>rest list2 + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">20</span>:&:list:char/<span class="Special">raw <- </span>rest list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># remove returned non-null</span> @@ -236,16 +236,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> removing-from-start-of-list [ run [ <span class="Constant">local-scope</span> - list:address:list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list list<span class="Special"> <- </span>remove list, list <span class="Comment"># check structure like before</span> - list2:address:list:character<span class="Special"> <- </span>copy list - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>first list2 + list2:&:list:char<span class="Special"> <- </span>copy list + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">20</span>:address:list:character/<span class="Special">raw <- </span>rest list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">20</span>:&:list:char/<span class="Special">raw <- </span>rest list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">4</span> <span class="Comment"># scanning next, skipping deleted element</span> @@ -257,20 +257,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> removing-from-end-of-list [ run [ <span class="Constant">local-scope</span> - list:address:list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list <span class="Comment"># delete last element</span> - list2:address:list:character<span class="Special"> <- </span>rest list + list2:&:list:char<span class="Special"> <- </span>rest list list2<span class="Special"> <- </span>rest list2 list<span class="Special"> <- </span>remove list2, list - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal list2, <span class="Constant">0</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal list2, <span class="Constant">0</span> <span class="Comment"># check structure like before</span> list2<span class="Special"> <- </span>copy list - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>rest list2 - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">20</span>:address:list:character/<span class="Special">raw <- </span>rest list2 + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">20</span>:&:list:char/<span class="Special">raw <- </span>rest list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># remove returned non-null</span> @@ -283,33 +283,33 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> removing-from-singleton-list [ run [ <span class="Constant">local-scope</span> - list:address:list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>remove list, list - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>copy list + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>copy list ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># back to an empty list</span> ] ] -<span class="muRecipe">def</span> to-text in:address:list:_elem<span class="muRecipe"> -> </span>result:text [ +<span class="muRecipe">def</span> to-text in:&:list:_elem<span class="muRecipe"> -> </span>result:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - buf:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">80</span> + buf:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">80</span> buf<span class="Special"> <- </span>to-buffer in, buf result<span class="Special"> <- </span>buffer-to-array buf ] <span class="Comment"># variant of 'to-text' which stops printing after a few elements (and so is robust to cycles)</span> -<span class="muRecipe">def</span> to-text-line in:address:list:_elem<span class="muRecipe"> -> </span>result:text [ +<span class="muRecipe">def</span> to-text-line in:&:list:_elem<span class="muRecipe"> -> </span>result:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - buf:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">80</span> + buf:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">80</span> buf<span class="Special"> <- </span>to-buffer in, buf, <span class="Constant">6</span> <span class="Comment"># max elements to display</span> result<span class="Special"> <- </span>buffer-to-array buf ] -<span class="muRecipe">def</span> to-buffer in:address:list:_elem, buf:address:buffer<span class="muRecipe"> -> </span>buf:address:buffer [ +<span class="muRecipe">def</span> to-buffer in:&:list:_elem, buf:&:buffer<span class="muRecipe"> -> </span>buf:&:buffer [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> @@ -321,12 +321,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color val:_elem<span class="Special"> <- </span>get *in, <span class="Constant">value:offset</span> buf<span class="Special"> <- </span>append buf, val <span class="Comment"># now prepare next</span> - next:address:list:_elem<span class="Special"> <- </span>rest in - nextn:number<span class="Special"> <- </span>copy next + next:&:list:_elem<span class="Special"> <- </span>rest in + nextn:num<span class="Special"> <- </span>copy next <span class="muControl">return-unless</span> next buf<span class="Special"> <- </span>append buf, <span class="Constant">[ -> ]</span> <span class="Comment"># and recurse</span> - remaining:number, optional-ingredient-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + remaining:num, optional-ingredient-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> optional-ingredient-found? <span class="Comment"># unlimited recursion</span> diff --git a/html/065duplex_list.mu.html b/html/065duplex_list.mu.html index 8dad9fc4..7cefee4d 100644 --- a/html/065duplex_list.mu.html +++ b/html/065duplex_list.mu.html @@ -36,15 +36,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muData">container</span> duplex-list:_elem [ value:_elem - next:address:duplex-list:_elem - prev:address:duplex-list:_elem + next:&:duplex-list:_elem + prev:&:duplex-list:_elem ] <span class="Comment"># should I say in/contained-in:result, allow ingredients to refer to products?</span> -<span class="muRecipe">def</span> push x:_elem, in:address:duplex-list:_elem<span class="muRecipe"> -> </span>in:address:duplex-list:_elem [ +<span class="muRecipe">def</span> push x:_elem, in:&:duplex-list:_elem<span class="muRecipe"> -> </span>in:&:duplex-list:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - result:address:duplex-list:_elem<span class="Special"> <- </span>new <span class="Delimiter">{</span>(duplex-list _elem): type<span class="Delimiter">}</span> + result:&:duplex-list:_elem<span class="Special"> <- </span>new <span class="Delimiter">{</span>(duplex-list _elem): type<span class="Delimiter">}</span> *result<span class="Special"> <- </span>merge x, in, <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> in @@ -53,21 +53,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> result <span class="Comment"># needed explicitly because we need to replace 'in' with 'result'</span> ] -<span class="muRecipe">def</span> first in:address:duplex-list:_elem<span class="muRecipe"> -> </span>result:_elem [ +<span class="muRecipe">def</span> first in:&:duplex-list:_elem<span class="muRecipe"> -> </span>result:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> in, <span class="Constant">0</span> result<span class="Special"> <- </span>get *in, <span class="Constant">value:offset</span> ] -<span class="muRecipe">def</span> next in:address:duplex-list:_elem<span class="muRecipe"> -> </span>result:address:duplex-list:_elem/contained-in:in [ +<span class="muRecipe">def</span> next in:&:duplex-list:_elem<span class="muRecipe"> -> </span>result:&:duplex-list:_elem/contained-in:in [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> in, <span class="Constant">0</span> result<span class="Special"> <- </span>get *in, <span class="Constant">next:offset</span> ] -<span class="muRecipe">def</span> prev in:address:duplex-list:_elem<span class="muRecipe"> -> </span>result:address:duplex-list:_elem/contained-in:in [ +<span class="muRecipe">def</span> prev in:&:duplex-list:_elem<span class="muRecipe"> -> </span>result:&:duplex-list:_elem/contained-in:in [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> in, <span class="Constant">0</span> @@ -79,26 +79,26 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> <span class="Comment"># reserve locations 0-9 to check for missing null check</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>copy <span class="Constant">34</span> - <span class="Constant">11</span>:number/<span class="Special">raw <- </span>copy <span class="Constant">35</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">34</span> + <span class="Constant">11</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">35</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list - list2:address:duplex-list:character<span class="Special"> <- </span>copy list - <span class="Constant">20</span>:character/<span class="Special">raw <- </span>first list2 + list2:&:duplex-list:char<span class="Special"> <- </span>copy list + <span class="Constant">20</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">21</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">21</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">22</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">30</span>:address:duplex-list:character/<span class="Special">raw <- </span>next list2 - <span class="Constant">31</span>:character/<span class="Special">raw <- </span>first <span class="Constant">30</span>:address:duplex-list:character/<span class="Special">raw</span> - <span class="Constant">32</span>:address:duplex-list:character/<span class="Special">raw <- </span>next <span class="Constant">30</span>:address:duplex-list:character/<span class="Special">raw</span> - <span class="Constant">33</span>:address:duplex-list:character/<span class="Special">raw <- </span>prev <span class="Constant">30</span>:address:duplex-list:character/<span class="Special">raw</span> + <span class="Constant">22</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">30</span>:&:duplex-list:char/<span class="Special">raw <- </span>next list2 + <span class="Constant">31</span>:char/<span class="Special">raw <- </span>first <span class="Constant">30</span>:&:duplex-list:char/<span class="Special">raw</span> + <span class="Constant">32</span>:&:duplex-list:char/<span class="Special">raw <- </span>next <span class="Constant">30</span>:&:duplex-list:char/<span class="Special">raw</span> + <span class="Constant">33</span>:&:duplex-list:char/<span class="Special">raw <- </span>prev <span class="Constant">30</span>:&:duplex-list:char/<span class="Special">raw</span> list2<span class="Special"> <- </span>prev list2 - <span class="Constant">40</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">40</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">41</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">50</span>:boolean/<span class="Special">raw <- </span>equal list, list2 + <span class="Constant">41</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">50</span>:bool/<span class="Special">raw <- </span>equal list, list2 ] memory-should-contain [ <span class="Constant">0</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># no modifications to null pointers</span> @@ -118,13 +118,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># insert 'x' after 'in'</span> -<span class="muRecipe">def</span> insert x:_elem, in:address:duplex-list:_elem<span class="muRecipe"> -> </span>in:address:duplex-list:_elem [ +<span class="muRecipe">def</span> insert x:_elem, in:&:duplex-list:_elem<span class="muRecipe"> -> </span>in:&:duplex-list:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - new-node:address:duplex-list:_elem<span class="Special"> <- </span>new <span class="Delimiter">{</span>(duplex-list _elem): type<span class="Delimiter">}</span> + new-node:&:duplex-list:_elem<span class="Special"> <- </span>new <span class="Delimiter">{</span>(duplex-list _elem): type<span class="Delimiter">}</span> *new-node<span class="Special"> <- </span>put *new-node, <span class="Constant">value:offset</span>, x <span class="Comment"># save old next before changing it</span> - next-node:address:duplex-list:_elem<span class="Special"> <- </span>get *in, <span class="Constant">next:offset</span> + next-node:&:duplex-list:_elem<span class="Special"> <- </span>get *in, <span class="Constant">next:offset</span> *in<span class="Special"> <- </span>put *in, <span class="Constant">next:offset</span>, new-node *new-node<span class="Special"> <- </span>put *new-node, <span class="Constant">prev:offset</span>, in *new-node<span class="Special"> <- </span>put *new-node, <span class="Constant">next:offset</span>, next-node @@ -135,27 +135,27 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> inserting-into-duplex-list [ run [ <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list - list2:address:duplex-list:character<span class="Special"> <- </span>next list <span class="Comment"># inside list</span> + list2:&:duplex-list:char<span class="Special"> <- </span>next list <span class="Comment"># inside list</span> list2<span class="Special"> <- </span>insert <span class="Constant">6</span>, list2 <span class="Comment"># check structure like before</span> list2<span class="Special"> <- </span>copy list - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">13</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">13</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">20</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">20</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">21</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">21</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">22</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">30</span>:boolean/<span class="Special">raw <- </span>equal list, list2 + <span class="Constant">22</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">30</span>:bool/<span class="Special">raw <- </span>equal list, list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">5</span> <span class="Comment"># scanning next</span> @@ -172,28 +172,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> inserting-at-end-of-duplex-list [ run [ <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list - list2:address:duplex-list:character<span class="Special"> <- </span>next list <span class="Comment"># inside list</span> + list2:&:duplex-list:char<span class="Special"> <- </span>next list <span class="Comment"># inside list</span> list2<span class="Special"> <- </span>next list2 <span class="Comment"># now at end of list</span> list2<span class="Special"> <- </span>insert <span class="Constant">6</span>, list2 <span class="Comment"># check structure like before</span> list2<span class="Special"> <- </span>copy list - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">13</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">13</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">20</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">20</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">21</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">21</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">22</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">30</span>:boolean/<span class="Special">raw <- </span>equal list, list2 + <span class="Constant">22</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">30</span>:bool/<span class="Special">raw <- </span>equal list, list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">5</span> <span class="Comment"># scanning next</span> @@ -210,26 +210,26 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> inserting-after-start-of-duplex-list [ run [ <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list list<span class="Special"> <- </span>insert <span class="Constant">6</span>, list <span class="Comment"># check structure like before</span> - list2:address:duplex-list:character<span class="Special"> <- </span>copy list - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>first list2 + list2:&:duplex-list:char<span class="Special"> <- </span>copy list + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">13</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">13</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">20</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">20</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">21</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">21</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">22</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">30</span>:boolean/<span class="Special">raw <- </span>equal list, list2 + <span class="Constant">22</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">30</span>:bool/<span class="Special">raw <- </span>equal list, list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">5</span> <span class="Comment"># scanning next</span> @@ -247,13 +247,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment">#</span> <span class="Comment"># Returns null if and only if list is empty. Beware: in that case any other</span> <span class="Comment"># pointers to the head are now invalid.</span> -<span class="muRecipe">def</span> remove x:address:duplex-list:_elem/contained-in:in, in:address:duplex-list:_elem<span class="muRecipe"> -> </span>in:address:duplex-list:_elem [ +<span class="muRecipe">def</span> remove x:&:duplex-list:_elem/contained-in:in, in:&:duplex-list:_elem<span class="muRecipe"> -> </span>in:&:duplex-list:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if 'x' is null, return</span> <span class="muControl">return-unless</span> x - next-node:address:duplex-list:_elem<span class="Special"> <- </span>get *x, <span class="Constant">next:offset</span> - prev-node:address:duplex-list:_elem<span class="Special"> <- </span>get *x, <span class="Constant">prev:offset</span> + next-node:&:duplex-list:_elem<span class="Special"> <- </span>get *x, <span class="Constant">next:offset</span> + prev-node:&:duplex-list:_elem<span class="Special"> <- </span>get *x, <span class="Constant">prev:offset</span> <span class="Comment"># null x's pointers</span> *x<span class="Special"> <- </span>put *x, <span class="Constant">next:offset</span>, <span class="Constant">0</span> *x<span class="Special"> <- </span>put *x, <span class="Constant">prev:offset</span>, <span class="Constant">0</span> @@ -276,21 +276,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> removing-from-duplex-list [ run [ <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list - list2:address:duplex-list:character<span class="Special"> <- </span>next list <span class="Comment"># second element</span> + list2:&:duplex-list:char<span class="Special"> <- </span>next list <span class="Comment"># second element</span> list<span class="Special"> <- </span>remove list2, list - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal list2, <span class="Constant">0</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal list2, <span class="Constant">0</span> <span class="Comment"># check structure like before</span> list2<span class="Special"> <- </span>copy list - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">20</span>:address:duplex-list:character/<span class="Special">raw <- </span>next list2 + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">20</span>:&:duplex-list:char/<span class="Special">raw <- </span>next list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">30</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">40</span>:boolean/<span class="Special">raw <- </span>equal list, list2 + <span class="Constant">30</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">40</span>:bool/<span class="Special">raw <- </span>equal list, list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># remove returned non-null</span> @@ -305,19 +305,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> removing-from-start-of-duplex-list [ run [ <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list list<span class="Special"> <- </span>remove list, list <span class="Comment"># check structure like before</span> - list2:address:duplex-list:character<span class="Special"> <- </span>copy list - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>first list2 + list2:&:duplex-list:char<span class="Special"> <- </span>copy list + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">20</span>:address:duplex-list:character/<span class="Special">raw <- </span>next list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">20</span>:&:duplex-list:char/<span class="Special">raw <- </span>next list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">30</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">40</span>:boolean/<span class="Special">raw <- </span>equal list, list2 + <span class="Constant">30</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">40</span>:bool/<span class="Special">raw <- </span>equal list, list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">4</span> <span class="Comment"># scanning next, skipping deleted element</span> @@ -331,23 +331,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> removing-from-end-of-duplex-list [ run [ <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">4</span>, list list<span class="Special"> <- </span>push <span class="Constant">5</span>, list <span class="Comment"># delete last element</span> - list2:address:duplex-list:character<span class="Special"> <- </span>next list + list2:&:duplex-list:char<span class="Special"> <- </span>next list list2<span class="Special"> <- </span>next list2 list<span class="Special"> <- </span>remove list2, list - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal list2, <span class="Constant">0</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal list2, <span class="Constant">0</span> <span class="Comment"># check structure like before</span> list2<span class="Special"> <- </span>copy list - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>first list2 + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>first list2 list2<span class="Special"> <- </span>next list2 - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">20</span>:address:duplex-list:character/<span class="Special">raw <- </span>next list2 + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">20</span>:&:duplex-list:char/<span class="Special">raw <- </span>next list2 list2<span class="Special"> <- </span>prev list2 - <span class="Constant">30</span>:character/<span class="Special">raw <- </span>first list2 - <span class="Constant">40</span>:boolean/<span class="Special">raw <- </span>equal list, list2 + <span class="Constant">30</span>:char/<span class="Special">raw <- </span>first list2 + <span class="Constant">40</span>:bool/<span class="Special">raw <- </span>equal list, list2 ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># remove returned non-null</span> @@ -362,9 +362,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> removing-from-singleton-duplex-list [ run [ <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">3</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>remove list, list - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>copy list + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>copy list ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># back to an empty list</span> @@ -376,11 +376,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># set end to 0 to delete everything past start.</span> <span class="Comment"># can't set start to 0 to delete everything before end, because there's no</span> <span class="Comment"># clean way to return the new head pointer.</span> -<span class="muRecipe">def</span> remove-between start:address:duplex-list:_elem, end:address:duplex-list:_elem/contained-in:start<span class="muRecipe"> -> </span>start:address:duplex-list:_elem [ +<span class="muRecipe">def</span> remove-between start:&:duplex-list:_elem, end:&:duplex-list:_elem/contained-in:start<span class="muRecipe"> -> </span>start:&:duplex-list:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - next:address:duplex-list:_elem<span class="Special"> <- </span>get *start, <span class="Constant">next:offset</span> - nothing-to-delete?:boolean<span class="Special"> <- </span>equal next, end + next:&:duplex-list:_elem<span class="Special"> <- </span>get *start, <span class="Constant">next:offset</span> + nothing-to-delete?:bool<span class="Special"> <- </span>equal next, end <span class="muControl">return-if</span> nothing-to-delete? assert next, <span class="Constant">[malformed duplex list]</span> <span class="Comment"># start->next->prev = 0</span> @@ -390,7 +390,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return-unless</span> end <span class="Comment"># end->prev->next = 0</span> <span class="Comment"># end->prev = start</span> - prev:address:duplex-list:_elem<span class="Special"> <- </span>get *end, <span class="Constant">prev:offset</span> + prev:&:duplex-list:_elem<span class="Special"> <- </span>get *end, <span class="Constant">prev:offset</span> assert prev, <span class="Constant">[malformed duplex list - 2]</span> *prev<span class="Special"> <- </span>put *prev, <span class="Constant">next:offset</span>, <span class="Constant">0</span> *end<span class="Special"> <- </span>put *end, <span class="Constant">prev:offset</span>, start @@ -399,28 +399,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> remove-range [ <span class="Comment"># construct a duplex list with six elements [13, 14, 15, 16, 17, 18]</span> <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">18</span>, <span class="Constant">0</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">18</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">17</span>, list list<span class="Special"> <- </span>push <span class="Constant">16</span>, list list<span class="Special"> <- </span>push <span class="Constant">15</span>, list list<span class="Special"> <- </span>push <span class="Constant">14</span>, list list<span class="Special"> <- </span>push <span class="Constant">13</span>, list - <span class="Constant">1</span>:address:duplex-list:character/<span class="Special">raw <- </span>copy list <span class="Comment"># save list</span> + <span class="Constant">1</span>:&:duplex-list:char/<span class="Special">raw <- </span>copy list <span class="Comment"># save list</span> run [ <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:duplex-list:character/<span class="Special">raw</span> <span class="Comment"># restore list</span> + list:&:duplex-list:char<span class="Special"> <- </span>copy <span class="Constant">1</span>:&:duplex-list:char/<span class="Special">raw</span> <span class="Comment"># restore list</span> <span class="Comment"># delete 16 onwards</span> <span class="Comment"># first pointer: to the third element</span> - list2:address:duplex-list:character<span class="Special"> <- </span>next list + list2:&:duplex-list:char<span class="Special"> <- </span>next list list2<span class="Special"> <- </span>next list2 list2<span class="Special"> <- </span>remove-between list2, <span class="Constant">0</span> <span class="Comment"># now check the list</span> - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> list<span class="Special"> <- </span>next list - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> list<span class="Special"> <- </span>next list - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> - <span class="Constant">20</span>:address:duplex-list:character/<span class="Special">raw <- </span>next list + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> + <span class="Constant">20</span>:&:duplex-list:char/<span class="Special">raw <- </span>next list ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">13</span> @@ -433,32 +433,32 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> remove-range-to-final [ <span class="Constant">local-scope</span> <span class="Comment"># construct a duplex list with six elements [13, 14, 15, 16, 17, 18]</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">18</span>, <span class="Constant">0</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">18</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">17</span>, list list<span class="Special"> <- </span>push <span class="Constant">16</span>, list list<span class="Special"> <- </span>push <span class="Constant">15</span>, list list<span class="Special"> <- </span>push <span class="Constant">14</span>, list list<span class="Special"> <- </span>push <span class="Constant">13</span>, list - <span class="Constant">1</span>:address:duplex-list:character/<span class="Special">raw <- </span>copy list <span class="Comment"># save list</span> + <span class="Constant">1</span>:&:duplex-list:char/<span class="Special">raw <- </span>copy list <span class="Comment"># save list</span> run [ <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:duplex-list:character/<span class="Special">raw</span> <span class="Comment"># restore list</span> + list:&:duplex-list:char<span class="Special"> <- </span>copy <span class="Constant">1</span>:&:duplex-list:char/<span class="Special">raw</span> <span class="Comment"># restore list</span> <span class="Comment"># delete 15, 16 and 17</span> <span class="Comment"># start pointer: to the second element</span> - list2:address:duplex-list:character<span class="Special"> <- </span>next list + list2:&:duplex-list:char<span class="Special"> <- </span>next list <span class="Comment"># end pointer: to the last (sixth) element</span> - end:address:duplex-list:character<span class="Special"> <- </span>next list2 + end:&:duplex-list:char<span class="Special"> <- </span>next list2 end<span class="Special"> <- </span>next end end<span class="Special"> <- </span>next end end<span class="Special"> <- </span>next end remove-between list2, end <span class="Comment"># now check the list</span> - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> list<span class="Special"> <- </span>next list - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> list<span class="Special"> <- </span>next list - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> - <span class="Constant">20</span>:address:duplex-list:character/<span class="Special">raw <- </span>next list + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> + <span class="Constant">20</span>:&:duplex-list:char/<span class="Special">raw <- </span>next list ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">13</span> @@ -471,23 +471,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> remove-range-empty [ <span class="Constant">local-scope</span> <span class="Comment"># construct a duplex list with three elements [13, 14, 15]</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">15</span>, <span class="Constant">0</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">15</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">14</span>, list list<span class="Special"> <- </span>push <span class="Constant">13</span>, list - <span class="Constant">1</span>:address:duplex-list:character/<span class="Special">raw <- </span>copy list <span class="Comment"># save list</span> + <span class="Constant">1</span>:&:duplex-list:char/<span class="Special">raw <- </span>copy list <span class="Comment"># save list</span> run [ <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:duplex-list:character/<span class="Special">raw</span> <span class="Comment"># restore list</span> + list:&:duplex-list:char<span class="Special"> <- </span>copy <span class="Constant">1</span>:&:duplex-list:char/<span class="Special">raw</span> <span class="Comment"># restore list</span> <span class="Comment"># delete between first and second element (i.e. nothing)</span> - list2:address:duplex-list:character<span class="Special"> <- </span>next list + list2:&:duplex-list:char<span class="Special"> <- </span>next list remove-between list, list2 <span class="Comment"># now check the list</span> - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> list<span class="Special"> <- </span>next list - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> list<span class="Special"> <- </span>next list - <span class="Constant">12</span>:character/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> - <span class="Constant">20</span>:address:duplex-list:character/<span class="Special">raw <- </span>next list + <span class="Constant">12</span>:char/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> + <span class="Constant">20</span>:&:duplex-list:char/<span class="Special">raw <- </span>next list ] <span class="Comment"># no change</span> memory-should-contain [ @@ -501,24 +501,24 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> remove-range-to-end [ <span class="Constant">local-scope</span> <span class="Comment"># construct a duplex list with six elements [13, 14, 15, 16, 17, 18]</span> - list:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">18</span>, <span class="Constant">0</span> + list:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">18</span>, <span class="Constant">0</span> list<span class="Special"> <- </span>push <span class="Constant">17</span>, list list<span class="Special"> <- </span>push <span class="Constant">16</span>, list list<span class="Special"> <- </span>push <span class="Constant">15</span>, list list<span class="Special"> <- </span>push <span class="Constant">14</span>, list list<span class="Special"> <- </span>push <span class="Constant">13</span>, list - <span class="Constant">1</span>:address:duplex-list:character/<span class="Special">raw <- </span>copy list <span class="Comment"># save list</span> + <span class="Constant">1</span>:&:duplex-list:char/<span class="Special">raw <- </span>copy list <span class="Comment"># save list</span> run [ <span class="Constant">local-scope</span> - list:address:duplex-list:character<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:duplex-list:character/<span class="Special">raw</span> <span class="Comment"># restore list</span> + list:&:duplex-list:char<span class="Special"> <- </span>copy <span class="Constant">1</span>:&:duplex-list:char/<span class="Special">raw</span> <span class="Comment"># restore list</span> <span class="Comment"># remove the third element and beyond</span> - list2:address:duplex-list:character<span class="Special"> <- </span>next list + list2:&:duplex-list:char<span class="Special"> <- </span>next list remove-between list2, <span class="Constant">0</span> <span class="Comment"># now check the list</span> - <span class="Constant">10</span>:character/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> + <span class="Constant">10</span>:char/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> list<span class="Special"> <- </span>next list - <span class="Constant">11</span>:character/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> - <span class="Constant">20</span>:address:duplex-list:character/<span class="Special">raw <- </span>next list + <span class="Constant">11</span>:char/<span class="Special">raw <- </span>get *list, <span class="Constant">value:offset</span> + <span class="Constant">20</span>:&:duplex-list:char/<span class="Special">raw <- </span>next list ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">13</span> @@ -528,19 +528,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># insert list beginning at 'new' after 'in'</span> -<span class="muRecipe">def</span> insert-range in:address:duplex-list:_elem, start:address:duplex-list:_elem/contained-in:in<span class="muRecipe"> -> </span>in:address:duplex-list:_elem [ +<span class="muRecipe">def</span> insert-range in:&:duplex-list:_elem, start:&:duplex-list:_elem/contained-in:in<span class="muRecipe"> -> </span>in:&:duplex-list:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> in <span class="muControl">return-unless</span> start - end:address:duplex-list:_elem<span class="Special"> <- </span>copy start + end:&:duplex-list:_elem<span class="Special"> <- </span>copy start <span class="Delimiter">{</span> - next:address:duplex-list:_elem<span class="Special"> <- </span>next end/insert-range + next:&:duplex-list:_elem<span class="Special"> <- </span>next end/insert-range <span class="muControl">break-unless</span> next end<span class="Special"> <- </span>copy next <span class="muControl">loop</span> <span class="Delimiter">}</span> - next:address:duplex-list:_elem<span class="Special"> <- </span>next in + next:&:duplex-list:_elem<span class="Special"> <- </span>next in *end<span class="Special"> <- </span>put *end, <span class="Constant">next:offset</span>, next <span class="Delimiter">{</span> <span class="muControl">break-unless</span> next @@ -550,21 +550,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *start<span class="Special"> <- </span>put *start, <span class="Constant">prev:offset</span>, in ] -<span class="muRecipe">def</span> append in:address:duplex-list:_elem, new:address:duplex-list:_elem/contained-in:in<span class="muRecipe"> -> </span>in:address:duplex-list:_elem [ +<span class="muRecipe">def</span> append in:&:duplex-list:_elem, new:&:duplex-list:_elem/contained-in:in<span class="muRecipe"> -> </span>in:&:duplex-list:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - last:address:duplex-list:_elem<span class="Special"> <- </span>last in + last:&:duplex-list:_elem<span class="Special"> <- </span>last in *last<span class="Special"> <- </span>put *last, <span class="Constant">next:offset</span>, new <span class="muControl">return-unless</span> new *new<span class="Special"> <- </span>put *new, <span class="Constant">prev:offset</span>, last ] -<span class="muRecipe">def</span> last in:address:duplex-list:_elem<span class="muRecipe"> -> </span>result:address:duplex-list:_elem [ +<span class="muRecipe">def</span> last in:&:duplex-list:_elem<span class="muRecipe"> -> </span>result:&:duplex-list:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> result<span class="Special"> <- </span>copy in <span class="Delimiter">{</span> - next:address:duplex-list:_elem<span class="Special"> <- </span>next result + next:&:duplex-list:_elem<span class="Special"> <- </span>next result <span class="muControl">break-unless</span> next result<span class="Special"> <- </span>copy next <span class="muControl">loop</span> @@ -572,7 +572,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># helper for debugging</span> -<span class="muRecipe">def</span> dump-from x:address:duplex-list:_elem [ +<span class="muRecipe">def</span> dump-from x:&:duplex-list:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> $print x, <span class="Constant">[: ]</span> @@ -582,7 +582,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color $print c, <span class="Constant">[ ]</span> x<span class="Special"> <- </span>next x <span class="Delimiter">{</span> - is-newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + is-newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> is-newline? $print <span class="Constant">10/newline</span> $print x, <span class="Constant">[: ]</span> diff --git a/html/066stream.mu.html b/html/066stream.mu.html index 02798ec8..49abcfb6 100644 --- a/html/066stream.mu.html +++ b/html/066stream.mu.html @@ -33,11 +33,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <pre id='vimCodeElement'> <span class="Comment"># new type to help incrementally scan arrays</span> <span class="muData">container</span> stream:_elem [ - index:number - data:address:array:_elem + index:num + data:&:@:_elem ] -<span class="muRecipe">def</span> new-stream s:address:array:_elem<span class="muRecipe"> -> </span>result:address:stream:_elem [ +<span class="muRecipe">def</span> new-stream s:&:@:_elem<span class="muRecipe"> -> </span>result:&:stream:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> result<span class="Special"> <- </span>new <span class="Delimiter">{</span>(stream _elem): type<span class="Delimiter">}</span> @@ -45,23 +45,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *result<span class="Special"> <- </span>put *result, <span class="Constant">data:offset</span>, s ] -<span class="muRecipe">def</span> rewind in:address:stream:_elem<span class="muRecipe"> -> </span>in:address:stream:_elem [ +<span class="muRecipe">def</span> rewind in:&:stream:_elem<span class="muRecipe"> -> </span>in:&:stream:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> *in<span class="Special"> <- </span>put *in, <span class="Constant">index:offset</span>, <span class="Constant">0</span> ] -<span class="muRecipe">def</span> read in:address:stream:_elem<span class="muRecipe"> -> </span>result:_elem, empty?:boolean, in:address:stream:_elem [ +<span class="muRecipe">def</span> read in:&:stream:_elem<span class="muRecipe"> -> </span>result:_elem, empty?:bool, in:&:stream:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> empty?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> - idx:number<span class="Special"> <- </span>get *in, <span class="Constant">index:offset</span> - s:address:array:_elem<span class="Special"> <- </span>get *in, <span class="Constant">data:offset</span> - len:number<span class="Special"> <- </span>length *s - at-end?:boolean<span class="Special"> <- </span>greater-or-equal idx len + idx:num<span class="Special"> <- </span>get *in, <span class="Constant">index:offset</span> + s:&:@:_elem<span class="Special"> <- </span>get *in, <span class="Constant">data:offset</span> + len:num<span class="Special"> <- </span>length *s + at-end?:bool<span class="Special"> <- </span>greater-or-equal idx len <span class="Delimiter">{</span> <span class="muControl">break-unless</span> at-end? - empty-result:address:_elem<span class="Special"> <- </span>new <span class="Constant">_elem:type</span> + empty-result:&:_elem<span class="Special"> <- </span>new <span class="Constant">_elem:type</span> <span class="muControl">return</span> *empty-result, <span class="Constant">1/true</span> <span class="Delimiter">}</span> result<span class="Special"> <- </span>index *s, idx @@ -69,40 +69,40 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *in<span class="Special"> <- </span>put *in, <span class="Constant">index:offset</span>, idx ] -<span class="muRecipe">def</span> peek in:address:stream:_elem<span class="muRecipe"> -> </span>result:_elem, empty?:boolean [ +<span class="muRecipe">def</span> peek in:&:stream:_elem<span class="muRecipe"> -> </span>result:_elem, empty?:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - empty?:boolean<span class="Special"> <- </span>copy <span class="Constant">0/false</span> - idx:number<span class="Special"> <- </span>get *in, <span class="Constant">index:offset</span> - s:address:array:_elem<span class="Special"> <- </span>get *in, <span class="Constant">data:offset</span> - len:number<span class="Special"> <- </span>length *s - at-end?:boolean<span class="Special"> <- </span>greater-or-equal idx len + empty?:bool<span class="Special"> <- </span>copy <span class="Constant">0/false</span> + idx:num<span class="Special"> <- </span>get *in, <span class="Constant">index:offset</span> + s:&:@:_elem<span class="Special"> <- </span>get *in, <span class="Constant">data:offset</span> + len:num<span class="Special"> <- </span>length *s + at-end?:bool<span class="Special"> <- </span>greater-or-equal idx len <span class="Delimiter">{</span> <span class="muControl">break-unless</span> at-end? - empty-result:address:_elem<span class="Special"> <- </span>new <span class="Constant">_elem:type</span> + empty-result:&:_elem<span class="Special"> <- </span>new <span class="Constant">_elem:type</span> <span class="muControl">return</span> *empty-result, <span class="Constant">1/true</span> <span class="Delimiter">}</span> result<span class="Special"> <- </span>index *s, idx ] -<span class="muRecipe">def</span> read-line in:address:stream:character<span class="muRecipe"> -> </span>result:text, in:address:stream:character [ +<span class="muRecipe">def</span> read-line in:&:stream:char<span class="muRecipe"> -> </span>result:text, in:&:stream:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - idx:number<span class="Special"> <- </span>get *in, <span class="Constant">index:offset</span> + idx:num<span class="Special"> <- </span>get *in, <span class="Constant">index:offset</span> s:text<span class="Special"> <- </span>get *in, <span class="Constant">data:offset</span> - next-idx:number<span class="Special"> <- </span>find-next s, <span class="Constant">10/newline</span>, idx + next-idx:num<span class="Special"> <- </span>find-next s, <span class="Constant">10/newline</span>, idx result<span class="Special"> <- </span>copy-range s, idx, next-idx idx<span class="Special"> <- </span>add next-idx, <span class="Constant">1</span> <span class="Comment"># skip newline</span> <span class="Comment"># write back</span> *in<span class="Special"> <- </span>put *in, <span class="Constant">index:offset</span>, idx ] -<span class="muRecipe">def</span> end-of-stream? in:address:stream:_elem<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> end-of-stream? in:&:stream:_elem<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - idx:number<span class="Special"> <- </span>get *in, <span class="Constant">index:offset</span> - s:address:array:_elem<span class="Special"> <- </span>get *in, <span class="Constant">data:offset</span> - len:number<span class="Special"> <- </span>length *s + idx:num<span class="Special"> <- </span>get *in, <span class="Constant">index:offset</span> + s:&:@:_elem<span class="Special"> <- </span>get *in, <span class="Constant">data:offset</span> + len:num<span class="Special"> <- </span>length *s result<span class="Special"> <- </span>greater-or-equal idx, len ] </pre> diff --git a/html/068random.mu.html b/html/068random.mu.html index 192dcbab..84ca32c8 100644 --- a/html/068random.mu.html +++ b/html/068random.mu.html @@ -31,7 +31,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color </head> <body> <pre id='vimCodeElement'> -<span class="muRecipe">def</span> random generator:address:stream:number<span class="muRecipe"> -> </span>result:number, fail?:boolean, generator:address:stream:number [ +<span class="muRecipe">def</span> random generator:&:stream:num<span class="muRecipe"> -> </span>result:num, fail?:bool, generator:&:stream:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> @@ -44,22 +44,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># helper for tests</span> -<span class="muRecipe">def</span> assume-random-numbers<span class="muRecipe"> -> </span>result:address:stream:number [ +<span class="muRecipe">def</span> assume-random-numbers<span class="muRecipe"> -> </span>result:&:stream:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># compute result-len, space to allocate in result</span> - result-len:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + result-len:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - _, arg-received?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + _, arg-received?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="muControl">break-unless</span> arg-received? result-len<span class="Special"> <- </span>add result-len, <span class="Constant">1</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> <span class="Constant">rewind-ingredients</span> - result-data:address:array:number<span class="Special"> <- </span>new <span class="Constant">number:type</span>, result-len - idx:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + result-data:&:@:num<span class="Special"> <- </span>new <span class="Constant">number:type</span>, result-len + idx:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - curr:number, arg-received?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + curr:num, arg-received?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="muControl">break-unless</span> arg-received? *result-data<span class="Special"> <- </span>put-index *result-data, idx, curr idx<span class="Special"> <- </span>add idx, <span class="Constant">1</span> @@ -70,11 +70,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> random-numbers-in-scenario [ <span class="Constant">local-scope</span> - source:address:stream:number<span class="Special"> <- </span>assume-random-numbers <span class="Constant">34</span>, <span class="Constant">35</span>, <span class="Constant">37</span> - <span class="Constant">1</span>:number/<span class="Special">raw</span>, <span class="Constant">2</span>:boolean/<span class="Special">raw <- </span>random source - <span class="Constant">3</span>:number/<span class="Special">raw</span>, <span class="Constant">4</span>:boolean/<span class="Special">raw <- </span>random source - <span class="Constant">5</span>:number/<span class="Special">raw</span>, <span class="Constant">6</span>:boolean/<span class="Special">raw <- </span>random source - <span class="Constant">7</span>:number/<span class="Special">raw</span>, <span class="Constant">8</span>:boolean/<span class="Special">raw <- </span>random source + source:&:stream:num<span class="Special"> <- </span>assume-random-numbers <span class="Constant">34</span>, <span class="Constant">35</span>, <span class="Constant">37</span> + <span class="Constant">1</span>:num/<span class="Special">raw</span>, <span class="Constant">2</span>:bool/<span class="Special">raw <- </span>random source + <span class="Constant">3</span>:num/<span class="Special">raw</span>, <span class="Constant">4</span>:bool/<span class="Special">raw <- </span>random source + <span class="Constant">5</span>:num/<span class="Special">raw</span>, <span class="Constant">6</span>:bool/<span class="Special">raw <- </span>random source + <span class="Constant">7</span>:num/<span class="Special">raw</span>, <span class="Constant">8</span>:bool/<span class="Special">raw <- </span>random source memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">34</span> <span class="Constant">2</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># everything went well</span> diff --git a/html/069hash.cc.html b/html/069hash.cc.html index 9f22b7a3..1b4a1b15 100644 --- a/html/069hash.cc.html +++ b/html/069hash.cc.html @@ -68,7 +68,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(code)</span> <span class="Normal">size_t</span> hash<span class="Delimiter">(</span><span class="Normal">size_t</span> h<span class="Delimiter">,</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span> canonize<span class="Delimiter">(</span>r<span class="Delimiter">);</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_string<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Comment">// optimization</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_text<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Comment">// optimization</span> <span class="Identifier">return</span> hash_mu_string<span class="Delimiter">(</span>h<span class="Delimiter">,</span> r<span class="Delimiter">);</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_address<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span> hash_mu_address<span class="Delimiter">(</span>h<span class="Delimiter">,</span> r<span class="Delimiter">);</span> @@ -101,7 +101,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">}</span> <span class="Normal">size_t</span> hash_mu_string<span class="Delimiter">(</span><span class="Normal">size_t</span> h<span class="Delimiter">,</span> <span class="Normal">const</span> reagent& r<span class="Delimiter">)</span> <span class="Delimiter">{</span> - string input = read_mu_string<span class="Delimiter">(</span>get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> r<span class="Delimiter">.</span>value<span class="Delimiter">));</span> + string input = read_mu_text<span class="Delimiter">(</span>get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> r<span class="Delimiter">.</span>value<span class="Delimiter">));</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 < SIZE<span class="Delimiter">(</span>input<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> h = hash_iter<span class="Delimiter">(</span>h<span class="Delimiter">,</span> <span class="Normal">static_cast</span><<span class="Normal">size_t</span>><span class="Delimiter">(</span>input<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)));</span> <span class="CommentedCode">//? cerr << i << ": " << h << '\n';</span> @@ -164,17 +164,17 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario hash_container_checks_all_elements)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:character + <span class="Normal">x</span>:num + <span class="Normal">y</span>:<span class="Normal">char</span> ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">97</span>/a - <span class="Constant">3</span>:number<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">3</span>:number + <span class="Constant">3</span>:num<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">3</span>:num <span class="Constant">4</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">98</span>/a - <span class="Constant">6</span>:number<span class="Special"> <- </span>hash <span class="Constant">4</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">6</span>:number - <span class="Constant">7</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">3</span>:number<span class="Delimiter">,</span> <span class="Constant">6</span>:number + <span class="Constant">6</span>:num<span class="Special"> <- </span>hash <span class="Constant">4</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">6</span>:num + <span class="Constant">7</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">3</span>:num<span class="Delimiter">,</span> <span class="Constant">6</span>:num ] <span class="Comment"># hash on containers includes all elements</span> <span class="traceContains">+mem: storing 0 in location 7</span> @@ -182,37 +182,37 @@ def main [ <span class="Delimiter">:(scenario hash_exclusive_container_checks_all_elements)</span> exclusive-container foo [ <span class="Normal">x</span>:bar - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] container bar [ - <span class="Normal">a</span>:number - <span class="Normal">b</span>:number + <span class="Normal">a</span>:num + <span class="Normal">b</span>:num ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">4</span>:number + <span class="Constant">4</span>:num<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">4</span>:num <span class="Constant">5</span>:foo<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">36</span> - <span class="Constant">8</span>:number<span class="Special"> <- </span>hash <span class="Constant">5</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">8</span>:number - <span class="Constant">9</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">4</span>:number<span class="Delimiter">,</span> <span class="Constant">8</span>:number + <span class="Constant">8</span>:num<span class="Special"> <- </span>hash <span class="Constant">5</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">8</span>:num + <span class="Constant">9</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">4</span>:num<span class="Delimiter">,</span> <span class="Constant">8</span>:num ] <span class="Comment"># hash on containers includes all elements</span> <span class="traceContains">+mem: storing 0 in location 9</span> <span class="Delimiter">:(scenario hash_can_ignore_container_elements)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:character/ignore-<span class="Normal">for</span>-hash + <span class="Normal">x</span>:num + <span class="Normal">y</span>:<span class="Normal">char</span>/ignore-<span class="Normal">for</span>-hash ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">97</span>/a - <span class="Constant">3</span>:number<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">3</span>:number + <span class="Constant">3</span>:num<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">3</span>:num <span class="Constant">4</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">98</span>/a - <span class="Constant">6</span>:number<span class="Special"> <- </span>hash <span class="Constant">4</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">6</span>:number - <span class="Constant">7</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">3</span>:number<span class="Delimiter">,</span> <span class="Constant">6</span>:number + <span class="Constant">6</span>:num<span class="Special"> <- </span>hash <span class="Constant">4</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">6</span>:num + <span class="Constant">7</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">3</span>:num<span class="Delimiter">,</span> <span class="Constant">6</span>:num ] <span class="Comment"># hashes match even though y is different</span> <span class="traceContains">+mem: storing 1 in location 7</span> @@ -222,8 +222,8 @@ def main [ <span class="Delimiter">:(scenario hash_of_zero_address)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>hash <span class="Constant">1</span>:address:number + <span class="Constant">1</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>hash <span class="Constant">1</span>:&:num ] <span class="traceContains">+mem: storing 0 in location 2</span> @@ -231,116 +231,116 @@ def main [ <span class="Comment">//: on the precise bit pattern of a floating-point number.</span> <span class="Delimiter">:(scenario hash_of_numbers_ignores_fractional_part)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>hash <span class="Constant">1.5</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>hash <span class="Constant">1</span> - <span class="Constant">3</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">2</span>:number + <span class="Constant">1</span>:num<span class="Special"> <- </span>hash <span class="Constant">1.5</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>hash <span class="Constant">1</span> + <span class="Constant">3</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">2</span>:num ] <span class="traceContains">+mem: storing 1 in location 3</span> <span class="Delimiter">:(scenario hash_of_array_same_as_string)</span> def main [ - <span class="Constant">10</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">97</span> - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">98</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">99</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>hash <span class="Constant">10</span>:array:number/unsafe - <span class="Identifier">return</span>-unless <span class="Constant">2</span>:number - <span class="Constant">3</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] - <span class="Constant">4</span>:number<span class="Special"> <- </span>hash <span class="Constant">3</span>:address:array:character - <span class="Identifier">return</span>-unless <span class="Constant">4</span>:number - <span class="Constant">5</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">4</span>:number + <span class="Constant">10</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">97</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">98</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">99</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>hash <span class="Constant">10</span>:@:num/unsafe + <span class="Identifier">return</span>-unless <span class="Constant">2</span>:num + <span class="Constant">3</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] + <span class="Constant">4</span>:num<span class="Special"> <- </span>hash <span class="Constant">3</span>:text + <span class="Identifier">return</span>-unless <span class="Constant">4</span>:num + <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">4</span>:num ] <span class="traceContains">+mem: storing 1 in location 5</span> <span class="Delimiter">:(scenario hash_ignores_address_value)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - *<span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>hash <span class="Constant">1</span>:address:number - <span class="Constant">3</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - *<span class="Constant">3</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>hash <span class="Constant">3</span>:address:number - <span class="Constant">5</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">4</span>:number + <span class="Constant">1</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + *<span class="Constant">1</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>hash <span class="Constant">1</span>:&:num + <span class="Constant">3</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + *<span class="Constant">3</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>hash <span class="Constant">3</span>:&:num + <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">4</span>:num ] <span class="Comment"># different addresses hash to the same result as long as the values the point to do so</span> <span class="traceContains">+mem: storing 1 in location 5</span> <span class="Delimiter">:(scenario hash_ignores_address_refcount)</span> def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - *<span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>hash <span class="Constant">1</span>:address:number - <span class="Identifier">return</span>-unless <span class="Constant">2</span>:number + <span class="Constant">1</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + *<span class="Constant">1</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>hash <span class="Constant">1</span>:&:num + <span class="Identifier">return</span>-unless <span class="Constant">2</span>:num <span class="Comment"># increment refcount</span> - <span class="Constant">3</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:address:number - <span class="Constant">4</span>:number<span class="Special"> <- </span>hash <span class="Constant">3</span>:address:number - <span class="Identifier">return</span>-unless <span class="Constant">4</span>:number - <span class="Constant">5</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">4</span>:number + <span class="Constant">3</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:&:num + <span class="Constant">4</span>:num<span class="Special"> <- </span>hash <span class="Constant">3</span>:&:num + <span class="Identifier">return</span>-unless <span class="Constant">4</span>:num + <span class="Constant">5</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">4</span>:num ] <span class="Comment"># hash doesn't change when refcount changes</span> <span class="traceContains">+mem: storing 1 in location 5</span> <span class="Delimiter">:(scenario hash_container_depends_only_on_elements)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:character + <span class="Normal">x</span>:num + <span class="Normal">y</span>:<span class="Normal">char</span> ] container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:character + <span class="Normal">x</span>:num + <span class="Normal">y</span>:<span class="Normal">char</span> ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">97</span>/a - <span class="Constant">3</span>:number<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">3</span>:number + <span class="Constant">3</span>:num<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">3</span>:num <span class="Constant">4</span>:bar<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">97</span>/a - <span class="Constant">6</span>:number<span class="Special"> <- </span>hash <span class="Constant">4</span>:bar - <span class="Identifier">return</span>-unless <span class="Constant">6</span>:number - <span class="Constant">7</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">3</span>:number<span class="Delimiter">,</span> <span class="Constant">6</span>:number + <span class="Constant">6</span>:num<span class="Special"> <- </span>hash <span class="Constant">4</span>:bar + <span class="Identifier">return</span>-unless <span class="Constant">6</span>:num + <span class="Constant">7</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">3</span>:num<span class="Delimiter">,</span> <span class="Constant">6</span>:num ] <span class="Comment"># containers with identical elements return identical hashes</span> <span class="traceContains">+mem: storing 1 in location 7</span> <span class="Delimiter">:(scenario hash_container_depends_only_on_elements_2)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:character - <span class="Normal">z</span>:address:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:<span class="Normal">char</span> + <span class="Normal">z</span>:&:num ] def main [ - <span class="Constant">1</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - *<span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">97</span>/a<span class="Delimiter">,</span> <span class="Constant">1</span>:address:number - <span class="Constant">5</span>:number<span class="Special"> <- </span>hash <span class="Constant">2</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">5</span>:number - <span class="Constant">6</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type - *<span class="Constant">6</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">7</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">97</span>/a<span class="Delimiter">,</span> <span class="Constant">6</span>:address:number - <span class="Constant">10</span>:number<span class="Special"> <- </span>hash <span class="Constant">7</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">10</span>:number - <span class="Constant">11</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">5</span>:number<span class="Delimiter">,</span> <span class="Constant">10</span>:number + <span class="Constant">1</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + *<span class="Constant">1</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">97</span>/a<span class="Delimiter">,</span> <span class="Constant">1</span>:&:num + <span class="Constant">5</span>:num<span class="Special"> <- </span>hash <span class="Constant">2</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">5</span>:num + <span class="Constant">6</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type + *<span class="Constant">6</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">7</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">97</span>/a<span class="Delimiter">,</span> <span class="Constant">6</span>:&:num + <span class="Constant">10</span>:num<span class="Special"> <- </span>hash <span class="Constant">7</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">10</span>:num + <span class="Constant">11</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">5</span>:num<span class="Delimiter">,</span> <span class="Constant">10</span>:num ] <span class="Comment"># containers with identical 'leaf' elements return identical hashes</span> <span class="traceContains">+mem: storing 1 in location 11</span> <span class="Delimiter">:(scenario hash_container_depends_only_on_elements_3)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:character + <span class="Normal">x</span>:num + <span class="Normal">y</span>:<span class="Normal">char</span> <span class="Normal">z</span>:bar ] container bar [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">97</span>/a<span class="Delimiter">,</span> <span class="Constant">47</span><span class="Delimiter">,</span> <span class="Constant">48</span> - <span class="Constant">6</span>:number<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">6</span>:number + <span class="Constant">6</span>:num<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">6</span>:num <span class="Constant">7</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">97</span>/a<span class="Delimiter">,</span> <span class="Constant">47</span><span class="Delimiter">,</span> <span class="Constant">48</span> - <span class="Constant">12</span>:number<span class="Special"> <- </span>hash <span class="Constant">7</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">12</span>:number - <span class="Constant">13</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">6</span>:number<span class="Delimiter">,</span> <span class="Constant">12</span>:number + <span class="Constant">12</span>:num<span class="Special"> <- </span>hash <span class="Constant">7</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">12</span>:num + <span class="Constant">13</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">6</span>:num<span class="Delimiter">,</span> <span class="Constant">12</span>:num ] <span class="Comment"># containers with identical 'leaf' elements return identical hashes</span> <span class="traceContains">+mem: storing 1 in location 13</span> @@ -348,20 +348,20 @@ def main [ <span class="Delimiter">:(scenario hash_exclusive_container_ignores_tag)</span> exclusive-container foo [ <span class="Normal">x</span>:bar - <span class="Normal">y</span>:number + <span class="Normal">y</span>:num ] container bar [ - <span class="Normal">a</span>:number - <span class="Normal">b</span>:number + <span class="Normal">a</span>:num + <span class="Normal">b</span>:num ] def main [ <span class="Constant">1</span>:foo<span class="Special"> <- </span>merge <span class="Constant">0</span>/x<span class="Delimiter">,</span> <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo - <span class="Identifier">return</span>-unless <span class="Constant">4</span>:number + <span class="Constant">4</span>:num<span class="Special"> <- </span>hash <span class="Constant">1</span>:foo + <span class="Identifier">return</span>-unless <span class="Constant">4</span>:num <span class="Constant">5</span>:bar<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> - <span class="Constant">7</span>:number<span class="Special"> <- </span>hash <span class="Constant">5</span>:bar - <span class="Identifier">return</span>-unless <span class="Constant">7</span>:number - <span class="Constant">8</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">4</span>:number<span class="Delimiter">,</span> <span class="Constant">7</span>:number + <span class="Constant">7</span>:num<span class="Special"> <- </span>hash <span class="Constant">5</span>:bar + <span class="Identifier">return</span>-unless <span class="Constant">7</span>:num + <span class="Constant">8</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">4</span>:num<span class="Delimiter">,</span> <span class="Constant">7</span>:num ] <span class="Comment"># hash on containers includes all elements</span> <span class="traceContains">+mem: storing 1 in location 8</span> @@ -372,10 +372,10 @@ def main [ <span class="Delimiter">:(scenario hash_matches_old_version)</span> def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [abc] - <span class="Constant">2</span>:number<span class="Special"> <- </span>hash <span class="Constant">1</span>:address:array:character - <span class="Constant">3</span>:number<span class="Special"> <- </span>hash_old <span class="Constant">1</span>:address:array:character - <span class="Constant">4</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">3</span>:number + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [abc] + <span class="Constant">2</span>:num<span class="Special"> <- </span>hash <span class="Constant">1</span>:text + <span class="Constant">3</span>:num<span class="Special"> <- </span>hash_old <span class="Constant">1</span>:text + <span class="Constant">4</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">3</span>:num ] <span class="traceContains">+mem: storing 1 in location 4</span> @@ -389,15 +389,15 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'hash_old' takes exactly one ingredient rather than '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> - raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'hash_old' currently only supports strings (address:array:character), but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'hash_old' currently only supports texts (address array character), but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> <span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span class="Normal">case</span> HASH_OLD: <span class="Delimiter">{</span> - string input = read_mu_string<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> + string input = read_mu_text<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> <span class="Normal">size_t</span> h = <span class="Constant">0</span> <span class="Delimiter">;</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 < SIZE<span class="Delimiter">(</span>input<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> diff --git a/html/070table.mu.html b/html/070table.mu.html index 6292dd74..af164bcd 100644 --- a/html/070table.mu.html +++ b/html/070table.mu.html @@ -38,9 +38,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> table-read-write [ run [ <span class="Constant">local-scope</span> - tab:address:table:number:number<span class="Special"> <- </span>new-table <span class="Constant">30</span> + tab:&:table:num:num<span class="Special"> <- </span>new-table <span class="Constant">30</span> put-index tab, <span class="Constant">12</span>, <span class="Constant">34</span> - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>index tab, <span class="Constant">12</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>index tab, <span class="Constant">12</span> ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">34</span> @@ -53,7 +53,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color key:text<span class="Special"> <- </span>new <span class="Constant">[abc def]</span> <span class="Delimiter">{</span>tab: (address table text number)<span class="Delimiter">}</span><span class="Special"> <- </span>new-table <span class="Constant">30</span> put-index tab, key, <span class="Constant">34</span> - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>index tab, key + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>index tab, key ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">34</span> @@ -61,61 +61,61 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muData">container</span> table:_key:_value [ - length:number - capacity:number - data:address:array:table_row:_key:_value + length:num + capacity:num + data:&:@:table_row:_key:_value ] <span class="muData">container</span> table_row:_key:_value [ - occupied?:boolean + occupied?:bool key:_key value:_value ] -<span class="muRecipe">def</span> new-table capacity:number<span class="muRecipe"> -> </span>result:address:table:_key:_value [ +<span class="muRecipe">def</span> new-table capacity:num<span class="muRecipe"> -> </span>result:&:table:_key:_value [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> result<span class="Special"> <- </span>new <span class="Delimiter">{</span>(table _key _value): type<span class="Delimiter">}</span> - data:address:array:table_row:_key:_value<span class="Special"> <- </span>new <span class="Delimiter">{</span>(table_row _key _value): type<span class="Delimiter">}</span>, capacity + data:&:@:table_row:_key:_value<span class="Special"> <- </span>new <span class="Delimiter">{</span>(table_row _key _value): type<span class="Delimiter">}</span>, capacity *result<span class="Special"> <- </span>merge <span class="Constant">0/length</span>, capacity, data ] -<span class="muRecipe">def</span> put-index table:address:table:_key:_value, key:_key, value:_value<span class="muRecipe"> -> </span>table:address:table:_key:_value [ +<span class="muRecipe">def</span> put-index table:&:table:_key:_value, key:_key, value:_value<span class="muRecipe"> -> </span>table:&:table:_key:_value [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - hash:number<span class="Special"> <- </span>hash key + hash:num<span class="Special"> <- </span>hash key hash<span class="Special"> <- </span>abs hash - capacity:number<span class="Special"> <- </span>get *table, <span class="Constant">capacity:offset</span> + capacity:num<span class="Special"> <- </span>get *table, <span class="Constant">capacity:offset</span> _, hash<span class="Special"> <- </span>divide-with-remainder hash, capacity hash<span class="Special"> <- </span>abs hash <span class="Comment"># in case hash overflows into a negative integer</span> - table-data:address:array:table_row:_key:_value<span class="Special"> <- </span>get *table, <span class="Constant">data:offset</span> + table-data:&:@:table_row:_key:_value<span class="Special"> <- </span>get *table, <span class="Constant">data:offset</span> x:table_row:_key:_value<span class="Special"> <- </span>index *table-data, hash - occupied?:boolean<span class="Special"> <- </span>get x, <span class="Constant">occupied?:offset</span> - not-occupied?:boolean<span class="Special"> <- </span>not occupied?:boolean + occupied?:bool<span class="Special"> <- </span>get x, <span class="Constant">occupied?:offset</span> + not-occupied?:bool<span class="Special"> <- </span>not occupied?:bool assert not-occupied?, <span class="Constant">[can't handle collisions yet]</span> new-row:table_row:_key:_value<span class="Special"> <- </span>merge <span class="Constant">1/true</span>, key, value *table-data<span class="Special"> <- </span>put-index *table-data, hash, new-row ] -<span class="muRecipe">def</span> abs n:number<span class="muRecipe"> -> </span>result:number [ +<span class="muRecipe">def</span> abs n:num<span class="muRecipe"> -> </span>result:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - positive?:boolean<span class="Special"> <- </span>greater-or-equal n, <span class="Constant">0</span> + positive?:bool<span class="Special"> <- </span>greater-or-equal n, <span class="Constant">0</span> <span class="muControl">return-if</span> positive?, n result<span class="Special"> <- </span>multiply n, <span class="Constant">-1</span> ] -<span class="muRecipe">def</span> index table:address:table:_key:_value, key:_key<span class="muRecipe"> -> </span>result:_value [ +<span class="muRecipe">def</span> index table:&:table:_key:_value, key:_key<span class="muRecipe"> -> </span>result:_value [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - hash:number<span class="Special"> <- </span>hash key + hash:num<span class="Special"> <- </span>hash key hash<span class="Special"> <- </span>abs hash - capacity:number<span class="Special"> <- </span>get *table, <span class="Constant">capacity:offset</span> + capacity:num<span class="Special"> <- </span>get *table, <span class="Constant">capacity:offset</span> _, hash<span class="Special"> <- </span>divide-with-remainder hash, capacity hash<span class="Special"> <- </span>abs hash <span class="Comment"># in case hash overflows into a negative integer</span> - table-data:address:array:table_row:_key:_value<span class="Special"> <- </span>get *table, <span class="Constant">data:offset</span> + table-data:&:@:table_row:_key:_value<span class="Special"> <- </span>get *table, <span class="Constant">data:offset</span> x:table_row:_key:_value<span class="Special"> <- </span>index *table-data, hash - occupied?:boolean<span class="Special"> <- </span>get x, <span class="Constant">occupied?:offset</span> + occupied?:bool<span class="Special"> <- </span>get x, <span class="Constant">occupied?:offset</span> assert occupied?, <span class="Constant">[can't handle missing elements yet]</span> result<span class="Special"> <- </span>get x, <span class="Constant">value:offset</span> ] diff --git a/html/071recipe.cc.html b/html/071recipe.cc.html index 56f55901..cb783500 100644 --- a/html/071recipe.cc.html +++ b/html/071recipe.cc.html @@ -41,9 +41,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario call_literal_recipe)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>call f<span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>call f<span class="Delimiter">,</span> <span class="Constant">34</span> ] -def f x:number <span class="Delimiter">-></span> y:number [ +def f x:num <span class="Delimiter">-></span> y:num [ local-scope load-ingredients y<span class="Special"> <- </span>copy x @@ -53,9 +53,9 @@ def f x:number <span class="Delimiter">-></span> y:number [ <span class="Delimiter">:(scenario call_variable)</span> def main [ <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe number <span class="Delimiter">-></span> number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f - <span class="Constant">2</span>:number<span class="Special"> <- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe number <span class="Delimiter">-></span> number<span class="Delimiter">)},</span> <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe number <span class="Delimiter">-></span> number<span class="Delimiter">)},</span> <span class="Constant">34</span> ] -def f x:number <span class="Delimiter">-></span> y:number [ +def f x:num <span class="Delimiter">-></span> y:num [ local-scope load-ingredients y<span class="Special"> <- </span>copy x @@ -115,11 +115,11 @@ get_or_insert<span class="Delimiter">(</span>Type<span class="Delimiter">,</span <span class="Special">% Hide_errors = true;</span> def main [ local-scope - <span class="Normal">a</span>:boolean<span class="Special"> <- </span>equal <span class="Identifier">break</span> <span class="Constant">0</span> - <span class="Normal">break</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Normal">a</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Identifier">break</span> <span class="Constant">0</span> + <span class="Normal">break</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+error: main: you can't use 'break' as a recipe literal when it's also a variable</span> -<span class="traceContains">+error: main: missing type for 'break' in 'a:boolean <- equal break, 0'</span> +<span class="traceContains">+error: main: missing type for 'break' in 'a:bool <- equal break, 0'</span> <span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> CALL<span class="Delimiter">,</span> @@ -161,29 +161,29 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario call_check_literal_recipe)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>call f<span class="Delimiter">,</span> <span class="Constant">34</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>call f<span class="Delimiter">,</span> <span class="Constant">34</span> ] def f x:point <span class="Delimiter">-></span> y:point [ local-scope load-ingredients y<span class="Special"> <- </span>copy x ] -<span class="traceContains">+error: main: ingredient 0 has the wrong type at '1:number <- call f, 34'</span> -<span class="traceContains">+error: main: product 0 has the wrong type at '1:number <- call f, 34'</span> +<span class="traceContains">+error: main: ingredient 0 has the wrong type at '1:num <- call f, 34'</span> +<span class="traceContains">+error: main: product 0 has the wrong type at '1:num <- call f, 34'</span> <span class="Delimiter">:(scenario call_check_variable_recipe)</span> <span class="Special">% Hide_errors = true;</span> def main [ <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe point <span class="Delimiter">-></span> point<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f - <span class="Constant">2</span>:number<span class="Special"> <- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe point <span class="Delimiter">-></span> point<span class="Delimiter">)},</span> <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe point <span class="Delimiter">-></span> point<span class="Delimiter">)},</span> <span class="Constant">34</span> ] def f x:point <span class="Delimiter">-></span> y:point [ local-scope load-ingredients y<span class="Special"> <- </span>copy x ] -<span class="traceContains">+error: main: ingredient 0 has the wrong type at '2:number <- call {1: (recipe point -> point)}, 34'</span> -<span class="traceContains">+error: main: product 0 has the wrong type at '2:number <- call {1: (recipe point -> point)}, 34'</span> +<span class="traceContains">+error: main: ingredient 0 has the wrong type at '2:num <- call {1: (recipe point -> point)}, 34'</span> +<span class="traceContains">+error: main: product 0 has the wrong type at '2:num <- call {1: (recipe point -> point)}, 34'</span> <span class="Delimiter">:(after "Transform.push_back(check_instruction)")</span> Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>check_indirect_calls_against_header<span class="Delimiter">);</span> <span class="Comment">// idempotent</span> @@ -290,11 +290,11 @@ reagent next_recipe_reagent<span class="Delimiter">(</span><span class="Normal"> <span class="Delimiter">:(scenario copy_typecheck_recipe_variable)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># abc def</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># abc def</span> <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe number <span class="Delimiter">-></span> number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f <span class="Comment"># store literal in a matching variable</span> <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span>recipe boolean <span class="Delimiter">-></span> boolean<span class="Delimiter">)}</span><span class="Special"> <- </span>copy <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe number <span class="Delimiter">-></span> number<span class="Delimiter">)}</span> <span class="Comment"># mismatch between recipe variables</span> ] -def f x:number <span class="Delimiter">-></span> y:number [ +def f x:num <span class="Delimiter">-></span> y:num [ local-scope load-ingredients y<span class="Special"> <- </span>copy x @@ -306,7 +306,7 @@ def f x:number <span class="Delimiter">-></span> y:number [ def main [ <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe number <span class="Delimiter">-></span> number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f <span class="Comment"># mismatch with a recipe literal</span> ] -def f x:boolean <span class="Delimiter">-></span> y:boolean [ +def f x:<span class="Normal">bool</span> <span class="Delimiter">-></span> y:<span class="Normal">bool</span> [ local-scope load-ingredients y<span class="Special"> <- </span>copy x @@ -335,10 +335,10 @@ def f x:boolean <span class="Delimiter">-></span> y:boolean [ <span class="Delimiter">:(scenario call_variable_compound_ingredient)</span> def main [ <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Delimiter">-></span> number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f - <span class="Constant">2</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Delimiter">-></span> number<span class="Delimiter">)},</span> <span class="Constant">2</span>:address:number + <span class="Constant">2</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>recipe <span class="Delimiter">(</span>address number<span class="Delimiter">)</span> <span class="Delimiter">-></span> number<span class="Delimiter">)},</span> <span class="Constant">2</span>:&:num ] -def f x:address:number <span class="Delimiter">-></span> y:number [ +def f x:&:num <span class="Delimiter">-></span> y:num [ local-scope load-ingredients y<span class="Special"> <- </span>copy x diff --git a/html/072scheduler.cc.html b/html/072scheduler.cc.html index 4af95f06..1d2681fa 100644 --- a/html/072scheduler.cc.html +++ b/html/072scheduler.cc.html @@ -43,11 +43,11 @@ def f1 [ start-running f2 <span class="Comment"># wait for f2 to run</span> <span class="Delimiter">{</span> - jump-unless <span class="Constant">1</span>:number<span class="Delimiter">,</span> -<span class="Constant">1</span> + jump-unless <span class="Constant">1</span>:num<span class="Delimiter">,</span> -<span class="Constant">1</span> <span class="Delimiter">}</span> ] def f2 [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> ] <span class="traceContains">+schedule: f1</span> <span class="traceContains">+schedule: f2</span> @@ -169,7 +169,7 @@ Current_routine = <span class="Constant">NULL</span><span class="Delimiter">;</s Current_routine = main_routine<span class="Delimiter">;</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">1</span><span class="Delimiter">;</span> i < argc<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> vector<<span class="Normal">double</span>> arg<span class="Delimiter">;</span> - arg<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>new_mu_string<span class="Delimiter">(</span>argv[i]<span class="Delimiter">));</span> + arg<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>new_mu_text<span class="Delimiter">(</span>argv[i]<span class="Delimiter">));</span> current_call<span class="Delimiter">().</span>ingredient_atoms<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>arg<span class="Delimiter">);</span> <span class="Delimiter">}</span> run<span class="Delimiter">(</span>main_routine<span class="Delimiter">);</span> @@ -233,8 +233,8 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario scheduler_runs_single_routine)</span> <span class="Special">% Scheduling_interval = 1;</span> def f1 [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+schedule: f1</span> <span class="traceContains">+run: {1: "number"} <- copy {0: "literal"}</span> @@ -245,12 +245,12 @@ def f1 [ <span class="Special">% Scheduling_interval = 1;</span> def f1 [ start-running f2 - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] def f2 [ - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+schedule: f1</span> <span class="traceContains">+run: start-running {f2: "recipe-literal"}</span> @@ -268,12 +268,12 @@ def f1 [ start-running f2<span class="Delimiter">,</span> <span class="Constant">3</span> <span class="Comment"># wait for f2 to run</span> <span class="Delimiter">{</span> - jump-unless <span class="Constant">1</span>:number<span class="Delimiter">,</span> -<span class="Constant">1</span> + jump-unless <span class="Constant">1</span>:num<span class="Delimiter">,</span> -<span class="Constant">1</span> <span class="Delimiter">}</span> ] def f2 [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>next-ingredient - <span class="Constant">2</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>next-ingredient + <span class="Constant">2</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 4 in location 2</span> @@ -285,20 +285,20 @@ def main [ local-scope create-<span class="Normal">new</span>-routine <span class="Comment"># padding to make sure we run new-routine before returning</span> - <span class="Normal">dummy</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Normal">dummy</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Normal">dummy</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Normal">dummy</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] def create-<span class="Normal">new</span>-routine [ local-scope - <span class="Normal">n</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">n</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type *n<span class="Special"> <- </span>copy <span class="Constant">34</span> start-running <span class="Normal">new</span>-routine<span class="Delimiter">,</span> n <span class="Comment"># refcount of n decremented</span> ] -def <span class="Normal">new</span>-routine n:address:number [ +def <span class="Normal">new</span>-routine n:&:num [ local-scope load-ingredients - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>copy *n + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>copy *n ] <span class="Comment"># check that n wasn't reclaimed when create-new-routine returned</span> <span class="traceContains">+mem: storing 34 in location 1</span> @@ -318,25 +318,25 @@ increment_any_refcounts<span class="Delimiter">(</span>ingredient<span class="De <span class="Delimiter">}</span> <span class="Delimiter">:(scenario next_ingredient_never_leaks_refcounts)</span> -def create-scope n:address:number <span class="Delimiter">-></span> <span class="Normal">default</span>-space:address:array:location [ +def create-space n:&:num <span class="Delimiter">-></span> <span class="Normal">default</span>-space:space [ <span class="Normal">default</span>-space<span class="Special"> <- </span><span class="Normal">new</span> location:type<span class="Delimiter">,</span> <span class="Constant">2</span> load-ingredients ] -def use-scope [ +def use-space [ local-scope - <span class="Constant">0</span>:address:array:location/names:create-scope<span class="Special"> <- </span>next-ingredient - <span class="Normal">n</span>:address:number/space:<span class="Constant">1</span><span class="Special"> <- </span>next-ingredient <span class="Comment"># should decrement refcount</span> + <span class="Constant">0</span>:space/names:create-space<span class="Special"> <- </span>next-ingredient + <span class="Normal">n</span>:&:num/space:<span class="Constant">1</span><span class="Special"> <- </span>next-ingredient <span class="Comment"># should decrement refcount</span> *n/space:<span class="Constant">1</span><span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Normal">n2</span>:number<span class="Special"> <- </span>add *n/space:<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Normal">n2</span>:num<span class="Special"> <- </span>add *n/space:<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">1</span> reply n2 ] def main [ local-scope - <span class="Normal">n</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">12000</span>/unsafe <span class="Comment"># pretend allocation with a known address</span> + <span class="Normal">n</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">12000</span>/unsafe <span class="Comment"># pretend allocation with a known address</span> *n<span class="Special"> <- </span>copy <span class="Constant">23</span> - <span class="Normal">scope</span>:address:array:location<span class="Special"> <- </span>create-scope n - <span class="Normal">n2</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">13000</span>/unsafe - <span class="Normal">n3</span>:number<span class="Special"> <- </span>use-scope scope<span class="Delimiter">,</span> n2 + <span class="Normal">space</span>:space<span class="Special"> <- </span>create-space n + <span class="Normal">n2</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">13000</span>/unsafe + <span class="Normal">n3</span>:num<span class="Special"> <- </span>use-space space<span class="Delimiter">,</span> n2 ] <span class="traceContains">+run: {n: ("address" "number"), "space": "1"} <- next-ingredient</span> <span class="traceContains">+mem: decrementing refcount of 12000: 2 -> 1</span> @@ -346,24 +346,24 @@ def main [ <span class="Delimiter">:(scenario start_running_returns_routine_id)</span> def f1 [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>start-running f2 + <span class="Constant">1</span>:num<span class="Special"> <- </span>start-running f2 ] def f2 [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">44</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">44</span> ] <span class="traceContains">+mem: storing 2 in location 1</span> <span class="Comment">//: this scenario will require some careful setup in escaped C++</span> <span class="Comment">//: (straining our tangle capabilities to near-breaking point)</span> <span class="Delimiter">:(scenario scheduler_skips_completed_routines)</span> -<span class="Special">% recipe_ordinal f1 = load("recipe f1 [\n1:number <- copy 0\n]\n").front();</span> -<span class="Special">% recipe_ordinal f2 = load("recipe f2 [\n2:number <- copy 0\n]\n").front();</span> +<span class="Special">% recipe_ordinal f1 = load("recipe f1 [\n1:num <- copy 0\n]\n").front();</span> +<span class="Special">% recipe_ordinal f2 = load("recipe f2 [\n2:num <- copy 0\n]\n").front();</span> <span class="Special">% Routines.push_back(new routine(f1)); // f1 meant to run</span> <span class="Special">% Routines.push_back(new routine(f2));</span> <span class="Special">% Routines.back()->state = COMPLETED; // f2 not meant to run</span> <span class="Comment"># must have at least one routine without escaping</span> def f3 [ - <span class="Constant">3</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="Comment"># by interleaving '+' lines with '-' lines, we allow f1 and f3 to run in any order</span> <span class="traceContains">+schedule: f1</span> @@ -377,8 +377,8 @@ def f3 [ <span class="Special">% Routines.push_back(new routine(COPY));</span> <span class="Special">% Routines.back()->state = COMPLETED;</span> def f1 [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+schedule: f1</span> <span class="traceAbsent">-run: idle</span> @@ -390,17 +390,17 @@ def f1 [ <span class="Special">% Scheduling_interval = 2;</span> def f1 [ start-running f2 - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] def f2 [ <span class="Comment"># divide by 0 twice</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>divide-with-remainder <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">0</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>divide-with-remainder <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>divide-with-remainder <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">0</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>divide-with-remainder <span class="Constant">4</span><span class="Delimiter">,</span> <span class="Constant">0</span> ] <span class="Comment"># f2 should stop after first divide by 0</span> -<span class="traceContains">+error: f2: divide by zero in '3:number <- divide-with-remainder 4, 0'</span> -<span class="traceAbsent">-error: f2: divide by zero in '4:number <- divide-with-remainder 4, 0'</span> +<span class="traceContains">+error: f2: divide by zero in '3:num <- divide-with-remainder 4, 0'</span> +<span class="traceAbsent">-error: f2: divide by zero in '4:num <- divide-with-remainder 4, 0'</span> <span class="Delimiter">:(after "operator<<(ostream& os, unused end)")</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream && Trace_stream<span class="Delimiter">-></span>curr_label == <span class="Constant">"error"</span> && Current_routine<span class="Delimiter">)</span> <span class="Delimiter">{</span> @@ -415,7 +415,7 @@ def main [ <span class="Comment"># f1 never actually runs because its parent completes without waiting for it</span> ] def f1 [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceAbsent">-schedule: f1</span> @@ -443,13 +443,13 @@ def f1 [ <span class="Delimiter">:(scenario routine_state_test)</span> <span class="Special">% Scheduling_interval = 2;</span> def f1 [ - <span class="Constant">1</span>:number/child-id<span class="Special"> <- </span>start-running f2 - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># race condition since we don't care about location 12</span> + <span class="Constant">1</span>:num/child-id<span class="Special"> <- </span>start-running f2 + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># race condition since we don't care about location 12</span> <span class="Comment"># thanks to Scheduling_interval, f2's one instruction runs in between here and completes</span> - <span class="Constant">2</span>:number/state<span class="Special"> <- </span>routine-state <span class="Constant">1</span>:number/child-id + <span class="Constant">2</span>:num/state<span class="Special"> <- </span>routine-state <span class="Constant">1</span>:num/child-id ] def f2 [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># trying to run a second instruction marks routine as completed</span> ] <span class="Comment"># recipe f2 should be in state COMPLETED</span> @@ -537,12 +537,12 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario routine_discontinues_past_limit)</span> <span class="Special">% Scheduling_interval = 2;</span> def f1 [ - <span class="Constant">1</span>:number/child-id<span class="Special"> <- </span>start-running f2 - limit-time <span class="Constant">1</span>:number/child-id<span class="Delimiter">,</span> <span class="Constant">10</span> + <span class="Constant">1</span>:num/child-id<span class="Special"> <- </span>start-running f2 + limit-time <span class="Constant">1</span>:num/child-id<span class="Delimiter">,</span> <span class="Constant">10</span> <span class="Comment"># padding loop just to make sure f2 has time to completed</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">20</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>subtract <span class="Constant">2</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> - jump-<span class="Normal">if</span> <span class="Constant">2</span>:number<span class="Delimiter">,</span> -<span class="Constant">2</span>:offset + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">20</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>subtract <span class="Constant">2</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> + jump-<span class="Normal">if</span> <span class="Constant">2</span>:num<span class="Delimiter">,</span> -<span class="Constant">2</span>:offset ] def f2 [ jump -<span class="Constant">1</span>:offset <span class="Comment"># run forever</span> @@ -661,16 +661,16 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario number_of_instructions)</span> def f1 [ - <span class="Constant">10</span>:number/child-id<span class="Special"> <- </span>start-running f2 + <span class="Constant">10</span>:num/child-id<span class="Special"> <- </span>start-running f2 <span class="Delimiter">{</span> - loop-unless <span class="Constant">20</span>:number + loop-unless <span class="Constant">20</span>:num <span class="Delimiter">}</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>number-of-instructions <span class="Constant">10</span>:number + <span class="Constant">11</span>:num<span class="Special"> <- </span>number-of-instructions <span class="Constant">10</span>:num ] def f2 [ <span class="Comment"># 2 instructions worth of work</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">20</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">20</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> ] <span class="Comment"># f2 runs an extra instruction for the implicit return added by the</span> <span class="Comment"># fill_in_reply_ingredients transform</span> @@ -679,18 +679,18 @@ def f2 [ <span class="Delimiter">:(scenario number_of_instructions_across_multiple_scheduling_intervals)</span> <span class="Special">% Scheduling_interval = 1;</span> def f1 [ - <span class="Constant">10</span>:number/child-id<span class="Special"> <- </span>start-running f2 + <span class="Constant">10</span>:num/child-id<span class="Special"> <- </span>start-running f2 <span class="Delimiter">{</span> - loop-unless <span class="Constant">20</span>:number + loop-unless <span class="Constant">20</span>:num <span class="Delimiter">}</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>number-of-instructions <span class="Constant">10</span>:number + <span class="Constant">11</span>:num<span class="Special"> <- </span>number-of-instructions <span class="Constant">10</span>:num ] def f2 [ <span class="Comment"># 4 instructions worth of work</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">2</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> - <span class="Constant">20</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">2</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Constant">20</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> ] <span class="Comment"># f2 runs an extra instruction for the implicit return added by the</span> <span class="Comment"># fill_in_reply_ingredients transform</span> @@ -701,18 +701,18 @@ def f2 [ <span class="Delimiter">:(scenario new_concurrent)</span> def f1 [ start-running f2 - <span class="Constant">1</span>:address:number/<span class="Special">raw <- </span><span class="Normal">new</span> number:type + <span class="Constant">1</span>:&:num/<span class="Special">raw <- </span><span class="Normal">new</span> number:type <span class="Comment"># wait for f2 to complete</span> <span class="Delimiter">{</span> - loop-unless <span class="Constant">4</span>:number/<span class="Special">raw</span> + loop-unless <span class="Constant">4</span>:num/<span class="Special">raw</span> <span class="Delimiter">}</span> ] def f2 [ - <span class="Constant">2</span>:address:number/<span class="Special">raw <- </span><span class="Normal">new</span> number:type + <span class="Constant">2</span>:&:num/<span class="Special">raw <- </span><span class="Normal">new</span> number:type <span class="Comment"># hack: assumes scheduler implementation</span> - <span class="Constant">3</span>:boolean/<span class="Special">raw <- </span>equal <span class="Constant">1</span>:address:number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:address:number/<span class="Special">raw</span> + <span class="Constant">3</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal <span class="Constant">1</span>:&:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:&:num/<span class="Special">raw</span> <span class="Comment"># signal f2 complete</span> - <span class="Constant">4</span>:number/<span class="Special">raw <- </span>copy <span class="Constant">1</span> + <span class="Constant">4</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">1</span> ] <span class="traceContains">+mem: storing 0 in location 3</span> </pre> diff --git a/html/073wait.cc.html b/html/073wait.cc.html index b99b8cc5..74c5ce2f 100644 --- a/html/073wait.cc.html +++ b/html/073wait.cc.html @@ -41,12 +41,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario wait_for_location)</span> def f1 [ - <span class="Constant">10</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> start-running f2 <span class="Constant">20</span>:location<span class="Special"> <- </span>copy <span class="Constant">10</span>/unsafe wait-<span class="Normal">for</span>-reset-then-set <span class="Constant">20</span>:location <span class="Comment"># wait for f2 to run and reset location 1</span> - <span class="Constant">30</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span>:number + <span class="Constant">30</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span>:num ] def f2 [ <span class="Constant">10</span>:location<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe @@ -176,8 +176,8 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario get_location)</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> <span class="Constant">15</span>:location<span class="Special"> <- </span>get-location <span class="Constant">12</span>:point<span class="Delimiter">,</span> <span class="Constant">1</span>:offset ] <span class="traceContains">+mem: storing 13 in location 15</span> @@ -259,9 +259,9 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario get_location_out_of_bounds)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> get-location <span class="Constant">12</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">2</span>:offset <span class="Comment"># point-number occupies 3 locations but has only 2 fields; out of bounds</span> ] <span class="traceContains">+error: main: invalid offset 2 for 'point-number'</span> @@ -269,9 +269,9 @@ def main [ <span class="Delimiter">:(scenario get_location_out_of_bounds_2)</span> <span class="Special">% Hide_errors = true;</span> def main [ - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">14</span>:number<span class="Special"> <- </span>copy <span class="Constant">36</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">14</span>:num<span class="Special"> <- </span>copy <span class="Constant">36</span> get-location <span class="Constant">12</span>:point-number/<span class="Special">raw</span><span class="Delimiter">,</span> -<span class="Constant">1</span>:offset ] <span class="traceContains">+error: main: invalid offset -1 for 'point-number'</span> @@ -279,35 +279,35 @@ def main [ <span class="Delimiter">:(scenario get_location_product_type_mismatch)</span> <span class="Special">% Hide_errors = true;</span> container boolbool [ - <span class="Normal">x</span>:boolean - <span class="Normal">y</span>:boolean + <span class="Normal">x</span>:<span class="Normal">bool</span> + <span class="Normal">y</span>:<span class="Normal">bool</span> ] def main [ - <span class="Constant">12</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">13</span>:boolean<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">15</span>:boolean<span class="Special"> <- </span>get-location <span class="Constant">12</span>:boolbool<span class="Delimiter">,</span> <span class="Constant">1</span>:offset + <span class="Constant">12</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">13</span>:<span class="Normal">bool</span><span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">15</span>:<span class="Normal">bool</span><span class="Special"> <- </span>get-location <span class="Constant">12</span>:boolbool<span class="Delimiter">,</span> <span class="Constant">1</span>:offset ] <span class="traceContains">+error: main: 'get-location 12:boolbool, 1:offset' should write to type location but '15' has type 'boolean'</span> <span class="Delimiter">:(scenario get_location_indirect)</span> <span class="Comment"># 'get-location' can read from container address</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">4</span>:location<span class="Special"> <- </span>get-location <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0</span>:offset + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">4</span>:location<span class="Special"> <- </span>get-location <span class="Constant">1</span>:&:point/lookup<span class="Delimiter">,</span> <span class="Constant">0</span>:offset ] <span class="traceContains">+mem: storing 11 in location 4</span> <span class="Delimiter">:(scenario get_location_indirect_2)</span> def main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span> <span class="Comment"># 10 reserved for refcount</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">35</span> - <span class="Constant">4</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe - <span class="Constant">4</span>:address:location/lookup<span class="Special"> <- </span>get-location <span class="Constant">1</span>:address:point/lookup<span class="Delimiter">,</span> <span class="Constant">0</span>:offset + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">35</span> + <span class="Constant">4</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">20</span>/unsafe + <span class="Constant">4</span>:&:location/lookup<span class="Special"> <- </span>get-location <span class="Constant">1</span>:&:point/lookup<span class="Delimiter">,</span> <span class="Constant">0</span>:offset ] <span class="traceContains">+mem: storing 11 in location 21</span> @@ -316,21 +316,21 @@ def main [ <span class="Delimiter">:(scenario wait_for_routine)</span> def f1 [ <span class="Comment"># add a few routines to run</span> - <span class="Constant">1</span>:number/routine<span class="Special"> <- </span>start-running f2 - <span class="Constant">2</span>:number/routine<span class="Special"> <- </span>start-running f3 - wait-<span class="Normal">for</span>-routine <span class="Constant">1</span>:number/routine + <span class="Constant">1</span>:num/routine<span class="Special"> <- </span>start-running f2 + <span class="Constant">2</span>:num/routine<span class="Special"> <- </span>start-running f3 + wait-<span class="Normal">for</span>-routine <span class="Constant">1</span>:num/routine <span class="Comment"># now wait for f2 to *complete* and modify location 13 before using its value</span> - <span class="Constant">20</span>:number<span class="Special"> <- </span>copy <span class="Constant">13</span>:number + <span class="Constant">20</span>:num<span class="Special"> <- </span>copy <span class="Constant">13</span>:num ] def f2 [ - <span class="Constant">10</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># just padding</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># just padding</span> <span class="Normal">switch</span> <span class="Comment"># simulate a block; routine f1 shouldn't restart at this point</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> ] def f3 [ <span class="Comment"># padding routine just to help simulate the block in f2 using 'switch'</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="traceContains">+schedule: f1</span> <span class="traceContains">+run: waiting for routine 2</span> @@ -459,13 +459,13 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario wait_for_routine_to_block)</span> def f1 [ - <span class="Constant">1</span>:number/routine<span class="Special"> <- </span>start-running f2 - wait-<span class="Normal">for</span>-routine-to-block <span class="Constant">1</span>:number/routine + <span class="Constant">1</span>:num/routine<span class="Special"> <- </span>start-running f2 + wait-<span class="Normal">for</span>-routine-to-block <span class="Constant">1</span>:num/routine <span class="Comment"># now wait for f2 to run and modify location 10 before using its value</span> - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">10</span>:number + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">10</span>:num ] def f2 [ - <span class="Constant">10</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">10</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> ] <span class="traceContains">+schedule: f1</span> <span class="traceContains">+run: waiting for routine 2 to block</span> @@ -598,14 +598,14 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Special">% Scheduling_interval = 1;</span> def main [ local-scope - <span class="Normal">r</span>:number/routine-id<span class="Special"> <- </span>start-running f - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># wait for f to be scheduled</span> + <span class="Normal">r</span>:num/routine-id<span class="Special"> <- </span>start-running f + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># wait for f to be scheduled</span> <span class="Comment"># r is COMPLETED by this point</span> restart r <span class="Comment"># should have no effect</span> - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># give f time to be scheduled (though it shouldn't be)</span> + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># give f time to be scheduled (though it shouldn't be)</span> ] def f [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>copy <span class="Constant">1</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">1</span> ] <span class="Comment"># shouldn't crash</span> @@ -613,7 +613,7 @@ def f [ <span class="Special">% Scheduling_interval = 1;</span> def main [ local-scope - <span class="Normal">r</span>:number/routine-id<span class="Special"> <- </span>start-running f + <span class="Normal">r</span>:num/routine-id<span class="Special"> <- </span>start-running f wait-<span class="Normal">for</span>-routine-to-block r <span class="Comment"># get past the block in f below</span> restart r wait-<span class="Normal">for</span>-routine-to-block r <span class="Comment"># should run f to completion</span> @@ -622,15 +622,15 @@ def main [ def f [ current-routine-is-blocked <span class="Comment"># 8 instructions of padding, many more than 'main' above</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> - <span class="Constant">1</span>:number<span class="Special"> <- </span>add <span class="Constant">1</span>:number<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>add <span class="Constant">1</span>:num<span class="Delimiter">,</span> <span class="Constant">1</span> ] <span class="Comment"># make sure all of f ran</span> <span class="traceContains">+mem: storing 8 in location 1</span> diff --git a/html/074deep_copy.cc.html b/html/074deep_copy.cc.html index b440083b..bd40721c 100644 --- a/html/074deep_copy.cc.html +++ b/html/074deep_copy.cc.html @@ -47,23 +47,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario deep_copy_number)</span> def main [ local-scope - <span class="Normal">x</span>:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Normal">y</span>:number<span class="Special"> <- </span>deep-copy x - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal x<span class="Delimiter">,</span> y + <span class="Normal">x</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Normal">y</span>:num<span class="Special"> <- </span>deep-copy x + <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal x<span class="Delimiter">,</span> y ] <span class="Comment"># non-address primitives are identical</span> <span class="traceContains">+mem: storing 1 in location 10</span> <span class="Delimiter">:(scenario deep_copy_container_without_address)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] def main [ local-scope <span class="Normal">a</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> <span class="Normal">b</span>:foo<span class="Special"> <- </span>deep-copy a - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal a<span class="Delimiter">,</span> b + <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal a<span class="Delimiter">,</span> b ] <span class="Comment"># containers are identical as long as they don't contain addresses</span> <span class="traceContains">+mem: storing 1 in location 10</span> @@ -73,12 +73,12 @@ def main [ def main [ <span class="Comment"># avoid all memory allocations except the implicit ones inside deep-copy, so</span> <span class="Comment"># that the result is deterministic</span> - <span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">100</span>/unsafe <span class="Comment"># pretend allocation</span> - *<span class="Constant">1</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:address:number<span class="Special"> <- </span>deep-copy <span class="Constant">1</span>:address:number - <span class="Constant">10</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:address:number<span class="Delimiter">,</span> <span class="Constant">2</span>:address:number - <span class="Constant">11</span>:boolean<span class="Special"> <- </span>equal *<span class="Constant">1</span>:address:number<span class="Delimiter">,</span> *<span class="Constant">2</span>:address:number - <span class="Constant">2</span>:address:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">100</span>/unsafe <span class="Comment"># pretend allocation</span> + *<span class="Constant">1</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:&:num<span class="Special"> <- </span>deep-copy <span class="Constant">1</span>:&:num + <span class="Constant">10</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:&:num<span class="Delimiter">,</span> <span class="Constant">2</span>:&:num + <span class="Constant">11</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal *<span class="Constant">1</span>:&:num<span class="Delimiter">,</span> *<span class="Constant">2</span>:&:num + <span class="Constant">2</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] <span class="Comment"># the result of deep-copy is a new address</span> <span class="traceContains">+mem: storing 0 in location 10</span> @@ -95,11 +95,11 @@ def main [ def main [ <span class="Comment"># avoid all memory allocations except the implicit ones inside deep-copy, so</span> <span class="Comment"># that the result is deterministic</span> - <span class="Constant">1</span>:address:point<span class="Special"> <- </span>copy <span class="Constant">100</span>/unsafe <span class="Comment"># pretend allocation</span> - *<span class="Constant">1</span>:address:point<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> - <span class="Constant">2</span>:address:point<span class="Special"> <- </span>deep-copy <span class="Constant">1</span>:address:point - <span class="Constant">10</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:address:point<span class="Delimiter">,</span> <span class="Constant">2</span>:address:point - <span class="Constant">11</span>:boolean<span class="Special"> <- </span>equal *<span class="Constant">1</span>:address:point<span class="Delimiter">,</span> *<span class="Constant">2</span>:address:point + <span class="Constant">1</span>:&:point<span class="Special"> <- </span>copy <span class="Constant">100</span>/unsafe <span class="Comment"># pretend allocation</span> + *<span class="Constant">1</span>:&:point<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> <span class="Constant">35</span> + <span class="Constant">2</span>:&:point<span class="Special"> <- </span>deep-copy <span class="Constant">1</span>:&:point + <span class="Constant">10</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:&:point<span class="Delimiter">,</span> <span class="Constant">2</span>:&:point + <span class="Constant">11</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal *<span class="Constant">1</span>:&:point<span class="Delimiter">,</span> *<span class="Constant">2</span>:&:point ] <span class="Comment"># the result of deep-copy is a new address</span> <span class="traceContains">+mem: storing 0 in location 10</span> @@ -111,13 +111,13 @@ def main [ def main [ <span class="Comment"># avoid all memory allocations except the implicit ones inside deep-copy, so</span> <span class="Comment"># that the result is deterministic</span> - <span class="Constant">1</span>:address:address:number<span class="Special"> <- </span>copy <span class="Constant">100</span>/unsafe <span class="Comment"># pretend allocation</span> - *<span class="Constant">1</span>:address:address:number<span class="Special"> <- </span>copy <span class="Constant">150</span>/unsafe - **<span class="Constant">1</span>:address:address:number<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Constant">2</span>:address:address:number<span class="Special"> <- </span>deep-copy <span class="Constant">1</span>:address:address:number - <span class="Constant">10</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:address:address:number<span class="Delimiter">,</span> <span class="Constant">2</span>:address:address:number - <span class="Constant">11</span>:boolean<span class="Special"> <- </span>equal *<span class="Constant">1</span>:address:address:number<span class="Delimiter">,</span> *<span class="Constant">2</span>:address:address:number - <span class="Constant">12</span>:boolean<span class="Special"> <- </span>equal **<span class="Constant">1</span>:address:address:number<span class="Delimiter">,</span> **<span class="Constant">2</span>:address:address:number + <span class="Constant">1</span>:&:&:num<span class="Special"> <- </span>copy <span class="Constant">100</span>/unsafe <span class="Comment"># pretend allocation</span> + *<span class="Constant">1</span>:&:&:num<span class="Special"> <- </span>copy <span class="Constant">150</span>/unsafe + **<span class="Constant">1</span>:&:&:num<span class="Special"> <- </span>copy <span class="Constant">34</span> + <span class="Constant">2</span>:&:&:num<span class="Special"> <- </span>deep-copy <span class="Constant">1</span>:&:&:num + <span class="Constant">10</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:&:&:num<span class="Delimiter">,</span> <span class="Constant">2</span>:&:&:num + <span class="Constant">11</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal *<span class="Constant">1</span>:&:&:num<span class="Delimiter">,</span> *<span class="Constant">2</span>:&:&:num + <span class="Constant">12</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal **<span class="Constant">1</span>:&:&:num<span class="Delimiter">,</span> **<span class="Constant">2</span>:&:&:num ] <span class="Comment"># the result of deep-copy is a new address</span> <span class="traceContains">+mem: storing 0 in location 10</span> @@ -131,18 +131,18 @@ def main [ def main [ <span class="Comment"># avoid all memory allocations except the implicit ones inside deep-copy, so</span> <span class="Comment"># that the result is deterministic</span> - <span class="Constant">100</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> <span class="Comment"># pretend refcount</span> - <span class="Constant">101</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> <span class="Comment"># pretend array length</span> - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span>copy <span class="Constant">100</span>/unsafe <span class="Comment"># pretend allocation</span> - put-index *<span class="Constant">1</span>:address:array:number<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">34</span> - put-index *<span class="Constant">1</span>:address:array:number<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">35</span> - put-index *<span class="Constant">1</span>:address:array:number<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">36</span> - stash [old:]<span class="Delimiter">,</span> *<span class="Constant">1</span>:address:array:number - <span class="Constant">2</span>:address:array:number<span class="Special"> <- </span>deep-copy <span class="Constant">1</span>:address:array:number - stash <span class="Constant">2</span>:address:array:number - stash [<span class="Normal">new</span>:]<span class="Delimiter">,</span> *<span class="Constant">2</span>:address:array:number - <span class="Constant">10</span>:boolean<span class="Special"> <- </span>equal <span class="Constant">1</span>:address:array:number<span class="Delimiter">,</span> <span class="Constant">2</span>:address:array:number - <span class="Constant">11</span>:boolean<span class="Special"> <- </span>equal *<span class="Constant">1</span>:address:array:number<span class="Delimiter">,</span> *<span class="Constant">2</span>:address:array:number + <span class="Constant">100</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> <span class="Comment"># pretend refcount</span> + <span class="Constant">101</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> <span class="Comment"># pretend array length</span> + <span class="Constant">1</span>:&:@:num<span class="Special"> <- </span>copy <span class="Constant">100</span>/unsafe <span class="Comment"># pretend allocation</span> + put-index *<span class="Constant">1</span>:&:@:num<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">34</span> + put-index *<span class="Constant">1</span>:&:@:num<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">35</span> + put-index *<span class="Constant">1</span>:&:@:num<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">36</span> + stash [old:]<span class="Delimiter">,</span> *<span class="Constant">1</span>:&:@:num + <span class="Constant">2</span>:&:@:num<span class="Special"> <- </span>deep-copy <span class="Constant">1</span>:&:@:num + stash <span class="Constant">2</span>:&:@:num + stash [<span class="Normal">new</span>:]<span class="Delimiter">,</span> *<span class="Constant">2</span>:&:@:num + <span class="Constant">10</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal <span class="Constant">1</span>:&:@:num<span class="Delimiter">,</span> <span class="Constant">2</span>:&:@:num + <span class="Constant">11</span>:<span class="Normal">bool</span><span class="Special"> <- </span>equal *<span class="Constant">1</span>:&:@:num<span class="Delimiter">,</span> *<span class="Constant">2</span>:&:@:num ] <span class="traceContains">+app: old: 3 34 35 36</span> <span class="traceContains">+app: new: 3 34 35 36</span> @@ -153,19 +153,19 @@ def main [ <span class="Delimiter">:(scenario deep_copy_container_with_address)</span> container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:address:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:&:num ] def main [ local-scope - <span class="Normal">y0</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">y0</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type *y0<span class="Special"> <- </span>copy <span class="Constant">35</span> <span class="Normal">a</span>:foo<span class="Special"> <- </span>merge <span class="Constant">34</span><span class="Delimiter">,</span> y0 <span class="Normal">b</span>:foo<span class="Special"> <- </span>deep-copy a - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal a<span class="Delimiter">,</span> b - <span class="Normal">y1</span>:address:number<span class="Special"> <- </span>get b<span class="Delimiter">,</span> y:offset - <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>equal y0<span class="Delimiter">,</span> y1 - <span class="Constant">12</span>:number/<span class="Special">raw <- </span>copy *y1 + <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal a<span class="Delimiter">,</span> b + <span class="Normal">y1</span>:&:num<span class="Special"> <- </span>get b<span class="Delimiter">,</span> y:offset + <span class="Constant">11</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal y0<span class="Delimiter">,</span> y1 + <span class="Constant">12</span>:num/<span class="Special">raw <- </span>copy *y1 ] <span class="Comment"># containers containing addresses are not identical to their deep copies</span> <span class="traceContains">+mem: storing 0 in location 10</span> @@ -175,19 +175,19 @@ def main [ <span class="Delimiter">:(scenario deep_copy_exclusive_container_with_address)</span> exclusive-container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:address:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:&:num ] def main [ local-scope - <span class="Normal">y0</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">y0</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type *y0<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Normal">a</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> y0 <span class="Normal">b</span>:foo<span class="Special"> <- </span>deep-copy a - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal a<span class="Delimiter">,</span> b - <span class="Normal">y1</span>:address:number<span class="Delimiter">,</span> z:boolean<span class="Special"> <- </span>maybe-convert b<span class="Delimiter">,</span> y:variant - <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>equal y0<span class="Delimiter">,</span> y1 - <span class="Constant">12</span>:number/<span class="Special">raw <- </span>copy *y1 + <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal a<span class="Delimiter">,</span> b + <span class="Normal">y1</span>:&:num<span class="Delimiter">,</span> z:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert b<span class="Delimiter">,</span> y:variant + <span class="Constant">11</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal y0<span class="Delimiter">,</span> y1 + <span class="Constant">12</span>:num/<span class="Special">raw <- </span>copy *y1 ] <span class="Comment"># exclusive containers containing addresses are not identical to their deep copies</span> <span class="traceContains">+mem: storing 0 in location 10</span> @@ -197,24 +197,24 @@ def main [ <span class="Delimiter">:(scenario deep_copy_exclusive_container_with_container_with_address)</span> exclusive-container foo [ - <span class="Normal">x</span>:number + <span class="Normal">x</span>:num <span class="Normal">y</span>:bar <span class="Comment"># inline</span> ] container bar [ - <span class="Normal">x</span>:address:number + <span class="Normal">x</span>:&:num ] def main [ local-scope - <span class="Normal">y0</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">y0</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type *y0<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Normal">a</span>:bar<span class="Special"> <- </span>merge y0 <span class="Normal">b</span>:foo<span class="Special"> <- </span>merge <span class="Constant">1</span>/y<span class="Delimiter">,</span> a <span class="Normal">c</span>:foo<span class="Special"> <- </span>deep-copy b - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal b<span class="Delimiter">,</span> c - <span class="Normal">d</span>:bar<span class="Delimiter">,</span> z:boolean<span class="Special"> <- </span>maybe-convert c<span class="Delimiter">,</span> y:variant - <span class="Normal">y1</span>:address:number<span class="Special"> <- </span>get d<span class="Delimiter">,</span> x:offset - <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>equal y0<span class="Delimiter">,</span> y1 - <span class="Constant">12</span>:number/<span class="Special">raw <- </span>copy *y1 + <span class="Constant">10</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal b<span class="Delimiter">,</span> c + <span class="Normal">d</span>:bar<span class="Delimiter">,</span> z:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert c<span class="Delimiter">,</span> y:variant + <span class="Normal">y1</span>:&:num<span class="Special"> <- </span>get d<span class="Delimiter">,</span> x:offset + <span class="Constant">11</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal y0<span class="Delimiter">,</span> y1 + <span class="Constant">12</span>:num/<span class="Special">raw <- </span>copy *y1 ] <span class="Comment"># exclusive containers containing addresses are not identical to their deep copies</span> <span class="traceContains">+mem: storing 0 in location 10</span> @@ -336,83 +336,83 @@ vector<<span class="Normal">double</span>> deep_copy<span class="Delimiter <span class="Delimiter">:(scenario deep_copy_stress_test_1)</span> container foo1 [ - <span class="Normal">p</span>:address:number + <span class="Normal">p</span>:&:num ] container foo2 [ - <span class="Normal">p</span>:address:foo1 + <span class="Normal">p</span>:&:foo1 ] exclusive-container foo3 [ - <span class="Normal">p</span>:address:foo1 - <span class="Normal">q</span>:address:foo2 + <span class="Normal">p</span>:&:foo1 + <span class="Normal">q</span>:&:foo2 ] def main [ local-scope - <span class="Normal">x</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">x</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type *x<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Normal">a</span>:address:foo1<span class="Special"> <- </span><span class="Normal">new</span> foo1:type + <span class="Normal">a</span>:&:foo1<span class="Special"> <- </span><span class="Normal">new</span> foo1:type *a<span class="Special"> <- </span>merge x - <span class="Normal">b</span>:address:foo2<span class="Special"> <- </span><span class="Normal">new</span> foo2:type + <span class="Normal">b</span>:&:foo2<span class="Special"> <- </span><span class="Normal">new</span> foo2:type *b<span class="Special"> <- </span>merge a <span class="Normal">c</span>:foo3<span class="Special"> <- </span>merge <span class="Constant">1</span>/q<span class="Delimiter">,</span> b <span class="Normal">d</span>:foo3<span class="Special"> <- </span>deep-copy c - <span class="Normal">e</span>:address:foo2<span class="Delimiter">,</span> z:boolean<span class="Special"> <- </span>maybe-convert d<span class="Delimiter">,</span> q:variant - <span class="Normal">f</span>:address:foo1<span class="Special"> <- </span>get *e<span class="Delimiter">,</span> p:offset - <span class="Normal">g</span>:address:number<span class="Special"> <- </span>get *f<span class="Delimiter">,</span> p:offset - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>copy *g + <span class="Normal">e</span>:&:foo2<span class="Delimiter">,</span> z:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert d<span class="Delimiter">,</span> q:variant + <span class="Normal">f</span>:&:foo1<span class="Special"> <- </span>get *e<span class="Delimiter">,</span> p:offset + <span class="Normal">g</span>:&:num<span class="Special"> <- </span>get *f<span class="Delimiter">,</span> p:offset + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>copy *g ] <span class="traceContains">+mem: storing 34 in location 1</span> <span class="Delimiter">:(scenario deep_copy_stress_test_2)</span> container foo1 [ - <span class="Normal">p</span>:address:number + <span class="Normal">p</span>:&:num ] container foo2 [ - <span class="Normal">p</span>:address:foo1 + <span class="Normal">p</span>:&:foo1 ] exclusive-container foo3 [ - <span class="Normal">p</span>:address:foo1 - <span class="Normal">q</span>:address:foo2 + <span class="Normal">p</span>:&:foo1 + <span class="Normal">q</span>:&:foo2 ] container foo4 [ - <span class="Normal">p</span>:number - <span class="Normal">q</span>:address:foo3 + <span class="Normal">p</span>:num + <span class="Normal">q</span>:&:foo3 ] def main [ local-scope - <span class="Normal">x</span>:address:number<span class="Special"> <- </span><span class="Normal">new</span> number:type + <span class="Normal">x</span>:&:num<span class="Special"> <- </span><span class="Normal">new</span> number:type *x<span class="Special"> <- </span>copy <span class="Constant">34</span> - <span class="Normal">a</span>:address:foo1<span class="Special"> <- </span><span class="Normal">new</span> foo1:type + <span class="Normal">a</span>:&:foo1<span class="Special"> <- </span><span class="Normal">new</span> foo1:type *a<span class="Special"> <- </span>merge x - <span class="Normal">b</span>:address:foo2<span class="Special"> <- </span><span class="Normal">new</span> foo2:type + <span class="Normal">b</span>:&:foo2<span class="Special"> <- </span><span class="Normal">new</span> foo2:type *b<span class="Special"> <- </span>merge a - <span class="Normal">c</span>:address:foo3<span class="Special"> <- </span><span class="Normal">new</span> foo3:type + <span class="Normal">c</span>:&:foo3<span class="Special"> <- </span><span class="Normal">new</span> foo3:type *c<span class="Special"> <- </span>merge <span class="Constant">1</span>/q<span class="Delimiter">,</span> b <span class="Normal">d</span>:foo4<span class="Special"> <- </span>merge <span class="Constant">35</span><span class="Delimiter">,</span> c <span class="Normal">e</span>:foo4<span class="Special"> <- </span>deep-copy d - <span class="Normal">f</span>:address:foo3<span class="Special"> <- </span>get e<span class="Delimiter">,</span> q:offset - <span class="Normal">g</span>:address:foo2<span class="Delimiter">,</span> z:boolean<span class="Special"> <- </span>maybe-convert *f<span class="Delimiter">,</span> q:variant - <span class="Normal">h</span>:address:foo1<span class="Special"> <- </span>get *g<span class="Delimiter">,</span> p:offset - <span class="Normal">y</span>:address:number<span class="Special"> <- </span>get *h<span class="Delimiter">,</span> p:offset - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>copy *y + <span class="Normal">f</span>:&:foo3<span class="Special"> <- </span>get e<span class="Delimiter">,</span> q:offset + <span class="Normal">g</span>:&:foo2<span class="Delimiter">,</span> z:<span class="Normal">bool</span><span class="Special"> <- </span>maybe-convert *f<span class="Delimiter">,</span> q:variant + <span class="Normal">h</span>:&:foo1<span class="Special"> <- </span>get *g<span class="Delimiter">,</span> p:offset + <span class="Normal">y</span>:&:num<span class="Special"> <- </span>get *h<span class="Delimiter">,</span> p:offset + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>copy *y ] <span class="traceContains">+mem: storing 34 in location 1</span> <span class="Delimiter">:(scenario deep_copy_cycles)</span> container foo [ - <span class="Normal">p</span>:number - <span class="Normal">q</span>:address:foo + <span class="Normal">p</span>:num + <span class="Normal">q</span>:&:foo ] def main [ local-scope - <span class="Normal">x</span>:address:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type + <span class="Normal">x</span>:&:foo<span class="Special"> <- </span><span class="Normal">new</span> foo:type *x<span class="Special"> <- </span>put *x<span class="Delimiter">,</span> p:offset<span class="Delimiter">,</span> <span class="Constant">34</span> *x<span class="Special"> <- </span>put *x<span class="Delimiter">,</span> q:offset<span class="Delimiter">,</span> x <span class="Comment"># create a cycle</span> - <span class="Normal">y</span>:address:foo<span class="Special"> <- </span>deep-copy x - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>get *y<span class="Delimiter">,</span> p:offset - <span class="Normal">y2</span>:address:foo<span class="Special"> <- </span>get *y<span class="Delimiter">,</span> q:offset + <span class="Normal">y</span>:&:foo<span class="Special"> <- </span>deep-copy x + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>get *y<span class="Delimiter">,</span> p:offset + <span class="Normal">y2</span>:&:foo<span class="Special"> <- </span>get *y<span class="Delimiter">,</span> q:offset stash y [vs] y2 - <span class="Constant">2</span>:boolean/<span class="Special">raw <- </span>equal y<span class="Delimiter">,</span> y2 <span class="Comment"># is it still a cycle?</span> - <span class="Constant">3</span>:boolean/<span class="Special">raw <- </span>equal x<span class="Delimiter">,</span> y <span class="Comment"># is it the same cycle?</span> + <span class="Constant">2</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal y<span class="Delimiter">,</span> y2 <span class="Comment"># is it still a cycle?</span> + <span class="Constant">3</span>:<span class="Normal">bool</span>/<span class="Special">raw <- </span>equal x<span class="Delimiter">,</span> y <span class="Comment"># is it the same cycle?</span> ] <span class="traceContains">+mem: storing 34 in location 1</span> <span class="Comment"># deep copy also contains a cycle</span> diff --git a/html/075channel.mu.html b/html/075channel.mu.html index 4912015e..a2b049a6 100644 --- a/html/075channel.mu.html +++ b/html/075channel.mu.html @@ -49,9 +49,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> channel [ run [ <span class="Constant">local-scope</span> - source:address:source:number, sink:address:sink:number<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> + source:&:source:num, sink:&:sink:num<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">34</span> - <span class="Constant">10</span>:number/<span class="Special">raw</span>, <span class="Constant">11</span>:boolean/<span class="Special">raw</span>, source<span class="Special"> <- </span>read source + <span class="Constant">10</span>:num/<span class="Special">raw</span>, <span class="Constant">11</span>:bool/<span class="Special">raw</span>, source<span class="Special"> <- </span>read source ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">34</span> @@ -60,34 +60,34 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muData">container</span> channel:_elem [ - lock:boolean <span class="Comment"># inefficient but simple: serialize all reads as well as writes</span> - first-full:number <span class="Comment"># for write</span> - first-free:number <span class="Comment"># for read</span> + lock:bool <span class="Comment"># inefficient but simple: serialize all reads as well as writes</span> + first-full:num <span class="Comment"># for write</span> + first-free:num <span class="Comment"># for read</span> <span class="Comment"># A circular buffer contains values from index first-full up to (but not</span> <span class="Comment"># including) index first-empty. The reader always modifies it at first-full,</span> <span class="Comment"># while the writer always modifies it at first-empty.</span> - data:address:array:_elem + data:&:@:_elem ] <span class="Comment"># Since channels have two ends, and since it's an error to use either end from</span> <span class="Comment"># multiple routines, let's distinguish the ends.</span> <span class="muData">container</span> source:_elem [ - chan:address:channel:_elem + chan:&:channel:_elem ] <span class="muData">container</span> sink:_elem [ - chan:address:channel:_elem + chan:&:channel:_elem ] -<span class="muRecipe">def</span> new-channel capacity:number<span class="muRecipe"> -> </span>in:address:source:_elem, out:address:sink:_elem [ +<span class="muRecipe">def</span> new-channel capacity:num<span class="muRecipe"> -> </span>in:&:source:_elem, out:&:sink:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - result:address:channel:_elem<span class="Special"> <- </span>new <span class="Delimiter">{</span>(channel _elem): type<span class="Delimiter">}</span> + result:&:channel:_elem<span class="Special"> <- </span>new <span class="Delimiter">{</span>(channel _elem): type<span class="Delimiter">}</span> *result<span class="Special"> <- </span>put *result, <span class="Constant">first-full:offset</span>, <span class="Constant">0</span> *result<span class="Special"> <- </span>put *result, <span class="Constant">first-free:offset</span>, <span class="Constant">0</span> capacity<span class="Special"> <- </span>add capacity, <span class="Constant">1</span> <span class="Comment"># unused slot for 'full?' below</span> - data:address:array:_elem<span class="Special"> <- </span>new <span class="Constant">_elem:type</span>, capacity + data:&:@:_elem<span class="Special"> <- </span>new <span class="Constant">_elem:type</span>, capacity *result<span class="Special"> <- </span>put *result, <span class="Constant">data:offset</span>, data in<span class="Special"> <- </span>new <span class="Delimiter">{</span>(source _elem): type<span class="Delimiter">}</span> *in<span class="Special"> <- </span>put *in, <span class="Constant">chan:offset</span>, result @@ -95,11 +95,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *out<span class="Special"> <- </span>put *out, <span class="Constant">chan:offset</span>, result ] -<span class="muRecipe">def</span> write out:address:sink:_elem, val:_elem<span class="muRecipe"> -> </span>out:address:sink:_elem [ +<span class="muRecipe">def</span> write out:&:sink:_elem, val:_elem<span class="muRecipe"> -> </span>out:&:sink:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> assert out, <span class="Constant">[write to null channel]</span> - chan:address:channel:_elem<span class="Special"> <- </span>get *out, <span class="Constant">chan:offset</span> + chan:&:channel:_elem<span class="Special"> <- </span>get *out, <span class="Constant">chan:offset</span> <span class="Constant"> <channel-write-initial></span> <span class="Comment"># block until lock is acquired AND queue has room</span> lock:location<span class="Special"> <- </span>get-location *chan, <span class="Constant">lock:offset</span> @@ -108,7 +108,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="CommentedCode">#? $print [trying to acquire lock for writing], 10/newline</span> wait-for-reset-then-set lock <span class="CommentedCode">#? $print [lock acquired for writing], 10/newline</span> - full?:boolean<span class="Special"> <- </span>channel-full? chan + full?:bool<span class="Special"> <- </span>channel-full? chan <span class="muControl">break-unless</span> full? <span class="CommentedCode">#? $print [but channel is full; relinquishing lock], 10/newline</span> <span class="Comment"># channel is full; relinquish lock and give a reader the opportunity to</span> @@ -121,16 +121,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color current-routine-is-unblocked <span class="CommentedCode">#? $print [performing write], 10/newline</span> <span class="Comment"># store a deep copy of val</span> - circular-buffer:address:array:_elem<span class="Special"> <- </span>get *chan, <span class="Constant">data:offset</span> - free:number<span class="Special"> <- </span>get *chan, <span class="Constant">first-free:offset</span> + circular-buffer:&:@:_elem<span class="Special"> <- </span>get *chan, <span class="Constant">data:offset</span> + free:num<span class="Special"> <- </span>get *chan, <span class="Constant">first-free:offset</span> val-copy:_elem<span class="Special"> <- </span>deep-copy val <span class="Comment"># on this instruction rests all Mu's concurrency-safety</span> *circular-buffer<span class="Special"> <- </span>put-index *circular-buffer, free, val-copy <span class="Comment"># mark its slot as filled</span> free<span class="Special"> <- </span>add free, <span class="Constant">1</span> <span class="Delimiter">{</span> <span class="Comment"># wrap free around to 0 if necessary</span> - len:number<span class="Special"> <- </span>length *circular-buffer - at-end?:boolean<span class="Special"> <- </span>greater-or-equal free, len + len:num<span class="Special"> <- </span>length *circular-buffer + at-end?:bool<span class="Special"> <- </span>greater-or-equal free, len <span class="muControl">break-unless</span> at-end? free<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> @@ -140,12 +140,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color reset lock ] -<span class="muRecipe">def</span> read in:address:source:_elem<span class="muRecipe"> -> </span>result:_elem, eof?:boolean, in:address:source:_elem [ +<span class="muRecipe">def</span> read in:&:source:_elem<span class="muRecipe"> -> </span>result:_elem, eof?:bool, in:&:source:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> assert in, <span class="Constant">[read on null channel]</span> eof?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="Comment"># default result</span> - chan:address:channel:_elem<span class="Special"> <- </span>get *in, <span class="Constant">chan:offset</span> + chan:&:channel:_elem<span class="Special"> <- </span>get *in, <span class="Constant">chan:offset</span> <span class="Comment"># block until lock is acquired AND queue has data</span> lock:location<span class="Special"> <- </span>get-location *chan, <span class="Constant">lock:offset</span> <span class="CommentedCode">#? $print [read], 10/newline</span> @@ -153,7 +153,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="CommentedCode">#? $print [trying to acquire lock for reading], 10/newline</span> wait-for-reset-then-set lock <span class="CommentedCode">#? $print [lock acquired for reading], 10/newline</span> - empty?:boolean<span class="Special"> <- </span>channel-empty? chan + empty?:bool<span class="Special"> <- </span>channel-empty? chan <span class="muControl">break-unless</span> empty? <span class="CommentedCode">#? $print [but channel is empty; relinquishing lock], 10/newline</span> <span class="Comment"># channel is empty; relinquish lock and give a writer the opportunity to</span> @@ -166,18 +166,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> current-routine-is-unblocked <span class="Comment"># pull result off</span> - full:number<span class="Special"> <- </span>get *chan, <span class="Constant">first-full:offset</span> - circular-buffer:address:array:_elem<span class="Special"> <- </span>get *chan, <span class="Constant">data:offset</span> + full:num<span class="Special"> <- </span>get *chan, <span class="Constant">first-full:offset</span> + circular-buffer:&:@:_elem<span class="Special"> <- </span>get *chan, <span class="Constant">data:offset</span> result<span class="Special"> <- </span>index *circular-buffer, full <span class="Comment"># clear the slot</span> - empty:address:_elem<span class="Special"> <- </span>new <span class="Constant">_elem:type</span> + empty:&:_elem<span class="Special"> <- </span>new <span class="Constant">_elem:type</span> *circular-buffer<span class="Special"> <- </span>put-index *circular-buffer, full, *empty <span class="Comment"># mark its slot as empty</span> full<span class="Special"> <- </span>add full, <span class="Constant">1</span> <span class="Delimiter">{</span> <span class="Comment"># wrap full around to 0 if necessary</span> - len:number<span class="Special"> <- </span>length *circular-buffer - at-end?:boolean<span class="Special"> <- </span>greater-or-equal full, len + len:num<span class="Special"> <- </span>length *circular-buffer + at-end?:bool<span class="Special"> <- </span>greater-or-equal full, len <span class="muControl">break-unless</span> at-end? full<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> @@ -187,12 +187,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color reset lock ] -<span class="muRecipe">def</span> clear in:address:source:_elem<span class="muRecipe"> -> </span>in:address:source:_elem [ +<span class="muRecipe">def</span> clear in:&:source:_elem<span class="muRecipe"> -> </span>in:&:source:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - chan:address:channel:_elem<span class="Special"> <- </span>get *in, <span class="Constant">chan:offset</span> + chan:&:channel:_elem<span class="Special"> <- </span>get *in, <span class="Constant">chan:offset</span> <span class="Delimiter">{</span> - empty?:boolean<span class="Special"> <- </span>channel-empty? chan + empty?:bool<span class="Special"> <- </span>channel-empty? chan <span class="muControl">break-if</span> empty? _, _, in<span class="Special"> <- </span>read in <span class="Delimiter">}</span> @@ -201,10 +201,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> channel-initialization [ run [ <span class="Constant">local-scope</span> - source:address:source:number<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> - chan:address:channel:number<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-full:offset</span> - <span class="Constant">11</span>:number/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> + source:&:source:num<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> + chan:&:channel:num<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-full:offset</span> + <span class="Constant">11</span>:num/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># first-full</span> @@ -215,11 +215,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> channel-write-increments-free [ run [ <span class="Constant">local-scope</span> - _, sink:address:sink:number<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> + _, sink:&:sink:num<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">34</span> - chan:address:channel:number<span class="Special"> <- </span>get *sink, <span class="Constant">chan:offset</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-full:offset</span> - <span class="Constant">11</span>:number/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> + chan:&:channel:num<span class="Special"> <- </span>get *sink, <span class="Constant">chan:offset</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-full:offset</span> + <span class="Constant">11</span>:num/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># first-full</span> @@ -230,12 +230,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> channel-read-increments-full [ run [ <span class="Constant">local-scope</span> - source:address:source:number, sink:address:sink:number<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> + source:&:source:num, sink:&:sink:num<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">34</span> _, _, source<span class="Special"> <- </span>read source - chan:address:channel:number<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-full:offset</span> - <span class="Constant">11</span>:number/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> + chan:&:channel:num<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-full:offset</span> + <span class="Constant">11</span>:num/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># first-full</span> @@ -247,20 +247,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> <span class="Comment"># channel with just 1 slot</span> - source:address:source:number, sink:address:sink:number<span class="Special"> <- </span>new-channel <span class="Constant">1/capacity</span> - chan:address:channel:number<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> + source:&:source:num, sink:&:sink:num<span class="Special"> <- </span>new-channel <span class="Constant">1/capacity</span> + chan:&:channel:num<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> <span class="Comment"># write and read a value</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">34</span> _, _, source<span class="Special"> <- </span>read source <span class="Comment"># first-free will now be 1</span> - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> - <span class="Constant">11</span>:number/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> + <span class="Constant">11</span>:num/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> <span class="Comment"># write second value, verify that first-free wraps</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">34</span> - <span class="Constant">20</span>:number/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> + <span class="Constant">20</span>:num/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-free:offset</span> <span class="Comment"># read second value, verify that first-full wraps</span> _, _, source<span class="Special"> <- </span>read source - <span class="Constant">30</span>:number/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-full:offset</span> + <span class="Constant">30</span>:num/<span class="Special">raw <- </span>get *chan, <span class="Constant">first-full:offset</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># first-free after first write</span> @@ -273,10 +273,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> channel-new-empty-not-full [ run [ <span class="Constant">local-scope</span> - source:address:source:number<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> - chan:address:channel:number<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>channel-empty? chan - <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>channel-full? chan + source:&:source:num<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> + chan:&:channel:num<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>channel-empty? chan + <span class="Constant">11</span>:bool/<span class="Special">raw <- </span>channel-full? chan ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># empty?</span> @@ -286,11 +286,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> channel-write-not-empty [ run [ - source:address:source:number, sink:address:sink:number<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> - chan:address:channel:number<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> + source:&:source:num, sink:&:sink:num<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> + chan:&:channel:num<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">34</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>channel-empty? chan - <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>channel-full? chan + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>channel-empty? chan + <span class="Constant">11</span>:bool/<span class="Special">raw <- </span>channel-full? chan ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># empty?</span> @@ -301,11 +301,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> channel-write-full [ run [ <span class="Constant">local-scope</span> - source:address:source:number, sink:address:sink:number<span class="Special"> <- </span>new-channel <span class="Constant">1/capacity</span> - chan:address:channel:number<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> + source:&:source:num, sink:&:sink:num<span class="Special"> <- </span>new-channel <span class="Constant">1/capacity</span> + chan:&:channel:num<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">34</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>channel-empty? chan - <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>channel-full? chan + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>channel-empty? chan + <span class="Constant">11</span>:bool/<span class="Special">raw <- </span>channel-full? chan ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># empty?</span> @@ -316,12 +316,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> channel-read-not-full [ run [ <span class="Constant">local-scope</span> - source:address:source:number, sink:address:sink:number<span class="Special"> <- </span>new-channel <span class="Constant">1/capacity</span> - chan:address:channel:number<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> + source:&:source:num, sink:&:sink:num<span class="Special"> <- </span>new-channel <span class="Constant">1/capacity</span> + chan:&:channel:num<span class="Special"> <- </span>get *source, <span class="Constant">chan:offset</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">34</span> _, _, source<span class="Special"> <- </span>read source - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>channel-empty? chan - <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>channel-full? chan + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>channel-empty? chan + <span class="Constant">11</span>:bool/<span class="Special">raw <- </span>channel-full? chan ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># empty?</span> @@ -334,21 +334,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># every channel comes with a boolean signifying if it's been closed</span> <span class="Comment"># initially this boolean is false</span> <span class="muData">container</span> channel:_elem [ - closed?:boolean + closed?:bool ] <span class="Comment"># a channel can be closed from either the source or the sink</span> <span class="Comment"># both routines can modify the 'closed?' bit, but they can only ever set it, so this is a benign race</span> -<span class="muRecipe">def</span> close x:address:source:_elem<span class="muRecipe"> -> </span>x:address:source:_elem [ +<span class="muRecipe">def</span> close x:&:source:_elem<span class="muRecipe"> -> </span>x:&:source:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - chan:address:channel:_elem<span class="Special"> <- </span>get *x, <span class="Constant">chan:offset</span> + chan:&:channel:_elem<span class="Special"> <- </span>get *x, <span class="Constant">chan:offset</span> *chan<span class="Special"> <- </span>put *chan, <span class="Constant">closed?:offset</span>, <span class="Constant">1/true</span> ] -<span class="muRecipe">def</span> close x:address:sink:_elem<span class="muRecipe"> -> </span>x:address:sink:_elem [ +<span class="muRecipe">def</span> close x:&:sink:_elem<span class="muRecipe"> -> </span>x:&:sink:_elem [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - chan:address:channel:_elem<span class="Special"> <- </span>get *x, <span class="Constant">chan:offset</span> + chan:&:channel:_elem<span class="Special"> <- </span>get *x, <span class="Constant">chan:offset</span> *chan<span class="Special"> <- </span>put *chan, <span class="Constant">closed?:offset</span>, <span class="Constant">1/true</span> ] @@ -359,14 +359,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># future reads continue until the channel empties,</span> <span class="Comment"># then the channel is also closed for reading</span> <span class="muRecipe">after</span> <span class="Constant"><channel-write-initial></span> [ - closed?:boolean<span class="Special"> <- </span>get *chan, <span class="Constant">closed?:offset</span> + closed?:bool<span class="Special"> <- </span>get *chan, <span class="Constant">closed?:offset</span> <span class="muControl">return-if</span> closed? ] <span class="muRecipe">after</span> <span class="Constant"><channel-read-empty></span> [ - closed?:boolean<span class="Special"> <- </span>get *chan, <span class="Constant">closed?:offset</span> + closed?:bool<span class="Special"> <- </span>get *chan, <span class="Constant">closed?:offset</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> closed? - empty-result:address:_elem<span class="Special"> <- </span>new <span class="Constant">_elem:type</span> + empty-result:&:_elem<span class="Special"> <- </span>new <span class="Constant">_elem:type</span> current-routine-is-unblocked <span class="muControl">return</span> *empty-result, <span class="Constant">1/true</span> <span class="Delimiter">}</span> @@ -375,64 +375,64 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="SalientComment">## helpers</span> <span class="Comment"># An empty channel has first-empty and first-full both at the same value.</span> -<span class="muRecipe">def</span> channel-empty? chan:address:channel:_elem<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> channel-empty? chan:&:channel:_elem<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># return chan.first-full == chan.first-free</span> - full:number<span class="Special"> <- </span>get *chan, <span class="Constant">first-full:offset</span> - free:number<span class="Special"> <- </span>get *chan, <span class="Constant">first-free:offset</span> + full:num<span class="Special"> <- </span>get *chan, <span class="Constant">first-full:offset</span> + free:num<span class="Special"> <- </span>get *chan, <span class="Constant">first-free:offset</span> result<span class="Special"> <- </span>equal full, free ] <span class="Comment"># A full channel has first-empty just before first-full, wasting one slot.</span> <span class="Comment"># (Other alternatives: <a href="https://en.wikipedia.org/wiki/Circular_buffer#Full_.2F_Empty_Buffer_Distinction)">https://en.wikipedia.org/wiki/Circular_buffer#Full_.2F_Empty_Buffer_Distinction)</a></span> -<span class="muRecipe">def</span> channel-full? chan:address:channel:_elem<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> channel-full? chan:&:channel:_elem<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># tmp = chan.first-free + 1</span> - tmp:number<span class="Special"> <- </span>get *chan, <span class="Constant">first-free:offset</span> + tmp:num<span class="Special"> <- </span>get *chan, <span class="Constant">first-free:offset</span> tmp<span class="Special"> <- </span>add tmp, <span class="Constant">1</span> <span class="Delimiter">{</span> <span class="Comment"># if tmp == chan.capacity, tmp = 0</span> - len:number<span class="Special"> <- </span>capacity chan - at-end?:boolean<span class="Special"> <- </span>greater-or-equal tmp, len + len:num<span class="Special"> <- </span>capacity chan + at-end?:bool<span class="Special"> <- </span>greater-or-equal tmp, len <span class="muControl">break-unless</span> at-end? tmp<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">}</span> <span class="Comment"># return chan.first-full == tmp</span> - full:number<span class="Special"> <- </span>get *chan, <span class="Constant">first-full:offset</span> + full:num<span class="Special"> <- </span>get *chan, <span class="Constant">first-full:offset</span> result<span class="Special"> <- </span>equal full, tmp ] -<span class="muRecipe">def</span> capacity chan:address:channel:_elem<span class="muRecipe"> -> </span>result:number [ +<span class="muRecipe">def</span> capacity chan:&:channel:_elem<span class="muRecipe"> -> </span>result:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - q:address:array:_elem<span class="Special"> <- </span>get *chan, <span class="Constant">data:offset</span> + q:&:@:_elem<span class="Special"> <- </span>get *chan, <span class="Constant">data:offset</span> result<span class="Special"> <- </span>length *q ] <span class="Comment"># helper for channels of characters in particular</span> -<span class="muRecipe">def</span> buffer-lines in:address:source:character, buffered-out:address:sink:character<span class="muRecipe"> -> </span>buffered-out:address:sink:character, in:address:source:character [ +<span class="muRecipe">def</span> buffer-lines in:&:source:char, buffered-out:&:sink:char<span class="muRecipe"> -> </span>buffered-out:&:sink:char, in:&:source:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># repeat forever</span> - eof?:boolean<span class="Special"> <- </span>copy <span class="Constant">0/false</span> + eof?:bool<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="Delimiter">{</span> - line:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> + line:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> <span class="Comment"># read characters from 'in' until newline, copy into line</span> <span class="Delimiter">{</span> <span class="Constant"> +next-character</span> - c:character, eof?:boolean, in<span class="Special"> <- </span>read in + c:char, eof?:bool, in<span class="Special"> <- </span>read in <span class="muControl">break-if</span> eof? <span class="Comment"># drop a character on backspace</span> <span class="Delimiter">{</span> <span class="Comment"># special-case: if it's a backspace</span> - backspace?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">8</span> + backspace?:bool<span class="Special"> <- </span>equal c, <span class="Constant">8</span> <span class="muControl">break-unless</span> backspace? <span class="Comment"># drop previous character</span> <span class="Delimiter">{</span> - buffer-length:number<span class="Special"> <- </span>get *line, <span class="Constant">length:offset</span> - buffer-empty?:boolean<span class="Special"> <- </span>equal buffer-length, <span class="Constant">0</span> + buffer-length:num<span class="Special"> <- </span>get *line, <span class="Constant">length:offset</span> + buffer-empty?:bool<span class="Special"> <- </span>equal buffer-length, <span class="Constant">0</span> <span class="muControl">break-if</span> buffer-empty? buffer-length<span class="Special"> <- </span>subtract buffer-length, <span class="Constant">1</span> *line<span class="Special"> <- </span>put *line, <span class="Constant">length:offset</span>, buffer-length @@ -442,18 +442,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="Comment"># append anything else</span> line<span class="Special"> <- </span>append line, c - line-done?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + line-done?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> line-done? <span class="muControl">loop</span> <span class="Delimiter">}</span> <span class="Comment"># copy line into 'buffered-out'</span> - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> line-contents:text<span class="Special"> <- </span>get *line, <span class="Constant">data:offset</span> - max:number<span class="Special"> <- </span>get *line, <span class="Constant">length:offset</span> + max:num<span class="Special"> <- </span>get *line, <span class="Constant">length:offset</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, max + done?:bool<span class="Special"> <- </span>greater-or-equal i, max <span class="muControl">break-if</span> done? - c:character<span class="Special"> <- </span>index *line-contents, i + c:char<span class="Special"> <- </span>index *line-contents, i buffered-out<span class="Special"> <- </span>write buffered-out, c i<span class="Special"> <- </span>add i, <span class="Constant">1</span> <span class="muControl">loop</span> @@ -470,38 +470,38 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> buffer-lines-blocks-until-newline [ run [ <span class="Constant">local-scope</span> - source:address:source:character, sink:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">10/capacity</span> - _, buffered-stdin:address:sink:character/buffered-stdin<span class="Special"> <- </span>new-channel <span class="Constant">10/capacity</span> - buffered-chan:address:channel:character<span class="Special"> <- </span>get *buffered-stdin, <span class="Constant">chan:offset</span> - empty?:boolean<span class="Special"> <- </span>channel-empty? buffered-chan + source:&:source:char, sink:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">10/capacity</span> + _, buffered-stdin:&:sink:char/buffered-stdin<span class="Special"> <- </span>new-channel <span class="Constant">10/capacity</span> + buffered-chan:&:channel:char<span class="Special"> <- </span>get *buffered-stdin, <span class="Constant">chan:offset</span> + empty?:bool<span class="Special"> <- </span>channel-empty? buffered-chan assert empty?, <span class="Constant">[ </span> <span class="Constant">F buffer-lines-blocks-until-newline: channel should be empty after init]</span> <span class="Comment"># buffer stdin into buffered-stdin, try to read from buffered-stdin</span> - buffer-routine:number<span class="Special"> <- </span>start-running buffer-lines, source, buffered-stdin + buffer-routine:num<span class="Special"> <- </span>start-running buffer-lines, source, buffered-stdin wait-for-routine-to-block buffer-routine empty?<span class="Special"> <- </span>channel-empty? buffered-chan - assert empty?:boolean, <span class="Constant">[ </span> + assert empty?:bool, <span class="Constant">[ </span> <span class="Constant">F buffer-lines-blocks-until-newline: channel should be empty after buffer-lines bring-up]</span> <span class="Comment"># write 'a'</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">97/a</span> restart buffer-routine wait-for-routine-to-block buffer-routine empty?<span class="Special"> <- </span>channel-empty? buffered-chan - assert empty?:boolean, <span class="Constant">[ </span> + assert empty?:bool, <span class="Constant">[ </span> <span class="Constant">F buffer-lines-blocks-until-newline: channel should be empty after writing 'a']</span> <span class="Comment"># write 'b'</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">98/b</span> restart buffer-routine wait-for-routine-to-block buffer-routine empty?<span class="Special"> <- </span>channel-empty? buffered-chan - assert empty?:boolean, <span class="Constant">[ </span> + assert empty?:bool, <span class="Constant">[ </span> <span class="Constant">F buffer-lines-blocks-until-newline: channel should be empty after writing 'b']</span> <span class="Comment"># write newline</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">10/newline</span> restart buffer-routine wait-for-routine-to-block buffer-routine empty?<span class="Special"> <- </span>channel-empty? buffered-chan - data-emitted?:boolean<span class="Special"> <- </span>not empty? + data-emitted?:bool<span class="Special"> <- </span>not empty? assert data-emitted?, <span class="Constant">[ </span> <span class="Constant">F buffer-lines-blocks-until-newline: channel should contain data after writing newline]</span> trace <span class="Constant">1</span>, <span class="Constant">[test]</span>, <span class="Constant">[reached end]</span> diff --git a/html/081print.mu.html b/html/081print.mu.html index eecac93b..69bed0ed 100644 --- a/html/081print.mu.html +++ b/html/081print.mu.html @@ -37,40 +37,40 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># easier to test.</span> <span class="muData">container</span> screen [ - num-rows:number - num-columns:number - cursor-row:number - cursor-column:number - data:address:array:screen-cell + num-rows:num + num-columns:num + cursor-row:num + cursor-column:num + data:&:@:screen-cell ] <span class="muData">container</span> screen-cell [ - contents:character - color:number + contents:char + color:num ] -<span class="muRecipe">def</span> new-fake-screen w:number, h:number<span class="muRecipe"> -> </span>result:address:screen [ +<span class="muRecipe">def</span> new-fake-screen w:num, h:num<span class="muRecipe"> -> </span>result:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> result<span class="Special"> <- </span>new <span class="Constant">screen:type</span> - bufsize:number<span class="Special"> <- </span>multiply w, h - data:address:array:screen-cell<span class="Special"> <- </span>new <span class="Constant">screen-cell:type</span>, bufsize + bufsize:num<span class="Special"> <- </span>multiply w, h + data:&:@:screen-cell<span class="Special"> <- </span>new <span class="Constant">screen-cell:type</span>, bufsize *result<span class="Special"> <- </span>merge h/num-rows, w/num-columns, <span class="Constant">0/cursor-row</span>, <span class="Constant">0/cursor-column</span>, data result<span class="Special"> <- </span>clear-screen result ] -<span class="muRecipe">def</span> clear-screen screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> clear-screen screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> screen <span class="Comment"># clear fake screen</span> - buf:address:array:screen-cell<span class="Special"> <- </span>get *screen, <span class="Constant">data:offset</span> - max:number<span class="Special"> <- </span>length *buf - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + buf:&:@:screen-cell<span class="Special"> <- </span>get *screen, <span class="Constant">data:offset</span> + max:num<span class="Special"> <- </span>length *buf + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, max + done?:bool<span class="Special"> <- </span>greater-or-equal i, max <span class="muControl">break-if</span> done? curr:screen-cell<span class="Special"> <- </span>merge <span class="Constant">0/empty</span>, <span class="Constant">7/white</span> *buf<span class="Special"> <- </span>put-index *buf, i, curr @@ -86,7 +86,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color clear-display ] -<span class="muRecipe">def</span> sync-screen screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> sync-screen screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> @@ -96,18 +96,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># do nothing for fake screens</span> ] -<span class="muRecipe">def</span> fake-screen-is-empty? screen:address:screen<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> fake-screen-is-empty? screen:&:screen<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> screen, <span class="Constant">1/true</span> - buf:address:array:screen-cell<span class="Special"> <- </span>get *screen, <span class="Constant">data:offset</span> - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - len:number<span class="Special"> <- </span>length *buf + buf:&:@:screen-cell<span class="Special"> <- </span>get *screen, <span class="Constant">data:offset</span> + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + len:num<span class="Special"> <- </span>length *buf <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? curr:screen-cell<span class="Special"> <- </span>index *buf, i - curr-contents:character<span class="Special"> <- </span>get curr, <span class="Constant">contents:offset</span> + curr-contents:char<span class="Special"> <- </span>get curr, <span class="Constant">contents:offset</span> i<span class="Special"> <- </span>add i, <span class="Constant">1</span> <span class="muControl">loop-unless</span> curr-contents <span class="Comment"># not 0</span> @@ -116,35 +116,36 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> <span class="Constant">1/true</span> ] -<span class="muRecipe">def</span> print screen:address:screen, c:character<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> print screen:&:screen, c:char<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - color:number, color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + color:num, color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default color to white</span> <span class="muControl">break-if</span> color-found? color<span class="Special"> <- </span>copy <span class="Constant">7/white</span> <span class="Delimiter">}</span> - bg-color:number, bg-color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + bg-color:num, bg-color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default bg-color to black</span> <span class="muControl">break-if</span> bg-color-found? bg-color<span class="Special"> <- </span>copy <span class="Constant">0/black</span> <span class="Delimiter">}</span> - trace <span class="Constant">90</span>, <span class="Constant">[print-character]</span>, c + c2:num<span class="Special"> <- </span>character-to-code c + trace <span class="Constant">90</span>, <span class="Constant">[print-character]</span>, c2 <span class="Delimiter">{</span> <span class="Comment"># if x exists</span> <span class="Comment"># (handle special cases exactly like in the real screen)</span> <span class="muControl">break-unless</span> screen - width:number<span class="Special"> <- </span>get *screen, <span class="Constant">num-columns:offset</span> - height:number<span class="Special"> <- </span>get *screen, <span class="Constant">num-rows:offset</span> + width:num<span class="Special"> <- </span>get *screen, <span class="Constant">num-columns:offset</span> + height:num<span class="Special"> <- </span>get *screen, <span class="Constant">num-rows:offset</span> <span class="Comment"># if cursor is out of bounds, silently exit</span> - row:number<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-row:offset</span> - legal?:boolean<span class="Special"> <- </span>greater-or-equal row, <span class="Constant">0</span> + row:num<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-row:offset</span> + legal?:bool<span class="Special"> <- </span>greater-or-equal row, <span class="Constant">0</span> <span class="muControl">return-unless</span> legal? legal?<span class="Special"> <- </span>lesser-than row, height <span class="muControl">return-unless</span> legal? - column:number<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-column:offset</span> + column:num<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-column:offset</span> legal?<span class="Special"> <- </span>greater-or-equal column, <span class="Constant">0</span> <span class="muControl">return-unless</span> legal? legal?<span class="Special"> <- </span>lesser-than column, width @@ -152,12 +153,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="CommentedCode">#? $print [print-character (], row, [, ], column, [): ], c, 10/newline</span> <span class="Comment"># special-case: newline</span> <span class="Delimiter">{</span> - newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> newline? <span class="Delimiter">{</span> <span class="Comment"># unless cursor is already at bottom</span> - bottom:number<span class="Special"> <- </span>subtract height, <span class="Constant">1</span> - at-bottom?:boolean<span class="Special"> <- </span>greater-or-equal row, bottom + bottom:num<span class="Special"> <- </span>subtract height, <span class="Constant">1</span> + at-bottom?:bool<span class="Special"> <- </span>greater-or-equal row, bottom <span class="muControl">break-if</span> at-bottom? <span class="Comment"># move it to the next row</span> column<span class="Special"> <- </span>copy <span class="Constant">0</span> @@ -168,17 +169,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> <span class="Delimiter">}</span> <span class="Comment"># save character in fake screen</span> - index:number<span class="Special"> <- </span>multiply row, width + index:num<span class="Special"> <- </span>multiply row, width index<span class="Special"> <- </span>add index, column - buf:address:array:screen-cell<span class="Special"> <- </span>get *screen, <span class="Constant">data:offset</span> - len:number<span class="Special"> <- </span>length *buf + buf:&:@:screen-cell<span class="Special"> <- </span>get *screen, <span class="Constant">data:offset</span> + len:num<span class="Special"> <- </span>length *buf <span class="Comment"># special-case: backspace</span> <span class="Delimiter">{</span> - backspace?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">8</span> + backspace?:bool<span class="Special"> <- </span>equal c, <span class="Constant">8</span> <span class="muControl">break-unless</span> backspace? <span class="Delimiter">{</span> <span class="Comment"># unless cursor is already at left margin</span> - at-left?:boolean<span class="Special"> <- </span>lesser-or-equal column, <span class="Constant">0</span> + at-left?:bool<span class="Special"> <- </span>lesser-or-equal column, <span class="Constant">0</span> <span class="muControl">break-if</span> at-left? <span class="Comment"># clear previous location</span> column<span class="Special"> <- </span>subtract column, <span class="Constant">1</span> @@ -193,8 +194,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *buf<span class="Special"> <- </span>put-index *buf, index, cursor <span class="Comment"># increment column unless it's already all the way to the right</span> <span class="Delimiter">{</span> - right:number<span class="Special"> <- </span>subtract width, <span class="Constant">1</span> - at-right?:boolean<span class="Special"> <- </span>greater-or-equal column, right + right:num<span class="Special"> <- </span>subtract width, <span class="Constant">1</span> + at-right?:bool<span class="Special"> <- </span>greater-or-equal column, right <span class="muControl">break-if</span> at-right? column<span class="Special"> <- </span>add column, <span class="Constant">1</span> *screen<span class="Special"> <- </span>put *screen, <span class="Constant">cursor-column:offset</span>, column @@ -208,11 +209,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> print-character-at-top-left [ run [ <span class="Constant">local-scope</span> - fake-screen:address:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> - a:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> - fake-screen<span class="Special"> <- </span>print fake-screen, a:character - cell:address:array:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> - <span class="Constant">1</span>:array:screen-cell/<span class="Special">raw <- </span>copy *cell + fake-screen:&:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> + a:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + fake-screen<span class="Special"> <- </span>print fake-screen, a:char + cell:&:@:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> + <span class="Constant">1</span>:@:screen-cell/<span class="Special">raw <- </span>copy *cell ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">6</span> <span class="Comment"># width*height</span> @@ -226,11 +227,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> print-character-in-color [ run [ <span class="Constant">local-scope</span> - fake-screen:address:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> - a:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> - fake-screen<span class="Special"> <- </span>print fake-screen, a:character, <span class="Constant">1/red</span> - cell:address:array:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> - <span class="Constant">1</span>:array:screen-cell/<span class="Special">raw <- </span>copy *cell + fake-screen:&:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> + a:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + fake-screen<span class="Special"> <- </span>print fake-screen, a:char, <span class="Constant">1/red</span> + cell:&:@:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> + <span class="Constant">1</span>:@:screen-cell/<span class="Special">raw <- </span>copy *cell ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">6</span> <span class="Comment"># width*height</span> @@ -244,14 +245,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> print-backspace-character [ run [ <span class="Constant">local-scope</span> - fake-screen:address:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> - a:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + fake-screen:&:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> + a:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> fake-screen<span class="Special"> <- </span>print fake-screen, a - backspace:character<span class="Special"> <- </span>copy <span class="Constant">8/backspace</span> + backspace:char<span class="Special"> <- </span>copy <span class="Constant">8/backspace</span> fake-screen<span class="Special"> <- </span>print fake-screen, backspace - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> - cell:address:array:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> - <span class="Constant">11</span>:array:screen-cell/<span class="Special">raw <- </span>copy *cell + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> + cell:&:@:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> + <span class="Constant">11</span>:@:screen-cell/<span class="Special">raw <- </span>copy *cell ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># cursor column</span> @@ -266,15 +267,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> print-extra-backspace-character [ run [ <span class="Constant">local-scope</span> - fake-screen:address:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> - a:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + fake-screen:&:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> + a:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> fake-screen<span class="Special"> <- </span>print fake-screen, a - backspace:character<span class="Special"> <- </span>copy <span class="Constant">8/backspace</span> + backspace:char<span class="Special"> <- </span>copy <span class="Constant">8/backspace</span> fake-screen<span class="Special"> <- </span>print fake-screen, backspace fake-screen<span class="Special"> <- </span>print fake-screen, backspace - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> - cell:address:array:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> - <span class="Constant">3</span>:array:screen-cell/<span class="Special">raw <- </span>copy *cell + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> + cell:&:@:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> + <span class="Constant">3</span>:@:screen-cell/<span class="Special">raw <- </span>copy *cell ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># cursor column</span> @@ -289,16 +290,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> print-character-at-right-margin [ run [ <span class="Constant">local-scope</span> - fake-screen:address:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">2/width</span>, <span class="Constant">2/height</span> - a:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + fake-screen:&:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">2/width</span>, <span class="Constant">2/height</span> + a:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> fake-screen<span class="Special"> <- </span>print fake-screen, a - b:character<span class="Special"> <- </span>copy <span class="Constant">98/b</span> + b:char<span class="Special"> <- </span>copy <span class="Constant">98/b</span> fake-screen<span class="Special"> <- </span>print fake-screen, b - c:character<span class="Special"> <- </span>copy <span class="Constant">99/c</span> + c:char<span class="Special"> <- </span>copy <span class="Constant">99/c</span> fake-screen<span class="Special"> <- </span>print fake-screen, c - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> - cell:address:array:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> - <span class="Constant">11</span>:array:screen-cell/<span class="Special">raw <- </span>copy *cell + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> + cell:&:@:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> + <span class="Constant">11</span>:@:screen-cell/<span class="Special">raw <- </span>copy *cell ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># cursor column</span> @@ -315,15 +316,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> print-newline-character [ run [ <span class="Constant">local-scope</span> - fake-screen:address:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> - newline:character<span class="Special"> <- </span>copy <span class="Constant">10/newline</span> - a:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + fake-screen:&:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> + newline:char<span class="Special"> <- </span>copy <span class="Constant">10/newline</span> + a:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> fake-screen<span class="Special"> <- </span>print fake-screen, a fake-screen<span class="Special"> <- </span>print fake-screen, newline - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-row:offset</span> - <span class="Constant">11</span>:number/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> - cell:address:array:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> - <span class="Constant">12</span>:array:screen-cell/<span class="Special">raw <- </span>copy *cell + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-row:offset</span> + <span class="Constant">11</span>:num/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> + cell:&:@:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> + <span class="Constant">12</span>:@:screen-cell/<span class="Special">raw <- </span>copy *cell ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># cursor row</span> @@ -339,13 +340,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> print-newline-at-bottom-line [ run [ <span class="Constant">local-scope</span> - fake-screen:address:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> - newline:character<span class="Special"> <- </span>copy <span class="Constant">10/newline</span> + fake-screen:&:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> + newline:char<span class="Special"> <- </span>copy <span class="Constant">10/newline</span> fake-screen<span class="Special"> <- </span>print fake-screen, newline fake-screen<span class="Special"> <- </span>print fake-screen, newline fake-screen<span class="Special"> <- </span>print fake-screen, newline - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-row:offset</span> - <span class="Constant">11</span>:number/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-row:offset</span> + <span class="Constant">11</span>:num/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># cursor row</span> @@ -356,22 +357,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> print-character-at-bottom-right [ run [ <span class="Constant">local-scope</span> - fake-screen:address:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">2/width</span>, <span class="Constant">2/height</span> - newline:character<span class="Special"> <- </span>copy <span class="Constant">10/newline</span> + fake-screen:&:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">2/width</span>, <span class="Constant">2/height</span> + newline:char<span class="Special"> <- </span>copy <span class="Constant">10/newline</span> fake-screen<span class="Special"> <- </span>print fake-screen, newline - a:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + a:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> fake-screen<span class="Special"> <- </span>print fake-screen, a - b:character<span class="Special"> <- </span>copy <span class="Constant">98/b</span> + b:char<span class="Special"> <- </span>copy <span class="Constant">98/b</span> fake-screen<span class="Special"> <- </span>print fake-screen, b - c:character<span class="Special"> <- </span>copy <span class="Constant">99/c</span> + c:char<span class="Special"> <- </span>copy <span class="Constant">99/c</span> fake-screen<span class="Special"> <- </span>print fake-screen, c fake-screen<span class="Special"> <- </span>print fake-screen, newline - d:character<span class="Special"> <- </span>copy <span class="Constant">100/d</span> + d:char<span class="Special"> <- </span>copy <span class="Constant">100/d</span> fake-screen<span class="Special"> <- </span>print fake-screen, d - <span class="Constant">10</span>:number/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-row:offset</span> - <span class="Constant">11</span>:number/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> - cell:address:array:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> - <span class="Constant">20</span>:array:screen-cell/<span class="Special">raw <- </span>copy *cell + <span class="Constant">10</span>:num/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-row:offset</span> + <span class="Constant">11</span>:num/<span class="Special">raw <- </span>get *fake-screen, <span class="Constant">cursor-column:offset</span> + cell:&:@:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> + <span class="Constant">20</span>:@:screen-cell/<span class="Special">raw <- </span>copy *cell ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># cursor row</span> @@ -390,20 +391,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -<span class="muRecipe">def</span> clear-line screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> clear-line screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - space:character<span class="Special"> <- </span>copy <span class="Constant">0/nul</span> + space:char<span class="Special"> <- </span>copy <span class="Constant">0/nul</span> <span class="Comment"># if x exists, clear line in fake screen</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> screen - width:number<span class="Special"> <- </span>get *screen, <span class="Constant">num-columns:offset</span> - column:number<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-column:offset</span> - original-column:number<span class="Special"> <- </span>copy column + width:num<span class="Special"> <- </span>get *screen, <span class="Constant">num-columns:offset</span> + column:num<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-column:offset</span> + original-column:num<span class="Special"> <- </span>copy column <span class="Comment"># space over the entire line</span> <span class="Delimiter">{</span> - right:number<span class="Special"> <- </span>subtract width, <span class="Constant">1</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal column, right + right:num<span class="Special"> <- </span>subtract width, <span class="Constant">1</span> + done?:bool<span class="Special"> <- </span>greater-or-equal column, right <span class="muControl">break-if</span> done? print screen, space column<span class="Special"> <- </span>add column, <span class="Constant">1</span> @@ -417,19 +418,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color clear-line-on-display ] -<span class="muRecipe">def</span> clear-line-until screen:address:screen, right:number/inclusive<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> clear-line-until screen:&:screen, right:num/inclusive<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - _, column:number<span class="Special"> <- </span>cursor-position screen - space:character<span class="Special"> <- </span>copy <span class="Constant">32/space</span> - bg-color:number, bg-color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + _, column:num<span class="Special"> <- </span>cursor-position screen + space:char<span class="Special"> <- </span>copy <span class="Constant">32/space</span> + bg-color:num, bg-color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default bg-color to black</span> <span class="muControl">break-if</span> bg-color-found? bg-color<span class="Special"> <- </span>copy <span class="Constant">0/black</span> <span class="Delimiter">}</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-than column, right + done?:bool<span class="Special"> <- </span>greater-than column, right <span class="muControl">break-if</span> done? screen<span class="Special"> <- </span>print screen, space, <span class="Constant">7/white</span>, bg-color <span class="Comment"># foreground color is mostly unused except if the cursor shows up at this cell</span> column<span class="Special"> <- </span>add column, <span class="Constant">1</span> @@ -437,20 +438,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> cursor-position screen:address:screen<span class="muRecipe"> -> </span>row:number, column:number [ +<span class="muRecipe">def</span> cursor-position screen:&:screen<span class="muRecipe"> -> </span>row:num, column:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists, lookup cursor in fake screen</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> screen - row:number<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-row:offset</span> - column:number<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-column:offset</span> + row:num<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-row:offset</span> + column:num<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-column:offset</span> <span class="muControl">return</span> <span class="Delimiter">}</span> row, column<span class="Special"> <- </span>cursor-position-on-display ] -<span class="muRecipe">def</span> move-cursor screen:address:screen, new-row:number, new-column:number<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> move-cursor screen:&:screen, new-row:num, new-column:num<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists, move cursor in fake screen</span> @@ -467,16 +468,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> clear-line-erases-printed-characters [ run [ <span class="Constant">local-scope</span> - fake-screen:address:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> + fake-screen:&:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> <span class="Comment"># print a character</span> - a:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + a:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> fake-screen<span class="Special"> <- </span>print fake-screen, a <span class="Comment"># move cursor to start of line</span> fake-screen<span class="Special"> <- </span>move-cursor fake-screen, <span class="Constant">0/row</span>, <span class="Constant">0/column</span> <span class="Comment"># clear line</span> fake-screen<span class="Special"> <- </span>clear-line fake-screen - cell:address:array:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> - <span class="Constant">10</span>:array:screen-cell/<span class="Special">raw <- </span>copy *cell + cell:&:@:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> + <span class="Constant">10</span>:@:screen-cell/<span class="Special">raw <- </span>copy *cell ] <span class="Comment"># screen should be blank</span> memory-should-contain [ @@ -496,7 +497,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -<span class="muRecipe">def</span> cursor-down screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> cursor-down screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists, move cursor in fake screen</span> @@ -504,10 +505,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">break-unless</span> screen <span class="Delimiter">{</span> <span class="Comment"># increment row unless it's already all the way down</span> - height:number<span class="Special"> <- </span>get *screen, <span class="Constant">num-rows:offset</span> - row:number<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-row:offset</span> - max:number<span class="Special"> <- </span>subtract height, <span class="Constant">1</span> - at-bottom?:boolean<span class="Special"> <- </span>greater-or-equal row, max + height:num<span class="Special"> <- </span>get *screen, <span class="Constant">num-rows:offset</span> + row:num<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-row:offset</span> + max:num<span class="Special"> <- </span>subtract height, <span class="Constant">1</span> + at-bottom?:bool<span class="Special"> <- </span>greater-or-equal row, max <span class="muControl">break-if</span> at-bottom? row<span class="Special"> <- </span>add row, <span class="Constant">1</span> *screen<span class="Special"> <- </span>put *screen, <span class="Constant">cursor-row:offset</span>, row @@ -518,7 +519,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color move-cursor-down-on-display ] -<span class="muRecipe">def</span> cursor-up screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> cursor-up screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists, move cursor in fake screen</span> @@ -526,8 +527,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">break-unless</span> screen <span class="Delimiter">{</span> <span class="Comment"># decrement row unless it's already all the way up</span> - row:number<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-row:offset</span> - at-top?:boolean<span class="Special"> <- </span>lesser-or-equal row, <span class="Constant">0</span> + row:num<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-row:offset</span> + at-top?:bool<span class="Special"> <- </span>lesser-or-equal row, <span class="Constant">0</span> <span class="muControl">break-if</span> at-top? row<span class="Special"> <- </span>subtract row, <span class="Constant">1</span> *screen<span class="Special"> <- </span>put *screen, <span class="Constant">cursor-row:offset</span>, row @@ -538,7 +539,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color move-cursor-up-on-display ] -<span class="muRecipe">def</span> cursor-right screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> cursor-right screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists, move cursor in fake screen</span> @@ -546,10 +547,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">break-unless</span> screen <span class="Delimiter">{</span> <span class="Comment"># increment column unless it's already all the way to the right</span> - width:number<span class="Special"> <- </span>get *screen, <span class="Constant">num-columns:offset</span> - column:number<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-column:offset</span> - max:number<span class="Special"> <- </span>subtract width, <span class="Constant">1</span> - at-bottom?:boolean<span class="Special"> <- </span>greater-or-equal column, max + width:num<span class="Special"> <- </span>get *screen, <span class="Constant">num-columns:offset</span> + column:num<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-column:offset</span> + max:num<span class="Special"> <- </span>subtract width, <span class="Constant">1</span> + at-bottom?:bool<span class="Special"> <- </span>greater-or-equal column, max <span class="muControl">break-if</span> at-bottom? column<span class="Special"> <- </span>add column, <span class="Constant">1</span> *screen<span class="Special"> <- </span>put *screen, <span class="Constant">cursor-column:offset</span>, column @@ -560,7 +561,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color move-cursor-right-on-display ] -<span class="muRecipe">def</span> cursor-left screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> cursor-left screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists, move cursor in fake screen</span> @@ -568,8 +569,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">break-unless</span> screen <span class="Delimiter">{</span> <span class="Comment"># decrement column unless it's already all the way to the left</span> - column:number<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-column:offset</span> - at-top?:boolean<span class="Special"> <- </span>lesser-or-equal column, <span class="Constant">0</span> + column:num<span class="Special"> <- </span>get *screen, <span class="Constant">cursor-column:offset</span> + at-top?:bool<span class="Special"> <- </span>lesser-or-equal column, <span class="Constant">0</span> <span class="muControl">break-if</span> at-top? column<span class="Special"> <- </span>subtract column, <span class="Constant">1</span> *screen<span class="Special"> <- </span>put *screen, <span class="Constant">cursor-column:offset</span>, column @@ -580,29 +581,29 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color move-cursor-left-on-display ] -<span class="muRecipe">def</span> cursor-to-start-of-line screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> cursor-to-start-of-line screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - row:number<span class="Special"> <- </span>cursor-position screen - column:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + row:num<span class="Special"> <- </span>cursor-position screen + column:num<span class="Special"> <- </span>copy <span class="Constant">0</span> screen<span class="Special"> <- </span>move-cursor screen, row, column ] -<span class="muRecipe">def</span> cursor-to-next-line screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> cursor-to-next-line screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> screen<span class="Special"> <- </span>cursor-down screen screen<span class="Special"> <- </span>cursor-to-start-of-line screen ] -<span class="muRecipe">def</span> move-cursor-to-column screen:address:screen, column:number<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> move-cursor-to-column screen:&:screen, column:num<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - row:number, _<span class="Special"> <- </span>cursor-position screen + row:num, _<span class="Special"> <- </span>cursor-position screen move-cursor screen, row, column ] -<span class="muRecipe">def</span> screen-width screen:address:screen<span class="muRecipe"> -> </span>width:number [ +<span class="muRecipe">def</span> screen-width screen:&:screen<span class="muRecipe"> -> </span>width:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists, move cursor in fake screen</span> @@ -615,7 +616,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color width<span class="Special"> <- </span>display-width ] -<span class="muRecipe">def</span> screen-height screen:address:screen<span class="muRecipe"> -> </span>height:number [ +<span class="muRecipe">def</span> screen-height screen:&:screen<span class="muRecipe"> -> </span>height:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists, move cursor in fake screen</span> @@ -628,7 +629,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color height<span class="Special"> <- </span>display-height ] -<span class="muRecipe">def</span> hide-cursor screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> hide-cursor screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists (not real display), do nothing</span> @@ -640,7 +641,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color hide-cursor-on-display ] -<span class="muRecipe">def</span> show-cursor screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> show-cursor screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists (not real display), do nothing</span> @@ -652,7 +653,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color show-cursor-on-display ] -<span class="muRecipe">def</span> hide-screen screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> hide-screen screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists (not real display), do nothing</span> @@ -665,7 +666,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color hide-display ] -<span class="muRecipe">def</span> show-screen screen:address:screen<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> show-screen screen:&:screen<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if x exists (not real display), do nothing</span> @@ -678,27 +679,27 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color show-display ] -<span class="muRecipe">def</span> print screen:address:screen, s:text<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> print screen:&:screen, s:text<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - color:number, color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + color:num, color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default color to white</span> <span class="muControl">break-if</span> color-found? color<span class="Special"> <- </span>copy <span class="Constant">7/white</span> <span class="Delimiter">}</span> - bg-color:number, bg-color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + bg-color:num, bg-color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default bg-color to black</span> <span class="muControl">break-if</span> bg-color-found? bg-color<span class="Special"> <- </span>copy <span class="Constant">0/black</span> <span class="Delimiter">}</span> - len:number<span class="Special"> <- </span>length *s - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + len:num<span class="Special"> <- </span>length *s + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? - c:character<span class="Special"> <- </span>index *s, i + c:char<span class="Special"> <- </span>index *s, i print screen, c, color, bg-color i<span class="Special"> <- </span>add i, <span class="Constant">1</span> <span class="muControl">loop</span> @@ -708,11 +709,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> print-text-stops-at-right-margin [ run [ <span class="Constant">local-scope</span> - fake-screen:address:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> + fake-screen:&:screen<span class="Special"> <- </span>new-fake-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> s:text<span class="Special"> <- </span>new <span class="Constant">[abcd]</span> fake-screen<span class="Special"> <- </span>print fake-screen, s:text - cell:address:array:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> - <span class="Constant">10</span>:array:screen-cell/<span class="Special">raw <- </span>copy *cell + cell:&:@:screen-cell<span class="Special"> <- </span>get *fake-screen, <span class="Constant">data:offset</span> + <span class="Constant">10</span>:@:screen-cell/<span class="Special">raw <- </span>copy *cell ] memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">6</span> <span class="Comment"># width*height</span> @@ -727,16 +728,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -<span class="muRecipe">def</span> print-integer screen:address:screen, n:number<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> print-integer screen:&:screen, n:num<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - color:number, color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + color:num, color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default color to white</span> <span class="muControl">break-if</span> color-found? color<span class="Special"> <- </span>copy <span class="Constant">7/white</span> <span class="Delimiter">}</span> - bg-color:number, bg-color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + bg-color:num, bg-color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default bg-color to black</span> <span class="muControl">break-if</span> bg-color-found? @@ -748,16 +749,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># for now, we can only print integers</span> -<span class="muRecipe">def</span> print screen:address:screen, n:number<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> print screen:&:screen, n:num<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - color:number, color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + color:num, color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default color to white</span> <span class="muControl">break-if</span> color-found? color<span class="Special"> <- </span>copy <span class="Constant">7/white</span> <span class="Delimiter">}</span> - bg-color:number, bg-color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + bg-color:num, bg-color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default bg-color to black</span> <span class="muControl">break-if</span> bg-color-found? @@ -767,22 +768,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># addresses</span> -<span class="muRecipe">def</span> print screen:address:screen, n:address:_elem<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> print screen:&:screen, n:&:_elem<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - color:number, color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + color:num, color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default color to white</span> <span class="muControl">break-if</span> color-found? color<span class="Special"> <- </span>copy <span class="Constant">7/white</span> <span class="Delimiter">}</span> - bg-color:number, bg-color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + bg-color:num, bg-color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default bg-color to black</span> <span class="muControl">break-if</span> bg-color-found? bg-color<span class="Special"> <- </span>copy <span class="Constant">0/black</span> <span class="Delimiter">}</span> - n2:number<span class="Special"> <- </span>copy n + n2:num<span class="Special"> <- </span>copy n screen<span class="Special"> <- </span>print-integer screen, n2, color, bg-color ] </pre> diff --git a/html/082scenario_screen.cc.html b/html/082scenario_screen.cc.html index f0f10ac5..a59fe566 100644 --- a/html/082scenario_screen.cc.html +++ b/html/082scenario_screen.cc.html @@ -49,8 +49,8 @@ recipes_taking_literal_strings<span class="Delimiter">.</span>insert<span class= scenario screen-in-scenario [ assume-screen <span class="Constant">5</span>/width<span class="Delimiter">,</span> <span class="Constant">3</span>/height run [ - <span class="Constant">1</span>:character<span class="Special"> <- </span>copy <span class="Constant">97</span>/a - <span class="Normal">screen</span>:address:screen<span class="Special"> <- </span>print screen:address:screen<span class="Delimiter">,</span> <span class="Constant">1</span>:character/a + <span class="Constant">1</span>:<span class="Normal">char</span><span class="Special"> <- </span>copy <span class="Constant">97</span>/a + <span class="Normal">screen</span>:&:screen<span class="Special"> <- </span>print screen:&:screen<span class="Delimiter">,</span> <span class="Constant">1</span>:<span class="Normal">char</span>/a ] screen-should-contain [ <span class="Comment"># 01234</span> @@ -65,10 +65,10 @@ scenario screen-in-scenario [ scenario screen-in-scenario-unicode-color [ assume-screen <span class="Constant">5</span>/width<span class="Delimiter">,</span> <span class="Constant">3</span>/height run [ - <span class="Constant">1</span>:character<span class="Special"> <- </span>copy <span class="Constant">955</span>/greek-small-lambda - <span class="Normal">screen</span>:address:screen<span class="Special"> <- </span>print screen:address:screen<span class="Delimiter">,</span> <span class="Constant">1</span>:character/lambda<span class="Delimiter">,</span> <span class="Constant">1</span>/red - <span class="Constant">2</span>:character<span class="Special"> <- </span>copy <span class="Constant">97</span>/a - <span class="Normal">screen</span>:address:screen<span class="Special"> <- </span>print screen:address:screen<span class="Delimiter">,</span> <span class="Constant">2</span>:character/a + <span class="Constant">1</span>:<span class="Normal">char</span><span class="Special"> <- </span>copy <span class="Constant">955</span>/greek-small-lambda + <span class="Normal">screen</span>:&:screen<span class="Special"> <- </span>print screen:&:screen<span class="Delimiter">,</span> <span class="Constant">1</span>:<span class="Normal">char</span>/lambda<span class="Delimiter">,</span> <span class="Constant">1</span>/red + <span class="Constant">2</span>:<span class="Normal">char</span><span class="Special"> <- </span>copy <span class="Constant">97</span>/a + <span class="Normal">screen</span>:&:screen<span class="Special"> <- </span>print screen:&:screen<span class="Delimiter">,</span> <span class="Constant">2</span>:<span class="Normal">char</span>/a ] screen-should-contain [ <span class="Comment"># 01234</span> @@ -84,10 +84,10 @@ scenario screen-in-scenario-unicode-color [ scenario screen-in-scenario-color [ assume-screen <span class="Constant">5</span>/width<span class="Delimiter">,</span> <span class="Constant">3</span>/height run [ - <span class="Constant">1</span>:character<span class="Special"> <- </span>copy <span class="Constant">955</span>/greek-small-lambda - <span class="Normal">screen</span>:address:screen<span class="Special"> <- </span>print screen:address:screen<span class="Delimiter">,</span> <span class="Constant">1</span>:character/lambda<span class="Delimiter">,</span> <span class="Constant">1</span>/red - <span class="Constant">2</span>:character<span class="Special"> <- </span>copy <span class="Constant">97</span>/a - <span class="Normal">screen</span>:address:screen<span class="Special"> <- </span>print screen:address:screen<span class="Delimiter">,</span> <span class="Constant">2</span>:character/a<span class="Delimiter">,</span> <span class="Constant">7</span>/white + <span class="Constant">1</span>:<span class="Normal">char</span><span class="Special"> <- </span>copy <span class="Constant">955</span>/greek-small-lambda + <span class="Normal">screen</span>:&:screen<span class="Special"> <- </span>print screen:&:screen<span class="Delimiter">,</span> <span class="Constant">1</span>:<span class="Normal">char</span>/lambda<span class="Delimiter">,</span> <span class="Constant">1</span>/red + <span class="Constant">2</span>:<span class="Normal">char</span><span class="Special"> <- </span>copy <span class="Constant">97</span>/a + <span class="Normal">screen</span>:&:screen<span class="Special"> <- </span>print screen:&:screen<span class="Delimiter">,</span> <span class="Constant">2</span>:<span class="Normal">char</span>/a<span class="Delimiter">,</span> <span class="Constant">7</span>/white ] <span class="Comment"># screen-should-contain shows everything</span> screen-should-contain [ @@ -120,8 +120,8 @@ scenario screen-in-scenario-color [ scenario screen-in-scenario-error [ assume-screen <span class="Constant">5</span>/width<span class="Delimiter">,</span> <span class="Constant">3</span>/height run [ - <span class="Constant">1</span>:character<span class="Special"> <- </span>copy <span class="Constant">97</span>/a - <span class="Normal">screen</span>:address:screen<span class="Special"> <- </span>print screen:address:screen<span class="Delimiter">,</span> <span class="Constant">1</span>:character/a + <span class="Constant">1</span>:<span class="Normal">char</span><span class="Special"> <- </span>copy <span class="Constant">97</span>/a + <span class="Normal">screen</span>:&:screen<span class="Special"> <- </span>print screen:&:screen<span class="Delimiter">,</span> <span class="Constant">1</span>:<span class="Normal">char</span>/a ] screen-should-contain [ <span class="Comment"># 01234</span> @@ -139,8 +139,8 @@ scenario screen-in-scenario-error [ scenario screen-in-scenario-color [ assume-screen <span class="Constant">5</span>/width<span class="Delimiter">,</span> <span class="Constant">3</span>/height run [ - <span class="Constant">1</span>:character<span class="Special"> <- </span>copy <span class="Constant">97</span>/a - <span class="Normal">screen</span>:address:screen<span class="Special"> <- </span>print screen:address:screen<span class="Delimiter">,</span> <span class="Constant">1</span>:character/a<span class="Delimiter">,</span> <span class="Constant">1</span>/red + <span class="Constant">1</span>:<span class="Normal">char</span><span class="Special"> <- </span>copy <span class="Constant">97</span>/a + <span class="Normal">screen</span>:&:screen<span class="Special"> <- </span>print screen:&:screen<span class="Delimiter">,</span> <span class="Constant">1</span>:<span class="Normal">char</span>/a<span class="Delimiter">,</span> <span class="Constant">1</span>/red ] screen-should-contain-in-color <span class="Constant">2</span>/green<span class="Delimiter">,</span> [ <span class="Comment"># 01234</span> @@ -155,7 +155,7 @@ scenario screen-in-scenario-color [ <span class="Delimiter">:(scenario convert_names_does_not_fail_when_mixing_special_names_and_numeric_locations)</span> <span class="Special">% Scenario_testing_scenario = true;</span> def main [ - <span class="Normal">screen</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span>:number + <span class="Normal">screen</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span>:num ] <span class="traceAbsent">-error: mixing variable names and numeric addresses in main</span> $error: <span class="Constant">0</span> @@ -192,7 +192,7 @@ Name[r][<span class="Constant">"screen"</span>] = SCREEN<span class="D <span class="Delimiter">:(before "End Rewrite Instruction(curr, recipe result)")</span> <span class="Comment">// rewrite `assume-screen width, height` to</span> -<span class="Comment">// `screen:address:screen <- new-fake-screen width, height`</span> +<span class="Comment">// `screen:&:screen <- new-fake-screen width, height`</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">"assume-screen"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> curr<span class="Delimiter">.</span>name = <span class="Constant">"new-fake-screen"</span><span class="Delimiter">;</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> @@ -203,7 +203,7 @@ Name[r][<span class="Constant">"screen"</span>] = SCREEN<span class="D <span class="Delimiter">}</span> <span class="Normal">else</span> <span class="Delimiter">{</span> assert<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">());</span> - curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">"screen:address:screen/raw"</span><span class="Delimiter">));</span> + curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">"screen:&:screen/raw"</span><span class="Delimiter">));</span> curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>set_value<span class="Delimiter">(</span>SCREEN<span class="Delimiter">);</span> <span class="Delimiter">}</span> <span class="Delimiter">}</span> @@ -226,7 +226,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'screen-should-contain' requires exactly one ingredient, but got '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of 'screen-should-contain' should be a literal string, but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> @@ -254,7 +254,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of 'screen-should-contain-in-color' should be a number (color code), but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"second ingredient of 'screen-should-contain-in-color' should be a literal string, but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> diff --git a/html/083scenario_screen_test.mu.html b/html/083scenario_screen_test.mu.html index adeb5b93..6aa4e9d6 100644 --- a/html/083scenario_screen_test.mu.html +++ b/html/083scenario_screen_test.mu.html @@ -34,8 +34,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">3/width</span>, <span class="Constant">2/height</span> run [ <span class="Constant">local-scope</span> - a:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> - screen:address:screen<span class="Special"> <- </span>print screen:address:screen, a + a:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + screen:&:screen<span class="Special"> <- </span>print screen:&:screen, a ] screen-should-contain [ <span class="Constant"> .a .</span> @@ -48,12 +48,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> <span class="Comment"># print a character</span> - a:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> - screen:address:screen<span class="Special"> <- </span>print screen:address:screen, a + a:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + screen:&:screen<span class="Special"> <- </span>print screen:&:screen, a <span class="Comment"># move cursor to start of line</span> - screen:address:screen<span class="Special"> <- </span>move-cursor screen:address:screen, <span class="Constant">0/row</span>, <span class="Constant">0/column</span> + screen:&:screen<span class="Special"> <- </span>move-cursor screen:&:screen, <span class="Constant">0/row</span>, <span class="Constant">0/column</span> <span class="Comment"># clear line</span> - screen:address:screen<span class="Special"> <- </span>clear-line screen:address:screen + screen:&:screen<span class="Special"> <- </span>clear-line screen:&:screen ] screen-should-contain [ <span class="Constant"> . .</span> diff --git a/html/084console.mu.html b/html/084console.mu.html index fb6df826..9a875427 100644 --- a/html/084console.mu.html +++ b/html/084console.mu.html @@ -35,48 +35,48 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># and are thus easier to test.</span> <span class="muData">exclusive-container</span> event [ - text:character - keycode:number <span class="Comment"># keys on keyboard without a unicode representation</span> + text:char + keycode:num <span class="Comment"># keys on keyboard without a unicode representation</span> touch:touch-event <span class="Comment"># mouse, track ball, etc.</span> resize:resize-event <span class="Comment"># update the assume-console handler if you add more variants</span> ] <span class="muData">container</span> touch-event [ - type:number - row:number - column:number + type:num + row:num + column:num ] <span class="muData">container</span> resize-event [ - width:number - height:number + width:num + height:num ] <span class="muData">container</span> console [ - current-event-index:number - events:address:array:event + current-event-index:num + events:&:@:event ] -<span class="muRecipe">def</span> new-fake-console events:address:array:event<span class="muRecipe"> -> </span>result:address:console [ +<span class="muRecipe">def</span> new-fake-console events:&:@:event<span class="muRecipe"> -> </span>result:&:console [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - result:address:console<span class="Special"> <- </span>new <span class="Constant">console:type</span> + result:&:console<span class="Special"> <- </span>new <span class="Constant">console:type</span> *result<span class="Special"> <- </span>put *result, <span class="Constant">events:offset</span>, events ] -<span class="muRecipe">def</span> read-event console:address:console<span class="muRecipe"> -> </span>result:event, console:address:console, found?:boolean, quit?:boolean [ +<span class="muRecipe">def</span> read-event console:&:console<span class="muRecipe"> -> </span>result:event, console:&:console, found?:bool, quit?:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> console - current-event-index:number<span class="Special"> <- </span>get *console, <span class="Constant">current-event-index:offset</span> - buf:address:array:event<span class="Special"> <- </span>get *console, <span class="Constant">events:offset</span> + current-event-index:num<span class="Special"> <- </span>get *console, <span class="Constant">current-event-index:offset</span> + buf:&:@:event<span class="Special"> <- </span>get *console, <span class="Constant">events:offset</span> <span class="Delimiter">{</span> - max:number<span class="Special"> <- </span>length *buf - done?:boolean<span class="Special"> <- </span>greater-or-equal current-event-index, max + max:num<span class="Special"> <- </span>length *buf + done?:bool<span class="Special"> <- </span>greater-or-equal current-event-index, max <span class="muControl">break-unless</span> done? - dummy:address:event<span class="Special"> <- </span>new <span class="Constant">event:type</span> + dummy:&:event<span class="Special"> <- </span>new <span class="Constant">event:type</span> <span class="muControl">return</span> *dummy, console/same-as-ingredient:<span class="Constant">0</span>, <span class="Constant">1/found</span>, <span class="Constant">1/quit</span> <span class="Delimiter">}</span> result<span class="Special"> <- </span>index *buf, current-event-index @@ -85,29 +85,29 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> result, console/same-as-ingredient:<span class="Constant">0</span>, <span class="Constant">1/found</span>, <span class="Constant">0/quit</span> <span class="Delimiter">}</span> switch <span class="Comment"># real event source is infrequent; avoid polling it too much</span> - result:event, found?:boolean<span class="Special"> <- </span>check-for-interaction + result:event, found?:bool<span class="Special"> <- </span>check-for-interaction <span class="muControl">return</span> result, console/same-as-ingredient:<span class="Constant">0</span>, found?, <span class="Constant">0/quit</span> ] <span class="Comment"># variant of read-event for just keyboard events. Discards everything that</span> <span class="Comment"># isn't unicode, so no arrow keys, page-up/page-down, etc. But you still get</span> <span class="Comment"># newlines, tabs, ctrl-d..</span> -<span class="muRecipe">def</span> read-key console:address:console<span class="muRecipe"> -> </span>result:character, console:address:console, found?:boolean, quit?:boolean [ +<span class="muRecipe">def</span> read-key console:&:console<span class="muRecipe"> -> </span>result:char, console:&:console, found?:bool, quit?:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - x:event, console, found?:boolean, quit?:boolean<span class="Special"> <- </span>read-event console + x:event, console, found?:bool, quit?:bool<span class="Special"> <- </span>read-event console <span class="muControl">return-if</span> quit?, <span class="Constant">0</span>, console/same-as-ingredient:<span class="Constant">0</span>, found?, quit? <span class="muControl">return-unless</span> found?, <span class="Constant">0</span>, console/same-as-ingredient:<span class="Constant">0</span>, found?, quit? - c:character, converted?:boolean<span class="Special"> <- </span>maybe-convert x, <span class="Constant">text:variant</span> + c:char, converted?:bool<span class="Special"> <- </span>maybe-convert x, <span class="Constant">text:variant</span> <span class="muControl">return-unless</span> converted?, <span class="Constant">0</span>, console/same-as-ingredient:<span class="Constant">0</span>, <span class="Constant">0/found</span>, <span class="Constant">0/quit</span> <span class="muControl">return</span> c, console/same-as-ingredient:<span class="Constant">0</span>, <span class="Constant">1/found</span>, <span class="Constant">0/quit</span> ] -<span class="muRecipe">def</span> send-keys-to-channel console:address:console, chan:address:sink:character, screen:address:screen<span class="muRecipe"> -> </span>console:address:console, chan:address:sink:character, screen:address:screen [ +<span class="muRecipe">def</span> send-keys-to-channel console:&:console, chan:&:sink:char, screen:&:screen<span class="muRecipe"> -> </span>console:&:console, chan:&:sink:char, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> - c:character, console, found?:boolean, quit?:boolean<span class="Special"> <- </span>read-key console + c:char, console, found?:bool, quit?:bool<span class="Special"> <- </span>read-key console <span class="muControl">loop-unless</span> found? <span class="muControl">break-if</span> quit? assert c, <span class="Constant">[invalid event, expected text]</span> @@ -118,17 +118,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color chan<span class="Special"> <- </span>close chan ] -<span class="muRecipe">def</span> wait-for-event console:address:console<span class="muRecipe"> -> </span>console:address:console [ +<span class="muRecipe">def</span> wait-for-event console:&:console<span class="muRecipe"> -> </span>console:&:console [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> - _, console, found?:boolean<span class="Special"> <- </span>read-event console + _, console, found?:bool<span class="Special"> <- </span>read-event console <span class="muControl">loop-unless</span> found? <span class="Delimiter">}</span> ] <span class="Comment"># use this helper to skip rendering if there's lots of other events queued up</span> -<span class="muRecipe">def</span> has-more-events? console:address:console<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> has-more-events? console:&:console<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> diff --git a/html/085scenario_console.cc.html b/html/085scenario_console.cc.html index fec10788..85303787 100644 --- a/html/085scenario_console.cc.html +++ b/html/085scenario_console.cc.html @@ -48,10 +48,10 @@ scenario keyboard-in-scenario [ type [abc] ] run [ - <span class="Constant">1</span>:character<span class="Delimiter">,</span> console:address:console<span class="Delimiter">,</span> <span class="Constant">2</span>:boolean<span class="Special"> <- </span>read-key console:address:console - <span class="Constant">3</span>:character<span class="Delimiter">,</span> console:address:console<span class="Delimiter">,</span> <span class="Constant">4</span>:boolean<span class="Special"> <- </span>read-key console:address:console - <span class="Constant">5</span>:character<span class="Delimiter">,</span> console:address:console<span class="Delimiter">,</span> <span class="Constant">6</span>:boolean<span class="Special"> <- </span>read-key console:address:console - <span class="Constant">7</span>:character<span class="Delimiter">,</span> console:address:console<span class="Delimiter">,</span> <span class="Constant">8</span>:boolean<span class="Delimiter">,</span> <span class="Constant">9</span>:boolean<span class="Special"> <- </span>read-key console:address:console + <span class="Constant">1</span>:<span class="Normal">char</span><span class="Delimiter">,</span> console:&:console<span class="Delimiter">,</span> <span class="Constant">2</span>:<span class="Normal">bool</span><span class="Special"> <- </span>read-key console:&:console + <span class="Constant">3</span>:<span class="Normal">char</span><span class="Delimiter">,</span> console:&:console<span class="Delimiter">,</span> <span class="Constant">4</span>:<span class="Normal">bool</span><span class="Special"> <- </span>read-key console:&:console + <span class="Constant">5</span>:<span class="Normal">char</span><span class="Delimiter">,</span> console:&:console<span class="Delimiter">,</span> <span class="Constant">6</span>:<span class="Normal">bool</span><span class="Special"> <- </span>read-key console:&:console + <span class="Constant">7</span>:<span class="Normal">char</span><span class="Delimiter">,</span> console:&:console<span class="Delimiter">,</span> <span class="Constant">8</span>:<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Constant">9</span>:<span class="Normal">bool</span><span class="Special"> <- </span>read-key console:&:console ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">97</span> <span class="Comment"># 'a'</span> @@ -230,15 +230,15 @@ scenario events-in-scenario [ ] run [ <span class="Comment"># 3 keyboard events; each event occupies 4 locations</span> - <span class="Constant">1</span>:event<span class="Special"> <- </span>read-event console:address:console - <span class="Constant">5</span>:event<span class="Special"> <- </span>read-event console:address:console - <span class="Constant">9</span>:event<span class="Special"> <- </span>read-event console:address:console + <span class="Constant">1</span>:event<span class="Special"> <- </span>read-event console:&:console + <span class="Constant">5</span>:event<span class="Special"> <- </span>read-event console:&:console + <span class="Constant">9</span>:event<span class="Special"> <- </span>read-event console:&:console <span class="Comment"># mouse click</span> - <span class="Constant">13</span>:event<span class="Special"> <- </span>read-event console:address:console + <span class="Constant">13</span>:event<span class="Special"> <- </span>read-event console:&:console <span class="Comment"># non-character keycode</span> - <span class="Constant">17</span>:event<span class="Special"> <- </span>read-event console:address:console + <span class="Constant">17</span>:event<span class="Special"> <- </span>read-event console:&:console <span class="Comment"># final keyboard event</span> - <span class="Constant">21</span>:event<span class="Special"> <- </span>read-event console:address:console + <span class="Constant">21</span>:event<span class="Special"> <- </span>read-event console:&:console ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># 'text'</span> diff --git a/html/086scenario_console_test.mu.html b/html/086scenario_console_test.mu.html index d431548b..4f7fcee9 100644 --- a/html/086scenario_console_test.mu.html +++ b/html/086scenario_console_test.mu.html @@ -37,10 +37,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[abc]</span> ] run [ - <span class="Constant">1</span>:character, console:address:console, <span class="Constant">2</span>:boolean<span class="Special"> <- </span>read-key console:address:console - <span class="Constant">3</span>:character, console:address:console, <span class="Constant">4</span>:boolean<span class="Special"> <- </span>read-key console:address:console - <span class="Constant">5</span>:character, console:address:console, <span class="Constant">6</span>:boolean<span class="Special"> <- </span>read-key console:address:console - <span class="Constant">7</span>:character, console:address:console, <span class="Constant">8</span>:boolean<span class="Special"> <- </span>read-key console:address:console + <span class="Constant">1</span>:char, console:&:console, <span class="Constant">2</span>:bool<span class="Special"> <- </span>read-key console:&:console + <span class="Constant">3</span>:char, console:&:console, <span class="Constant">4</span>:bool<span class="Special"> <- </span>read-key console:&:console + <span class="Constant">5</span>:char, console:&:console, <span class="Constant">6</span>:bool<span class="Special"> <- </span>read-key console:&:console + <span class="Constant">7</span>:char, console:&:console, <span class="Constant">8</span>:bool<span class="Special"> <- </span>read-key console:&:console ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">97</span> <span class="Comment"># 'a'</span> diff --git a/html/087file.cc.html b/html/087file.cc.html index 052774d9..f8e0ad1e 100644 --- a/html/087file.cc.html +++ b/html/087file.cc.html @@ -52,7 +52,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'$open-file-for-reading' requires exactly one ingredient, but got '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of '$open-file-for-reading' should be a string, but got '"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> @@ -68,7 +68,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">}</span> <span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span class="Normal">case</span> _OPEN_FILE_FOR_READING: <span class="Delimiter">{</span> - string filename = read_mu_string<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> + string filename = read_mu_text<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> assert<span class="Delimiter">(</span><span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span><span class="Delimiter">)</span> >= <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">FILE</span>*<span class="Delimiter">));</span> <span class="Normal">FILE</span>* f = fopen<span class="Delimiter">(</span>filename<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> <span class="Constant">"r"</span><span class="Delimiter">);</span> <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> result = <span class="Normal">reinterpret_cast</span><<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>><span class="Delimiter">(</span>f<span class="Delimiter">);</span> @@ -87,7 +87,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'$open-file-for-writing' requires exactly one ingredient, but got '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of '$open-file-for-writing' should be a string, but got '"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> @@ -103,7 +103,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">}</span> <span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span class="Normal">case</span> _OPEN_FILE_FOR_WRITING: <span class="Delimiter">{</span> - string filename = read_mu_string<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> + string filename = read_mu_text<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> assert<span class="Delimiter">(</span><span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span><span class="Delimiter">)</span> >= <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">FILE</span>*<span class="Delimiter">));</span> <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> result = <span class="Normal">reinterpret_cast</span><<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>><span class="Delimiter">(</span>fopen<span class="Delimiter">(</span>filename<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> <span class="Constant">"w"</span><span class="Delimiter">));</span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> diff --git a/html/088file.mu.html b/html/088file.mu.html index 435e3439..091f18c4 100644 --- a/html/088file.mu.html +++ b/html/088file.mu.html @@ -35,7 +35,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># are thus easier to test.</span> <span class="muData">container</span> filesystem [ - data:address:array:file-mapping + data:&:@:file-mapping ] <span class="muData">container</span> file-mapping [ @@ -43,31 +43,31 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color contents:text ] -<span class="muRecipe">def</span> start-reading fs:address:filesystem, filename:text<span class="muRecipe"> -> </span>contents:address:source:character [ +<span class="muRecipe">def</span> start-reading fs:&:filesystem, filename:text<span class="muRecipe"> -> </span>contents:&:source:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> fs <span class="Comment"># real file system</span> - file:number<span class="Special"> <- </span>$open-file-for-reading filename + file:num<span class="Special"> <- </span>$open-file-for-reading filename assert file, <span class="Constant">[file not found]</span> - contents:address:source:character, sink:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">30</span> + contents:&:source:char, sink:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">30</span> start-running transmit-from-file file, sink <span class="muControl">return</span> <span class="Delimiter">}</span> <span class="Comment"># fake file system</span> - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - data:address:array:file-mapping<span class="Special"> <- </span>get *fs, <span class="Constant">data:offset</span> - len:number<span class="Special"> <- </span>length *data + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + data:&:@:file-mapping<span class="Special"> <- </span>get *fs, <span class="Constant">data:offset</span> + len:num<span class="Special"> <- </span>length *data <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? tmp:file-mapping<span class="Special"> <- </span>index *data, i i<span class="Special"> <- </span>add i, <span class="Constant">1</span> curr-filename:text<span class="Special"> <- </span>get tmp, <span class="Constant">name:offset</span> - found?:boolean<span class="Special"> <- </span>equal filename, curr-filename + found?:bool<span class="Special"> <- </span>equal filename, curr-filename <span class="muControl">loop-unless</span> found? - contents:address:source:character, sink:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">30</span> + contents:&:source:char, sink:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">30</span> curr-contents:text<span class="Special"> <- </span>get tmp, <span class="Constant">contents:offset</span> start-running transmit-from-text curr-contents, sink <span class="muControl">return</span> @@ -75,11 +75,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> <span class="Constant">0/not-found</span> ] -<span class="muRecipe">def</span> transmit-from-file file:number, sink:address:sink:character<span class="muRecipe"> -> </span>sink:address:sink:character [ +<span class="muRecipe">def</span> transmit-from-file file:num, sink:&:sink:char<span class="muRecipe"> -> </span>sink:&:sink:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> - c:character, eof?:boolean<span class="Special"> <- </span>$read-from-file file + c:char, eof?:bool<span class="Special"> <- </span>$read-from-file file <span class="muControl">break-if</span> eof? sink<span class="Special"> <- </span>write sink, c <span class="muControl">loop</span> @@ -88,15 +88,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color file<span class="Special"> <- </span>$close-file file ] -<span class="muRecipe">def</span> transmit-from-text contents:text, sink:address:sink:character<span class="muRecipe"> -> </span>sink:address:sink:character [ +<span class="muRecipe">def</span> transmit-from-text contents:text, sink:&:sink:char<span class="muRecipe"> -> </span>sink:&:sink:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - len:number<span class="Special"> <- </span>length *contents + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + len:num<span class="Special"> <- </span>length *contents <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? - c:character<span class="Special"> <- </span>index *contents, i + c:char<span class="Special"> <- </span>index *contents, i sink<span class="Special"> <- </span>write sink, c i<span class="Special"> <- </span>add i, <span class="Constant">1</span> <span class="muControl">loop</span> @@ -104,14 +104,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color sink<span class="Special"> <- </span>close sink ] -<span class="muRecipe">def</span> start-writing fs:address:filesystem, filename:text<span class="muRecipe"> -> </span>sink:address:sink:character, routine-id:number [ +<span class="muRecipe">def</span> start-writing fs:&:filesystem, filename:text<span class="muRecipe"> -> </span>sink:&:sink:char, routine-id:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - source:address:source:character, sink:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">30</span> + source:&:source:char, sink:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">30</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> fs <span class="Comment"># real file system</span> - file:number<span class="Special"> <- </span>$open-file-for-writing filename + file:num<span class="Special"> <- </span>$open-file-for-writing filename assert file, <span class="Constant">[no such file]</span> routine-id<span class="Special"> <- </span>start-running transmit-to-file file, source <span class="muControl">reply</span> @@ -121,11 +121,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color routine-id<span class="Special"> <- </span>start-running transmit-to-fake-file fs, filename, source ] -<span class="muRecipe">def</span> transmit-to-file file:number, source:address:source:character<span class="muRecipe"> -> </span>source:address:source:character [ +<span class="muRecipe">def</span> transmit-to-file file:num, source:&:source:char<span class="muRecipe"> -> </span>source:&:source:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> - c:character, done?:boolean, source<span class="Special"> <- </span>read source + c:char, done?:bool, source<span class="Special"> <- </span>read source <span class="muControl">break-if</span> done? $write-to-file file, c <span class="muControl">loop</span> @@ -133,13 +133,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color file<span class="Special"> <- </span>$close-file file ] -<span class="muRecipe">def</span> transmit-to-fake-file fs:address:filesystem, filename:text, source:address:source:character<span class="muRecipe"> -> </span>fs:address:filesystem, source:address:source:character [ +<span class="muRecipe">def</span> transmit-to-fake-file fs:&:filesystem, filename:text, source:&:source:char<span class="muRecipe"> -> </span>fs:&:filesystem, source:&:source:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># compute new file contents</span> - buf:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> + buf:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> <span class="Delimiter">{</span> - c:character, done?:boolean, source<span class="Special"> <- </span>read source + c:char, done?:bool, source<span class="Special"> <- </span>read source <span class="muControl">break-if</span> done? buf<span class="Special"> <- </span>append buf, c <span class="muControl">loop</span> @@ -148,28 +148,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color new-file-mapping:file-mapping<span class="Special"> <- </span>merge filename, contents <span class="Comment"># write to filesystem</span> curr-filename:text<span class="Special"> <- </span>copy <span class="Constant">0</span> - data:address:array:file-mapping<span class="Special"> <- </span>get *fs, <span class="Constant">data:offset</span> + data:&:@:file-mapping<span class="Special"> <- </span>get *fs, <span class="Constant">data:offset</span> <span class="Comment"># replace file contents if it already exists</span> - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - len:number<span class="Special"> <- </span>length *data + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + len:num<span class="Special"> <- </span>length *data <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? tmp:file-mapping<span class="Special"> <- </span>index *data, i curr-filename<span class="Special"> <- </span>get tmp, <span class="Constant">name:offset</span> - found?:boolean<span class="Special"> <- </span>equal filename, curr-filename + found?:bool<span class="Special"> <- </span>equal filename, curr-filename <span class="muControl">loop-unless</span> found? put-index *data, i, new-file-mapping <span class="muControl">reply</span> <span class="Delimiter">}</span> <span class="Comment"># if file didn't already exist, make room for it</span> - new-len:number<span class="Special"> <- </span>add len, <span class="Constant">1</span> - new-data:address:array:file-mapping<span class="Special"> <- </span>new <span class="Constant">file-mapping:type</span>, new-len + new-len:num<span class="Special"> <- </span>add len, <span class="Constant">1</span> + new-data:&:@:file-mapping<span class="Special"> <- </span>new <span class="Constant">file-mapping:type</span>, new-len put *fs, <span class="Constant">data:offset</span>, new-data <span class="Comment"># copy over old files</span> - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? tmp:file-mapping<span class="Special"> <- </span>index *data, i put-index *new-data, i, tmp diff --git a/html/089scenario_filesystem.cc.html b/html/089scenario_filesystem.cc.html index f854cb6e..2d13d5ca 100644 --- a/html/089scenario_filesystem.cc.html +++ b/html/089scenario_filesystem.cc.html @@ -53,22 +53,22 @@ scenario assume-filesystem [ |xyz| ] ] - <span class="Normal">data</span>:address:array:file-mapping<span class="Special"> <- </span>get *filesystem:address:filesystem<span class="Delimiter">,</span> data:offset + <span class="Normal">data</span>:&:@:file-mapping<span class="Special"> <- </span>get *filesystem:&:filesystem<span class="Delimiter">,</span> data:offset <span class="Normal">file1</span>:file-mapping<span class="Special"> <- </span>index *data<span class="Delimiter">,</span> <span class="Constant">0</span> - file1-name:address:array:character<span class="Special"> <- </span>get file1<span class="Delimiter">,</span> name:offset - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *file1-name - file1-contents:address:array:character<span class="Special"> <- </span>get file1<span class="Delimiter">,</span> contents:offset - <span class="Constant">100</span>:array:character/<span class="Special">raw <- </span>copy *file1-contents + file1-name:text<span class="Special"> <- </span>get file1<span class="Delimiter">,</span> name:offset + <span class="Constant">10</span>:@:<span class="Normal">char</span>/<span class="Special">raw <- </span>copy *file1-name + file1-contents:text<span class="Special"> <- </span>get file1<span class="Delimiter">,</span> contents:offset + <span class="Constant">100</span>:@:<span class="Normal">char</span>/<span class="Special">raw <- </span>copy *file1-contents <span class="Normal">file2</span>:file-mapping<span class="Special"> <- </span>index *data<span class="Delimiter">,</span> <span class="Constant">1</span> - file2-name:address:array:character<span class="Special"> <- </span>get file2<span class="Delimiter">,</span> name:offset - <span class="Constant">30</span>:array:character/<span class="Special">raw <- </span>copy *file2-name - file2-contents:address:array:character<span class="Special"> <- </span>get file2<span class="Delimiter">,</span> contents:offset - <span class="Constant">40</span>:array:character/<span class="Special">raw <- </span>copy *file2-contents + file2-name:text<span class="Special"> <- </span>get file2<span class="Delimiter">,</span> name:offset + <span class="Constant">30</span>:@:<span class="Normal">char</span>/<span class="Special">raw <- </span>copy *file2-name + file2-contents:text<span class="Special"> <- </span>get file2<span class="Delimiter">,</span> contents:offset + <span class="Constant">40</span>:@:<span class="Normal">char</span>/<span class="Special">raw <- </span>copy *file2-contents <span class="Normal">file3</span>:file-mapping<span class="Special"> <- </span>index *data<span class="Delimiter">,</span> <span class="Constant">2</span> - file3-name:address:array:character<span class="Special"> <- </span>get file3<span class="Delimiter">,</span> name:offset - <span class="Constant">50</span>:array:character/<span class="Special">raw <- </span>copy *file3-name - file3-contents:address:array:character<span class="Special"> <- </span>get file3<span class="Delimiter">,</span> contents:offset - <span class="Constant">60</span>:array:character/<span class="Special">raw <- </span>copy *file3-contents + file3-name:text<span class="Special"> <- </span>get file3<span class="Delimiter">,</span> name:offset + <span class="Constant">50</span>:@:<span class="Normal">char</span>/<span class="Special">raw <- </span>copy *file3-name + file3-contents:text<span class="Special"> <- </span>get file3<span class="Delimiter">,</span> contents:offset + <span class="Constant">60</span>:@:<span class="Normal">char</span>/<span class="Special">raw <- </span>copy *file3-contents memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span>[a] <span class="Constant">100</span>:array:character<span class="Special"> <- </span>[a bc @@ -92,12 +92,12 @@ scenario assume-filesystem [ |x\\\\|yz| ] ] - <span class="Normal">data</span>:address:array:file-mapping<span class="Special"> <- </span>get *filesystem:address:filesystem<span class="Delimiter">,</span> data:offset + <span class="Normal">data</span>:&:@:file-mapping<span class="Special"> <- </span>get *filesystem:&:filesystem<span class="Delimiter">,</span> data:offset <span class="Normal">file1</span>:file-mapping<span class="Special"> <- </span>index *data<span class="Delimiter">,</span> <span class="Constant">0</span> - file1-name:address:array:character<span class="Special"> <- </span>get file1<span class="Delimiter">,</span> name:offset - <span class="Constant">10</span>:array:character/<span class="Special">raw <- </span>copy *file1-name - file1-contents:address:array:character<span class="Special"> <- </span>get file1<span class="Delimiter">,</span> contents:offset - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *file1-contents + file1-name:text<span class="Special"> <- </span>get file1<span class="Delimiter">,</span> name:offset + <span class="Constant">10</span>:@:<span class="Normal">char</span>/<span class="Special">raw <- </span>copy *file1-name + file1-contents:text<span class="Special"> <- </span>get file1<span class="Delimiter">,</span> contents:offset + <span class="Constant">20</span>:@:<span class="Normal">char</span>/<span class="Special">raw <- </span>copy *file1-contents memory-should-contain [ <span class="Constant">10</span>:array:character<span class="Special"> <- </span>[a] <span class="Constant">20</span>:array:character<span class="Special"> <- </span>[x|yz @@ -224,12 +224,12 @@ string munge_filesystem_contents<span class="Delimiter">(</span><span class="Nor <span class="Normal">int</span> filesystem_data_address = allocate<span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>contents<span class="Delimiter">)</span>*<span class="Constant">2</span> + <span class="Comment">/*</span><span class="Comment">array length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span> <span class="Normal">int</span> curr = filesystem_data_address + <span class="Comment">/*</span><span class="Comment">skip refcount and length</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> string>::const_iterator p = contents<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != contents<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> - put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> new_mu_string<span class="Delimiter">(</span>p<span class="Delimiter">-></span>first<span class="Delimiter">));</span> + put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> new_mu_text<span class="Delimiter">(</span>p<span class="Delimiter">-></span>first<span class="Delimiter">));</span> trace<span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"storing file name "</span> << get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> << <span class="Constant">" in location "</span> << curr << end<span class="Delimiter">();</span> put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span> trace<span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"storing refcount 1 in location "</span> << get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> ++curr<span class="Delimiter">;</span> - put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> new_mu_string<span class="Delimiter">(</span>p<span class="Delimiter">-></span>second<span class="Delimiter">));</span> + put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> new_mu_text<span class="Delimiter">(</span>p<span class="Delimiter">-></span>second<span class="Delimiter">));</span> trace<span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"storing file contents "</span> << get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> << <span class="Constant">" in location "</span> << curr << end<span class="Delimiter">();</span> put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span> trace<span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"storing refcount 1 in location "</span> << get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> diff --git a/html/090scenario_filesystem_test.mu.html b/html/090scenario_filesystem_test.mu.html index 094f5e5d..0832ab96 100644 --- a/html/090scenario_filesystem_test.mu.html +++ b/html/090scenario_filesystem_test.mu.html @@ -40,12 +40,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> |xyz|</span> ] ] - contents:address:source:character<span class="Special"> <- </span>start-reading filesystem:address:filesystem, <span class="Constant">[a]</span> - <span class="Constant">1</span>:character/<span class="Special">raw <- </span>read contents - <span class="Constant">2</span>:character/<span class="Special">raw <- </span>read contents - <span class="Constant">3</span>:character/<span class="Special">raw <- </span>read contents - <span class="Constant">4</span>:character/<span class="Special">raw <- </span>read contents - _, <span class="Constant">5</span>:boolean/<span class="Special">raw <- </span>read contents + contents:&:source:char<span class="Special"> <- </span>start-reading filesystem:&:filesystem, <span class="Constant">[a]</span> + <span class="Constant">1</span>:char/<span class="Special">raw <- </span>read contents + <span class="Constant">2</span>:char/<span class="Special">raw <- </span>read contents + <span class="Constant">3</span>:char/<span class="Special">raw <- </span>read contents + <span class="Constant">4</span>:char/<span class="Special">raw <- </span>read contents + _, <span class="Constant">5</span>:bool/<span class="Special">raw <- </span>read contents memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">120</span> <span class="Comment"># x</span> <span class="Constant">2</span><span class="Special"> <- </span><span class="Constant">121</span> <span class="Comment"># y</span> @@ -59,13 +59,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> assume-filesystem [ ] - sink:address:sink:character, writer:number/routine<span class="Special"> <- </span>start-writing filesystem:address:filesystem, <span class="Constant">[a]</span> + sink:&:sink:char, writer:num/routine<span class="Special"> <- </span>start-writing filesystem:&:filesystem, <span class="Constant">[a]</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">120/x</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">121/y</span> close sink wait-for-routine writer contents-read-back:text<span class="Special"> <- </span>slurp filesystem, <span class="Constant">[a]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal contents-read-back, <span class="Constant">[xy]</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal contents-read-back, <span class="Constant">[xy]</span> memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># file contents read back exactly match what was written</span> ] @@ -76,13 +76,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-filesystem [ <span class="Constant">[a]</span><span class="Special"> <- </span><span class="Constant">[]</span> ] - sink:address:sink:character, writer:number/routine<span class="Special"> <- </span>start-writing filesystem:address:filesystem, <span class="Constant">[a]</span> + sink:&:sink:char, writer:num/routine<span class="Special"> <- </span>start-writing filesystem:&:filesystem, <span class="Constant">[a]</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">120/x</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">121/y</span> close sink wait-for-routine writer contents-read-back:text<span class="Special"> <- </span>slurp filesystem, <span class="Constant">[a]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal contents-read-back, <span class="Constant">[xy]</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal contents-read-back, <span class="Constant">[xy]</span> memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># file contents read back exactly match what was written</span> ] @@ -96,15 +96,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> |bcd|</span> ] ] - sink:address:sink:character, writer:number/routine<span class="Special"> <- </span>start-writing filesystem:address:filesystem, <span class="Constant">[a]</span> + sink:&:sink:char, writer:num/routine<span class="Special"> <- </span>start-writing filesystem:&:filesystem, <span class="Constant">[a]</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">120/x</span> sink<span class="Special"> <- </span>write sink, <span class="Constant">121/y</span> close sink wait-for-routine writer contents-read-back:text<span class="Special"> <- </span>slurp filesystem, <span class="Constant">[a]</span> - <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal contents-read-back, <span class="Constant">[xy]</span> + <span class="Constant">10</span>:bool/<span class="Special">raw <- </span>equal contents-read-back, <span class="Constant">[xy]</span> other-file-contents:text<span class="Special"> <- </span>slurp filesystem, <span class="Constant">[b]</span> - <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>equal other-file-contents, <span class="Constant">[bcd</span> + <span class="Constant">11</span>:bool/<span class="Special">raw <- </span>equal other-file-contents, <span class="Constant">[bcd</span> <span class="Constant">]</span> memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># file contents read back exactly match what was written</span> @@ -112,13 +112,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -<span class="muRecipe">def</span> slurp fs:address:filesystem, filename:text<span class="muRecipe"> -> </span>contents:text [ +<span class="muRecipe">def</span> slurp fs:&:filesystem, filename:text<span class="muRecipe"> -> </span>contents:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - source:address:source:character<span class="Special"> <- </span>start-reading fs, filename - buf:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30/capacity</span> + source:&:source:char<span class="Special"> <- </span>start-reading fs, filename + buf:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30/capacity</span> <span class="Delimiter">{</span> - c:character, done?:boolean, source<span class="Special"> <- </span>read source + c:char, done?:bool, source<span class="Special"> <- </span>read source <span class="muControl">break-if</span> done? buf<span class="Special"> <- </span>append buf, c <span class="muControl">loop</span> diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html index bf39a10e..e12ec509 100644 --- a/html/101run_sandboxed.cc.html +++ b/html/101run_sandboxed.cc.html @@ -38,17 +38,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">:(scenario run_interactive_code)</span> def main [ - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>copy <span class="Constant">0</span> - <span class="Constant">2</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [<span class="Constant">1</span>:number/<span class="Special">raw <- </span>copy <span class="Constant">34</span>] - run-sandboxed <span class="Constant">2</span>:address:array:character - <span class="Constant">3</span>:number/<span class="Special">raw <- </span>copy <span class="Constant">1</span>:number/<span class="Special">raw</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">0</span> + <span class="Constant">2</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [<span class="Constant">1</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">34</span>] + run-sandboxed <span class="Constant">2</span>:text + <span class="Constant">3</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">1</span>:num/<span class="Special">raw</span> ] <span class="traceContains">+mem: storing 34 in location 3</span> <span class="Delimiter">:(scenario run_interactive_empty)</span> def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe - <span class="Constant">2</span>:address:array:character<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:address:array:character + <span class="Constant">1</span>:text<span class="Special"> <- </span>copy <span class="Constant">0</span>/unsafe + <span class="Constant">2</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text ] <span class="Comment"># result is null</span> <span class="traceContains">+mem: storing 0 in location 2</span> @@ -79,7 +79,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'run-sandboxed' requires exactly one ingredient, but got '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of 'run-sandboxed' should be a string, but got '"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> @@ -130,7 +130,7 @@ string Save_trace_file<span class="Delimiter">;</span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">1</span><span class="Delimiter">;</span> i < Reserved_for_tests<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> Memory<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span class="Delimiter">}</span> - string command = trim<span class="Delimiter">(</span>strip_comments<span class="Delimiter">(</span>read_mu_string<span class="Delimiter">(</span>address<span class="Delimiter">)));</span> + string command = trim<span class="Delimiter">(</span>strip_comments<span class="Delimiter">(</span>read_mu_text<span class="Delimiter">(</span>address<span class="Delimiter">)));</span> Name[get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"interactive"</span><span class="Delimiter">)</span>]<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> run_code_begin<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">should_stash_snapshots</span><span class="Comment">*/</span><span class="Constant">true</span><span class="Delimiter">);</span> <span class="Normal">if</span> <span class="Delimiter">(</span>command<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> @@ -140,7 +140,7 @@ string Save_trace_file<span class="Delimiter">;</span> <span class="Comment">// call run(string) but without the scheduling</span> load<span class="Delimiter">(</span>string<span class="Delimiter">(</span><span class="Constant">"recipe! interactive [</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">)</span> + <span class="Constant">"new-default-space</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Comment">// disable automatic abandon so tests can see changes</span> - <span class="Constant">"screen:address:screen <- next-ingredient</span><span class="cSpecial">\n</span><span class="Constant">"</span> + + <span class="Constant">"screen:&:screen <- next-ingredient</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">"$start-tracking-products</span><span class="cSpecial">\n</span><span class="Constant">"</span> + command + <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">"$stop-tracking-products</span><span class="cSpecial">\n</span><span class="Constant">"</span> + @@ -229,17 +229,17 @@ load<span class="Delimiter">(</span>string<span class="Delimiter">(</span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">"recipe sandbox [</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">"local-scope</span><span class="cSpecial">\n</span><span class="Constant">"</span> + - <span class="Constant">"screen:address:screen <- new-fake-screen 30, 5</span><span class="cSpecial">\n</span><span class="Constant">"</span> + - <span class="Constant">"routine-id:number <- start-running interactive, screen</span><span class="cSpecial">\n</span><span class="Constant">"</span> + + <span class="Constant">"screen:&:screen <- new-fake-screen 30, 5</span><span class="cSpecial">\n</span><span class="Constant">"</span> + + <span class="Constant">"routine-id:num <- start-running interactive, screen</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">"limit-time routine-id, 100000/instructions</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">"wait-for-routine routine-id</span><span class="cSpecial">\n</span><span class="Constant">"</span> + - <span class="Constant">"instructions-run:number <- number-of-instructions routine-id</span><span class="cSpecial">\n</span><span class="Constant">"</span> + + <span class="Constant">"instructions-run:num <- number-of-instructions routine-id</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">"stash instructions-run [instructions run]</span><span class="cSpecial">\n</span><span class="Constant">"</span> + - <span class="Constant">"sandbox-state:number <- routine-state routine-id</span><span class="cSpecial">\n</span><span class="Constant">"</span> + - <span class="Constant">"completed?:boolean <- equal sandbox-state, 1/completed</span><span class="cSpecial">\n</span><span class="Constant">"</span> + - <span class="Constant">"output:address:array:character <- $most-recent-products</span><span class="cSpecial">\n</span><span class="Constant">"</span> + - <span class="Constant">"errors:address:array:character <- save-errors</span><span class="cSpecial">\n</span><span class="Constant">"</span> + - <span class="Constant">"stashes:address:array:character <- save-app-trace</span><span class="cSpecial">\n</span><span class="Constant">"</span> + + <span class="Constant">"sandbox-state:num <- routine-state routine-id</span><span class="cSpecial">\n</span><span class="Constant">"</span> + + <span class="Constant">"completed?:bool <- equal sandbox-state, 1/completed</span><span class="cSpecial">\n</span><span class="Constant">"</span> + + <span class="Constant">"output:text <- $most-recent-products</span><span class="cSpecial">\n</span><span class="Constant">"</span> + + <span class="Constant">"errors:text <- save-errors</span><span class="cSpecial">\n</span><span class="Constant">"</span> + + <span class="Constant">"stashes:text <- save-app-trace</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">"$cleanup-run-sandboxed</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">"return output, errors, screen, stashes, completed?</span><span class="cSpecial">\n</span><span class="Constant">"</span> + <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> @@ -250,10 +250,10 @@ load<span class="Delimiter">(</span>string<span class="Delimiter">(</span> <span class="Delimiter">:(scenario run_interactive_comments)</span> def main [ - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [<span class="Comment"># ab</span> + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [<span class="Comment"># ab</span> add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span>] - <span class="Constant">2</span>:address:array:character<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:address:array:character - <span class="Constant">3</span>:array:character<span class="Special"> <- </span>copy *<span class="Constant">2</span>:address:array:character + <span class="Constant">2</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text + <span class="Constant">3</span>:@:<span class="Normal">char</span><span class="Special"> <- </span>copy *<span class="Constant">2</span>:text ] <span class="traceContains">+mem: storing 52 in location 4</span> @@ -296,7 +296,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span class="Normal">case</span> _MOST_RECENT_PRODUCTS: <span class="Delimiter">{</span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> - products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>new_mu_string<span class="Delimiter">(</span>Most_recent_products<span class="Delimiter">));</span> + products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>new_mu_text<span class="Delimiter">(</span>Most_recent_products<span class="Delimiter">));</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> @@ -347,9 +347,9 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario "run_interactive_converts_result_to_text")</span> def main [ <span class="Comment"># try to interactively add 2 and 2</span> - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span>] - <span class="Constant">2</span>:address:array:character<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:address:array:character - <span class="Constant">10</span>:array:character<span class="Special"> <- </span>copy <span class="Constant">2</span>:address:array:character/lookup + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [add <span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">2</span>] + <span class="Constant">2</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text + <span class="Constant">10</span>:@:<span class="Normal">char</span><span class="Special"> <- </span>copy <span class="Constant">2</span>:text/lookup ] <span class="Comment"># first letter in the output should be '4' in unicode</span> <span class="traceContains">+mem: storing 52 in location 11</span> @@ -357,13 +357,13 @@ def main [ <span class="Delimiter">:(scenario "run_interactive_returns_text")</span> def main [ <span class="Comment"># try to interactively add 2 and 2</span> - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [ - <span class="Normal">x</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [a] - <span class="Normal">y</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [b] - <span class="Normal">z</span>:address:array:character<span class="Special"> <- </span>append x:address:array:character<span class="Delimiter">,</span> y:address:array:character + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [ + <span class="Normal">x</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [a] + <span class="Normal">y</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [b] + <span class="Normal">z</span>:text<span class="Special"> <- </span>append x:text<span class="Delimiter">,</span> y:text ] - <span class="Constant">2</span>:address:array:character<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:address:array:character - <span class="Constant">10</span>:array:character<span class="Special"> <- </span>copy <span class="Constant">2</span>:address:array:character/lookup + <span class="Constant">2</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text + <span class="Constant">10</span>:@:<span class="Normal">char</span><span class="Special"> <- </span>copy <span class="Constant">2</span>:text/lookup ] <span class="Comment"># output contains "ab"</span> <span class="traceContains">+mem: storing 97 in location 11</span> @@ -372,10 +372,10 @@ def main [ <span class="Delimiter">:(scenario "run_interactive_returns_errors")</span> def main [ <span class="Comment"># run a command that generates an error</span> - <span class="Constant">1</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [x:number<span class="Special"> <- </span>copy <span class="Constant">34</span> -get x:number<span class="Delimiter">,</span> foo:offset] - <span class="Constant">2</span>:address:array:character<span class="Delimiter">,</span> <span class="Constant">3</span>:address:array:character<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:address:array:character - <span class="Constant">10</span>:array:character<span class="Special"> <- </span>copy <span class="Constant">3</span>:address:array:character/lookup + <span class="Constant">1</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [x:num<span class="Special"> <- </span>copy <span class="Constant">34</span> +get x:num<span class="Delimiter">,</span> foo:offset] + <span class="Constant">2</span>:text<span class="Delimiter">,</span> <span class="Constant">3</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text + <span class="Constant">10</span>:@:<span class="Normal">char</span><span class="Special"> <- </span>copy <span class="Constant">3</span>:text/lookup ] <span class="Comment"># error should be "unknown element foo in container number"</span> <span class="traceContains">+mem: storing 117 in location 11</span> @@ -387,10 +387,10 @@ get x:number<span class="Delimiter">,</span> foo:offset] <span class="Delimiter">:(scenario run_interactive_with_comment)</span> def main [ <span class="Comment"># 2 instructions, with a comment after the first</span> - <span class="Constant">1</span>:address:array:number<span class="Special"> <- </span><span class="Normal">new</span> [a:number<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># abc</span> -<span class="Normal">b</span>:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + <span class="Constant">1</span>:&:@:num<span class="Special"> <- </span><span class="Normal">new</span> [a:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># abc</span> +<span class="Normal">b</span>:num<span class="Special"> <- </span>copy <span class="Constant">0</span> ] - <span class="Constant">2</span>:address:array:character<span class="Delimiter">,</span> <span class="Constant">3</span>:address:array:character<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:address:array:character + <span class="Constant">2</span>:text<span class="Delimiter">,</span> <span class="Constant">3</span>:text<span class="Special"> <- </span>run-sandboxed <span class="Constant">1</span>:text ] <span class="Comment"># no errors</span> <span class="traceContains">+mem: storing 0 in location 3</span> @@ -414,9 +414,9 @@ def main [ <span class="Comment">// x:text <- new [abc]</span> <span class="Comment">// => abc</span> <span class="Normal">if</span> <span class="Delimiter">(</span>i < SIZE<span class="Delimiter">(</span>instruction<span class="Delimiter">.</span>products<span class="Delimiter">))</span> <span class="Delimiter">{</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_string<span class="Delimiter">(</span>instruction<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_text<span class="Delimiter">(</span>instruction<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!scalar<span class="Delimiter">(</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// error handled elsewhere</span> - out << read_mu_string<span class="Delimiter">(</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> + out << read_mu_text<span class="Delimiter">(</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> <span class="Delimiter">}</span> @@ -446,7 +446,7 @@ string strip_comments<span class="Delimiter">(</span>string in<span class="Delim <span class="Comment">// convert to string</span> ostringstream out<span class="Delimiter">;</span> out << no_scientific<span class="Delimiter">(</span>get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">));</span> - <span class="Identifier">return</span> new_mu_string<span class="Delimiter">(</span>out<span class="Delimiter">.</span>str<span class="Delimiter">());</span> + <span class="Identifier">return</span> new_mu_text<span class="Delimiter">(</span>out<span class="Delimiter">.</span>str<span class="Delimiter">());</span> <span class="Delimiter">}</span> <span class="Normal">int</span> trace_error_contents<span class="Delimiter">()</span> <span class="Delimiter">{</span> @@ -460,7 +460,7 @@ string strip_comments<span class="Delimiter">(</span>string in<span class="Delim string result = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> truncate<span class="Delimiter">(</span>result<span class="Delimiter">);</span> - <span class="Identifier">return</span> new_mu_string<span class="Delimiter">(</span>result<span class="Delimiter">);</span> + <span class="Identifier">return</span> new_mu_text<span class="Delimiter">(</span>result<span class="Delimiter">);</span> <span class="Delimiter">}</span> <span class="Normal">int</span> trace_app_contents<span class="Delimiter">()</span> <span class="Delimiter">{</span> @@ -474,7 +474,7 @@ string strip_comments<span class="Delimiter">(</span>string in<span class="Delim string result = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> truncate<span class="Delimiter">(</span>result<span class="Delimiter">);</span> - <span class="Identifier">return</span> new_mu_string<span class="Delimiter">(</span>result<span class="Delimiter">);</span> + <span class="Identifier">return</span> new_mu_text<span class="Delimiter">(</span>result<span class="Delimiter">);</span> <span class="Delimiter">}</span> <span class="Normal">void</span> truncate<span class="Delimiter">(</span>string& x<span class="Delimiter">)</span> <span class="Delimiter">{</span> @@ -499,7 +499,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'reload' requires exactly one ingredient, but got '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of 'reload' should be a string, but got '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> @@ -518,7 +518,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span Recipe_variants = Recipe_variants_snapshot<span class="Delimiter">;</span> Name = Name_snapshot<span class="Delimiter">;</span> <span class="Comment">// }</span> - string code = read_mu_string<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> + string code = read_mu_text<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> run_code_begin<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">should_stash_snapshots</span><span class="Comment">*/</span><span class="Constant">false</span><span class="Delimiter">);</span> routine* save_current_routine = Current_routine<span class="Delimiter">;</span> Current_routine = <span class="Constant">NULL</span><span class="Delimiter">;</span> @@ -537,11 +537,11 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(scenario reload_continues_past_error)</span> def main [ local-scope - <span class="Normal">x</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [recipe foo [ - get <span class="Constant">1234</span>:number<span class="Delimiter">,</span> foo:offset + <span class="Normal">x</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [recipe foo [ + get <span class="Constant">1234</span>:num<span class="Delimiter">,</span> foo:offset ]] reload x - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>copy <span class="Constant">34</span> + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>copy <span class="Constant">34</span> ] <span class="traceContains">+mem: storing 34 in location 1</span> @@ -549,10 +549,10 @@ def main [ <span class="Comment"># define a container and try to create it (merge requires knowing container size)</span> def main [ local-scope - <span class="Normal">x</span>:address:array:character<span class="Special"> <- </span><span class="Normal">new</span> [ + <span class="Normal">x</span>:text<span class="Special"> <- </span><span class="Normal">new</span> [ container foo [ - <span class="Normal">x</span>:number - <span class="Normal">y</span>:number + <span class="Normal">x</span>:num + <span class="Normal">y</span>:num ] recipe bar [ local-scope @@ -560,8 +560,8 @@ def main [ ] ] <span class="Comment"># save warning addresses in locations of type 'number' to avoid spurious changes to them due to 'abandon'</span> - <span class="Constant">1</span>:number/<span class="Special">raw <- </span>reload x - <span class="Constant">2</span>:number/<span class="Special">raw <- </span>reload x + <span class="Constant">1</span>:num/<span class="Special">raw <- </span>reload x + <span class="Constant">2</span>:num/<span class="Special">raw <- </span>reload x ] <span class="Comment"># no errors on either load</span> <span class="traceContains">+mem: storing 0 in location 1</span> diff --git a/html/102persist.cc.html b/html/102persist.cc.html index d16622e4..76437a6d 100644 --- a/html/102persist.cc.html +++ b/html/102persist.cc.html @@ -45,10 +45,10 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> string filename<span class="Delimiter">;</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> <span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> <span class="Delimiter">;</span> <span class="Delimiter">}</span> <span class="Normal">else</span> <span class="Delimiter">{</span> @@ -60,11 +60,11 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> <span class="Normal">case</span> RESTORE: <span class="Delimiter">{</span> string filename<span class="Delimiter">;</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_text<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> filename = current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> - filename = read_mu_string<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> + <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_text<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + filename = read_mu_text<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> <span class="Delimiter">}</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Current_scenario<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Comment">// do nothing in tests</span> @@ -77,7 +77,7 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Normal">if</span> <span class="Delimiter">(</span>contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> <span class="Normal">else</span> - products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>new_mu_string<span class="Delimiter">(</span>contents<span class="Delimiter">));</span> + products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>new_mu_text<span class="Delimiter">(</span>contents<span class="Delimiter">));</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> @@ -103,18 +103,18 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"'save' requires exactly two ingredients, but got '"</span> << inst<span class="Delimiter">.</span>original_string << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> <span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> <span class="Delimiter">;</span> <span class="Delimiter">}</span> <span class="Normal">else</span> <span class="Delimiter">{</span> raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"first ingredient of 'save' should be a string, but got '"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> - raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"second ingredient of 'save' should be an address:array:character, but got '"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">))</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + raise << maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> << <span class="Constant">"second ingredient of 'save' should be an address:@:char, but got '"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">))</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Delimiter">}</span> <span class="Identifier">break</span><span class="Delimiter">;</span> @@ -123,14 +123,14 @@ put<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span <span class="Normal">case</span> SAVE: <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Current_scenario<span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Comment">// do nothing in tests</span> string filename<span class="Delimiter">;</span> - <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal_text<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> filename = current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">;</span> <span class="Delimiter">}</span> - <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> - filename = read_mu_string<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> + <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_text<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> + filename = read_mu_text<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> <span class="Delimiter">}</span> ofstream fout<span class="Delimiter">((</span><span class="Constant">"lesson/"</span>+filename<span class="Delimiter">).</span>c_str<span class="Delimiter">());</span> - string contents = read_mu_string<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> + string contents = read_mu_text<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> fout << contents<span class="Delimiter">;</span> fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!exists<span class="Delimiter">(</span><span class="Constant">"lesson/.git"</span><span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span> diff --git a/html/channel.mu.html b/html/channel.mu.html index afe84b31..f03f05d2 100644 --- a/html/channel.mu.html +++ b/html/channel.mu.html @@ -32,12 +32,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <pre id='vimCodeElement'> <span class="Comment"># example program: communicating between routines using channels</span> -<span class="muRecipe">def</span> producer sink:address:sink:character<span class="muRecipe"> -> </span>sink:address:sink:character [ +<span class="muRecipe">def</span> producer sink:&:sink:char<span class="muRecipe"> -> </span>sink:&:sink:char [ <span class="Comment"># produce characters 1 to 5 on a channel</span> <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># n = 0</span> - n:character<span class="Special"> <- </span>copy <span class="Constant">0</span> + n:char<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> done?:boolean<span class="Special"> <- </span>lesser-than n, <span class="Constant">5</span> <span class="muControl">break-unless</span> done? @@ -51,16 +51,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color close sink ] -<span class="muRecipe">def</span> consumer source:address:source:character<span class="muRecipe"> -> </span>source:address:source:character [ +<span class="muRecipe">def</span> consumer source:&:source:char<span class="muRecipe"> -> </span>source:&:source:char [ <span class="Comment"># consume and print integers from a channel</span> <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> <span class="Comment"># read an integer from the channel</span> - n:character, eof?:boolean, source<span class="Special"> <- </span>read source + n:char, eof?:boolean, source<span class="Special"> <- </span>read source <span class="muControl">break-if</span> eof? <span class="Comment"># other threads might get between these prints</span> - $print <span class="Constant">[consume: ]</span>, n:character, <span class="Constant">[ </span> + $print <span class="Constant">[consume: ]</span>, n:char, <span class="Constant">[ </span> <span class="Constant">]</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> @@ -68,10 +68,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">def</span> main [ <span class="Constant">local-scope</span> - source:address:source:character, sink:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> + source:&:source:char, sink:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">3/capacity</span> <span class="Comment"># create two background 'routines' that communicate by a channel</span> - routine1:number<span class="Special"> <- </span>start-running producer, sink - routine2:number<span class="Special"> <- </span>start-running consumer, source + routine1:num<span class="Special"> <- </span>start-running producer, sink + routine2:num<span class="Special"> <- </span>start-running consumer, source wait-for-routine routine1 wait-for-routine routine2 ] diff --git a/html/chessboard.mu.html b/html/chessboard.mu.html index 72986d0c..8d7e5c0c 100644 --- a/html/chessboard.mu.html +++ b/html/chessboard.mu.html @@ -65,9 +65,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] run [ <span class="Constant">local-scope</span> - screen:address:screen, console:address:console<span class="Special"> <- </span>chessboard screen:address:screen, console:address:console + screen:&:screen, console:&:console<span class="Special"> <- </span>chessboard screen:&:screen, console:&:console <span class="Comment"># icon for the cursor</span> - cursor-icon:character<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + cursor-icon:char<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> screen<span class="Special"> <- </span>print screen, cursor-icon ] screen-should-contain [ @@ -98,17 +98,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="SalientComment">## Here's how 'chessboard' is implemented.</span> -type board = address:array:address:array:character +type board = address:@:&:@:char -<span class="muRecipe">def</span> chessboard screen:address:screen, console:address:console<span class="muRecipe"> -> </span>screen:address:screen, console:address:console [ +<span class="muRecipe">def</span> chessboard screen:&:screen, console:&:console<span class="muRecipe"> -> </span>screen:&:screen, console:&:console [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> board:board<span class="Special"> <- </span>initial-position <span class="Comment"># hook up stdin</span> - stdin-in:address:source:character, stdin-out:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">10/capacity</span> + stdin-in:&:source:char, stdin-out:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">10/capacity</span> start-running send-keys-to-channel, console, stdin-out, screen <span class="Comment"># buffer lines in stdin</span> - buffered-stdin-in:address:source:character, buffered-stdin-out:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">10/capacity</span> + buffered-stdin-in:&:source:char, buffered-stdin-out:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">10/capacity</span> start-running buffer-lines, stdin-in, buffered-stdin-out <span class="Delimiter">{</span> print screen, <span class="Constant">[Stupid text-mode chessboard. White pieces in uppercase; black pieces in lowercase. No checking for legal moves.</span> @@ -124,7 +124,7 @@ type board = address:array:address:array:character <span class="Delimiter">{</span> cursor-to-next-line screen screen<span class="Special"> <- </span>print screen, <span class="Constant">[move: ]</span> - m:address:move, quit:boolean, error:boolean<span class="Special"> <- </span>read-move buffered-stdin-in, screen + m:&:move, quit:boolean, error:boolean<span class="Special"> <- </span>read-move buffered-stdin-in, screen <span class="muControl">break-if</span> quit, <span class="Constant">+quit:label</span> buffered-stdin-in<span class="Special"> <- </span>clear buffered-stdin-in <span class="Comment"># cleanup after error. todo: test this?</span> <span class="muControl">loop-if</span> error @@ -138,36 +138,36 @@ type board = address:array:address:array:character <span class="SalientComment">## a board is an array of files, a file is an array of characters (squares)</span> -<span class="muRecipe">def</span> new-board initial-position:address:array:character<span class="muRecipe"> -> </span>board:board [ +<span class="muRecipe">def</span> new-board initial-position:&:@:char<span class="muRecipe"> -> </span>board:board [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># assert(length(initial-position) == 64)</span> - len:number<span class="Special"> <- </span>length *initial-position + len:num<span class="Special"> <- </span>length *initial-position correct-length?:boolean<span class="Special"> <- </span>equal len, <span class="Constant">64</span> assert correct-length?, <span class="Constant">[chessboard had incorrect size]</span> <span class="Comment"># board is an array of pointers to files; file is an array of characters</span> board<span class="Special"> <- </span>new <span class="Delimiter">{</span>(address array character): type<span class="Delimiter">}</span>, <span class="Constant">8</span> - col:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + col:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> done?:boolean<span class="Special"> <- </span>equal col, <span class="Constant">8</span> <span class="muControl">break-if</span> done? - file:address:array:character<span class="Special"> <- </span>new-file initial-position, col + file:&:@:char<span class="Special"> <- </span>new-file initial-position, col *board<span class="Special"> <- </span>put-index *board, col, file col<span class="Special"> <- </span>add col, <span class="Constant">1</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> new-file position:address:array:character, index:number<span class="muRecipe"> -> </span>result:address:array:character [ +<span class="muRecipe">def</span> new-file position:&:@:char, index:num<span class="muRecipe"> -> </span>result:&:@:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> index<span class="Special"> <- </span>multiply index, <span class="Constant">8</span> result<span class="Special"> <- </span>new <span class="Constant">character:type</span>, <span class="Constant">8</span> - row:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + row:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> done?:boolean<span class="Special"> <- </span>equal row, <span class="Constant">8</span> <span class="muControl">break-if</span> done? - square:character<span class="Special"> <- </span>index *position, index + square:char<span class="Special"> <- </span>index *position, index *result<span class="Special"> <- </span>put-index *result, row, square row<span class="Special"> <- </span>add row, <span class="Constant">1</span> index<span class="Special"> <- </span>add index, <span class="Constant">1</span> @@ -175,26 +175,26 @@ type board = address:array:address:array:character <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> print-board screen:address:screen, board:board<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> print-board screen:&:screen, board:board<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - row:number<span class="Special"> <- </span>copy <span class="Constant">7</span> <span class="Comment"># start printing from the top of the board</span> - space:character<span class="Special"> <- </span>copy <span class="Constant">32/space</span> + row:num<span class="Special"> <- </span>copy <span class="Constant">7</span> <span class="Comment"># start printing from the top of the board</span> + space:char<span class="Special"> <- </span>copy <span class="Constant">32/space</span> <span class="Comment"># print each row</span> <span class="Delimiter">{</span> done?:boolean<span class="Special"> <- </span>lesser-than row, <span class="Constant">0</span> <span class="muControl">break-if</span> done? <span class="Comment"># print rank number as a legend</span> - rank:number<span class="Special"> <- </span>add row, <span class="Constant">1</span> + rank:num<span class="Special"> <- </span>add row, <span class="Constant">1</span> print-integer screen, rank print screen, <span class="Constant">[ | ]</span> <span class="Comment"># print each square in the row</span> - col:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + col:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>equal col:number, <span class="Constant">8</span> + done?:boolean<span class="Special"> <- </span>equal col:num, <span class="Constant">8</span> <span class="muControl">break-if</span> done?:boolean - f:address:array:character<span class="Special"> <- </span>index *board, col - c:character<span class="Special"> <- </span>index *f, row + f:&:@:char<span class="Special"> <- </span>index *board, col + c:char<span class="Special"> <- </span>index *f, row print screen, c print screen, space col<span class="Special"> <- </span>add col, <span class="Constant">1</span> @@ -222,7 +222,7 @@ type board = address:array:address:array:character <span class="Comment"># B P _ _ _ _ p B</span> <span class="Comment"># N P _ _ _ _ p n</span> <span class="Comment"># R P _ _ _ _ p r</span> - initial-position:address:array:character<span class="Special"> <- </span>new-array <span class="Constant">82/R</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">114/r</span>, <span class="Constant">78/N</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">110/n</span>, <span class="Constant">66/B</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">98/b</span>, <span class="Constant">81/Q</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">113/q</span>, <span class="Constant">75/K</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">107/k</span>, <span class="Constant">66/B</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">98/b</span>, <span class="Constant">78/N</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">110/n</span>, <span class="Constant">82/R</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">114/r</span> + initial-position:&:@:char<span class="Special"> <- </span>new-array <span class="Constant">82/R</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">114/r</span>, <span class="Constant">78/N</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">110/n</span>, <span class="Constant">66/B</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">98/b</span>, <span class="Constant">81/Q</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">113/q</span>, <span class="Constant">75/K</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">107/k</span>, <span class="Constant">66/B</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">98/b</span>, <span class="Constant">78/N</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">110/n</span>, <span class="Constant">82/R</span>, <span class="Constant">80/P</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">32/blank</span>, <span class="Constant">112/p</span>, <span class="Constant">114/r</span> <span class="CommentedCode">#? 82/R, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 114/r,</span> <span class="CommentedCode">#? 78/N, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 110/n,</span> <span class="CommentedCode">#? 66/B, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 98/b, </span> @@ -239,7 +239,7 @@ type board = address:array:address:array:character run [ <span class="Constant">local-scope</span> board:board<span class="Special"> <- </span>initial-position - screen:address:screen<span class="Special"> <- </span>print-board screen:address:screen, board + screen:&:screen<span class="Special"> <- </span>print-board screen:&:screen, board ] screen-should-contain [ <span class="Comment"># 012345678901234567890123456789</span> @@ -262,33 +262,33 @@ type board = address:array:address:array:character <span class="muData">container</span> move [ <span class="Comment"># valid range: 0-7</span> - from-file:number - from-rank:number - to-file:number - to-rank:number + from-file:num + from-rank:num + to-file:num + to-rank:num ] <span class="Comment"># prints only error messages to screen</span> -<span class="muRecipe">def</span> read-move stdin:address:source:character, screen:address:screen<span class="muRecipe"> -> </span>result:address:move, quit?:boolean, error?:boolean, stdin:address:source:character, screen:address:screen [ +<span class="muRecipe">def</span> read-move stdin:&:source:char, screen:&:screen<span class="muRecipe"> -> </span>result:&:move, quit?:boolean, error?:boolean, stdin:&:source:char, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - from-file:number, quit?:boolean, error?:boolean<span class="Special"> <- </span>read-file stdin, screen + from-file:num, quit?:boolean, error?:boolean<span class="Special"> <- </span>read-file stdin, screen <span class="muControl">return-if</span> quit?, <span class="Constant">0/dummy</span> <span class="muControl">return-if</span> error?, <span class="Constant">0/dummy</span> <span class="Comment"># construct the move object</span> - result:address:move<span class="Special"> <- </span>new <span class="Constant">move:type</span> + result:&:move<span class="Special"> <- </span>new <span class="Constant">move:type</span> *result<span class="Special"> <- </span>put *result, <span class="Constant">from-file:offset</span>, from-file - from-rank:number, quit?, error?<span class="Special"> <- </span>read-rank stdin, screen + from-rank:num, quit?, error?<span class="Special"> <- </span>read-rank stdin, screen <span class="muControl">return-if</span> quit?, <span class="Constant">0/dummy</span> <span class="muControl">return-if</span> error?, <span class="Constant">0/dummy</span> *result<span class="Special"> <- </span>put *result, <span class="Constant">from-rank:offset</span>, from-rank error?<span class="Special"> <- </span>expect-from-channel stdin, <span class="Constant">45/dash</span>, screen <span class="muControl">return-if</span> error?, <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span> - to-file:number, quit?, error?<span class="Special"> <- </span>read-file stdin, screen + to-file:num, quit?, error?<span class="Special"> <- </span>read-file stdin, screen <span class="muControl">return-if</span> quit?:boolean, <span class="Constant">0/dummy</span> <span class="muControl">return-if</span> error?:boolean, <span class="Constant">0/dummy</span> *result<span class="Special"> <- </span>put *result, <span class="Constant">to-file:offset</span>, to-file - to-rank:number, quit?, error?<span class="Special"> <- </span>read-rank stdin, screen + to-rank:num, quit?, error?<span class="Special"> <- </span>read-rank stdin, screen <span class="muControl">return-if</span> quit?, <span class="Constant">0/dummy</span> <span class="muControl">return-if</span> error?, <span class="Constant">0/dummy</span> *result<span class="Special"> <- </span>put *result, <span class="Constant">to-rank:offset</span>, to-rank @@ -297,10 +297,10 @@ type board = address:array:address:array:character ] <span class="Comment"># valid values for file: 0-7</span> -<span class="muRecipe">def</span> read-file stdin:address:source:character, screen:address:screen<span class="muRecipe"> -> </span>file:number, quit:boolean, error:boolean, stdin:address:source:character, screen:address:screen [ +<span class="muRecipe">def</span> read-file stdin:&:source:char, screen:&:screen<span class="muRecipe"> -> </span>file:num, quit:boolean, error:boolean, stdin:&:source:char, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - c:character, eof?:boolean, stdin<span class="Special"> <- </span>read stdin + c:char, eof?:boolean, stdin<span class="Special"> <- </span>read stdin <span class="muControl">return-if</span> eof?, <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span> <span class="Delimiter">{</span> q-pressed?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">81/Q</span> @@ -323,7 +323,7 @@ type board = address:array:address:array:character print screen, <span class="Constant">[that's not enough]</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span> <span class="Delimiter">}</span> - file:number<span class="Special"> <- </span>subtract c, <span class="Constant">97/a</span> + file:num<span class="Special"> <- </span>subtract c, <span class="Constant">97/a</span> <span class="Comment"># 'a' <= file <= 'h'</span> <span class="Delimiter">{</span> above-min:boolean<span class="Special"> <- </span>greater-or-equal file, <span class="Constant">0</span> @@ -344,10 +344,10 @@ type board = address:array:address:array:character ] <span class="Comment"># valid values for rank: 0-7</span> -<span class="muRecipe">def</span> read-rank stdin:address:source:character, screen:address:screen<span class="muRecipe"> -> </span>rank:number, quit?:boolean, error?:boolean, stdin:address:source:character, screen:address:screen [ +<span class="muRecipe">def</span> read-rank stdin:&:source:char, screen:&:screen<span class="muRecipe"> -> </span>rank:num, quit?:boolean, error?:boolean, stdin:&:source:char, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - c:character, eof?:boolean, stdin<span class="Special"> <- </span>read stdin + c:char, eof?:boolean, stdin<span class="Special"> <- </span>read stdin <span class="muControl">return-if</span> eof?, <span class="Constant">0/dummy</span>, <span class="Constant">1/quit</span>, <span class="Constant">0/error</span> <span class="Delimiter">{</span> q-pressed?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">8/Q</span> @@ -365,7 +365,7 @@ type board = address:array:address:array:character print screen, <span class="Constant">[that's not enough]</span> <span class="muControl">return</span> <span class="Constant">0/dummy</span>, <span class="Constant">0/quit</span>, <span class="Constant">1/error</span> <span class="Delimiter">}</span> - rank:number<span class="Special"> <- </span>subtract c, <span class="Constant">49/'1'</span> + rank:num<span class="Special"> <- </span>subtract c, <span class="Constant">49/'1'</span> <span class="Comment"># assert'1' <= rank <= '8'</span> <span class="Delimiter">{</span> above-min:boolean<span class="Special"> <- </span>greater-or-equal rank, <span class="Constant">0</span> @@ -386,10 +386,10 @@ type board = address:array:address:array:character <span class="Comment"># read a character from the given channel and check that it's what we expect</span> <span class="Comment"># return true on error</span> -<span class="muRecipe">def</span> expect-from-channel stdin:address:source:character, expected:character, screen:address:screen<span class="muRecipe"> -> </span>result:boolean, stdin:address:source:character, screen:address:screen [ +<span class="muRecipe">def</span> expect-from-channel stdin:&:source:char, expected:char, screen:&:screen<span class="muRecipe"> -> </span>result:boolean, stdin:&:source:char, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - c:character, eof?:boolean, stdin<span class="Special"> <- </span>read stdin + c:char, eof?:boolean, stdin<span class="Special"> <- </span>read stdin <span class="muControl">return-if</span> eof? <span class="Constant">1/true</span> <span class="Delimiter">{</span> match?:boolean<span class="Special"> <- </span>equal c, expected @@ -403,11 +403,11 @@ type board = address:array:address:array:character assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span> run [ <span class="Constant">local-scope</span> - source:address:source:character, sink:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">2/capacity</span> - read-move-routine:number/routine<span class="Special"> <- </span>start-running read-move, source, screen:address:screen + source:&:source:char, sink:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">2/capacity</span> + read-move-routine:num/routine<span class="Special"> <- </span>start-running read-move, source, screen:&:screen <span class="Comment"># 'read-move' is waiting for input</span> wait-for-routine-to-block read-move-routine - read-move-state:number<span class="Special"> <- </span>routine-state read-move-routine + read-move-state:num<span class="Special"> <- </span>routine-state read-move-routine waiting?:boolean<span class="Special"> <- </span>not-equal read-move-state, <span class="Constant">2/discontinued</span> assert waiting?, <span class="Constant">[ </span> <span class="Constant">F read-move-blocking: routine failed to pause after coming up (before any keys were pressed)]</span> @@ -476,11 +476,11 @@ type board = address:array:address:array:character assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span> run [ <span class="Constant">local-scope</span> - source:address:source:character, sink:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">2/capacity</span> - read-move-routine:number<span class="Special"> <- </span>start-running read-move, source, screen:address:screen + source:&:source:char, sink:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">2/capacity</span> + read-move-routine:num<span class="Special"> <- </span>start-running read-move, source, screen:&:screen <span class="Comment"># 'read-move' is waiting for input</span> wait-for-routine-to-block read-move-routine - read-move-state:number<span class="Special"> <- </span>routine-state read-move-routine + read-move-state:num<span class="Special"> <- </span>routine-state read-move-routine waiting?:boolean<span class="Special"> <- </span>not-equal read-move-state, <span class="Constant">2/discontinued</span> assert waiting?, <span class="Constant">[ </span> <span class="Constant">F read-move-quit: routine failed to pause after coming up (before any keys were pressed)]</span> @@ -504,11 +504,11 @@ type board = address:array:address:array:character assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span> run [ <span class="Constant">local-scope</span> - source:address:source:character, sink:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">2/capacity</span> - read-move-routine:number<span class="Special"> <- </span>start-running read-move, source, screen:address:screen + source:&:source:char, sink:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">2/capacity</span> + read-move-routine:num<span class="Special"> <- </span>start-running read-move, source, screen:&:screen <span class="Comment"># 'read-move' is waiting for input</span> wait-for-routine-to-block read-move-routine - read-move-state:number<span class="Special"> <- </span>routine-state read-move-routine + read-move-state:num<span class="Special"> <- </span>routine-state read-move-routine waiting?:boolean<span class="Special"> <- </span>not-equal read-move-state, <span class="Constant">2/discontinued</span> assert waiting?, <span class="Constant">[ </span> <span class="Constant">F read-move-illegal-file: routine failed to pause after coming up (before any keys were pressed)]</span> @@ -526,11 +526,11 @@ type board = address:array:address:array:character assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span> run [ <span class="Constant">local-scope</span> - source:address:source:character, sink:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">2/capacity</span> - read-move-routine:number<span class="Special"> <- </span>start-running read-move, source, screen:address:screen + source:&:source:char, sink:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">2/capacity</span> + read-move-routine:num<span class="Special"> <- </span>start-running read-move, source, screen:&:screen <span class="Comment"># 'read-move' is waiting for input</span> wait-for-routine-to-block read-move-routine - read-move-state:number<span class="Special"> <- </span>routine-state read-move-routine + read-move-state:num<span class="Special"> <- </span>routine-state read-move-routine waiting?:boolean<span class="Special"> <- </span>not-equal read-move-state, <span class="Constant">2/discontinued</span> assert waiting?, <span class="Constant">[ </span> <span class="Constant">F read-move-illegal-rank: routine failed to pause after coming up (before any keys were pressed)]</span> @@ -549,11 +549,11 @@ type board = address:array:address:array:character assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span> run [ <span class="Constant">local-scope</span> - source:address:source:character, sink:address:sink:character<span class="Special"> <- </span>new-channel <span class="Constant">2/capacity</span> - read-move-routine:number<span class="Special"> <- </span>start-running read-move, source, screen:address:screen + source:&:source:char, sink:&:sink:char<span class="Special"> <- </span>new-channel <span class="Constant">2/capacity</span> + read-move-routine:num<span class="Special"> <- </span>start-running read-move, source, screen:&:screen <span class="Comment"># 'read-move' is waiting for input</span> wait-for-routine-to-block read-move-routine - read-move-state:number<span class="Special"> <- </span>routine-state read-move-routine + read-move-state:num<span class="Special"> <- </span>routine-state read-move-routine waiting?:boolean<span class="Special"> <- </span>not-equal read-move-state, <span class="Constant">2/discontinued</span> assert waiting?, <span class="Constant">[ </span> <span class="Constant">F read-move-empty: routine failed to pause after coming up (before any keys were pressed)]</span> @@ -568,16 +568,16 @@ type board = address:array:address:array:character ] ] -<span class="muRecipe">def</span> make-move board:board, m:address:move<span class="muRecipe"> -> </span>board:board [ +<span class="muRecipe">def</span> make-move board:board, m:&:move<span class="muRecipe"> -> </span>board:board [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - from-file:number<span class="Special"> <- </span>get *m, <span class="Constant">from-file:offset</span> - from-rank:number<span class="Special"> <- </span>get *m, <span class="Constant">from-rank:offset</span> - to-file:number<span class="Special"> <- </span>get *m, <span class="Constant">to-file:offset</span> - to-rank:number<span class="Special"> <- </span>get *m, <span class="Constant">to-rank:offset</span> - from-f:address:array:character<span class="Special"> <- </span>index *board, from-file - to-f:address:array:character<span class="Special"> <- </span>index *board, to-file - src:character/square<span class="Special"> <- </span>index *from-f, from-rank + from-file:num<span class="Special"> <- </span>get *m, <span class="Constant">from-file:offset</span> + from-rank:num<span class="Special"> <- </span>get *m, <span class="Constant">from-rank:offset</span> + to-file:num<span class="Special"> <- </span>get *m, <span class="Constant">to-file:offset</span> + to-rank:num<span class="Special"> <- </span>get *m, <span class="Constant">to-rank:offset</span> + from-f:&:@:char<span class="Special"> <- </span>index *board, from-file + to-f:&:@:char<span class="Special"> <- </span>index *board, to-file + src:char/square<span class="Special"> <- </span>index *from-f, from-rank *to-f<span class="Special"> <- </span>put-index *to-f, to-rank, src *from-f<span class="Special"> <- </span>put-index *from-f, from-rank, <span class="Constant">32/space</span> ] @@ -587,10 +587,10 @@ type board = address:array:address:array:character run [ <span class="Constant">local-scope</span> board:board<span class="Special"> <- </span>initial-position - move:address:move<span class="Special"> <- </span>new <span class="Constant">move:type</span> + move:&:move<span class="Special"> <- </span>new <span class="Constant">move:type</span> *move<span class="Special"> <- </span>merge <span class="Constant">6/g</span>, <span class="Constant">1/'2'</span>, <span class="Constant">6/g</span>, <span class="Constant">3/'4'</span> board<span class="Special"> <- </span>make-move board, move - screen:address:screen<span class="Special"> <- </span>print-board screen:address:screen, board + screen:&:screen<span class="Special"> <- </span>print-board screen:&:screen, board ] screen-should-contain [ <span class="Comment"># 012345678901234567890123456789</span> diff --git a/html/counters.mu.html b/html/counters.mu.html index 940c68ec..e1936ded 100644 --- a/html/counters.mu.html +++ b/html/counters.mu.html @@ -31,28 +31,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># example program: maintain multiple counters with isolated lexical scopes</span> <span class="Comment"># (spaces)</span> -<span class="muRecipe">def</span> new-counter n:number<span class="muRecipe"> -> </span><span class="Constant">default-space</span>:address:array:location [ +<span class="muRecipe">def</span> new-counter n:num<span class="muRecipe"> -> </span><span class="Constant">default-space</span>:space [ <span class="Constant">default-space</span><span class="Special"> <- </span>new <span class="Constant">location:type</span>, <span class="Constant">30</span> <span class="Constant">load-ingredients</span> ] -<span class="muRecipe">def</span> increment-counter outer:address:array:location/names:new-counter, x:number<span class="muRecipe"> -> </span>n:number/space:<span class="Constant">1</span> [ +<span class="muRecipe">def</span> increment-counter outer:space/names:new-counter, x:num<span class="muRecipe"> -> </span>n:num/space:<span class="Constant">1</span> [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - <span class="Constant">0</span>:address:array:location/names:new-counter<span class="Special"> <- </span>copy outer <span class="Comment"># setup outer space; it *must* come from 'new-counter'</span> + <span class="Constant">0</span>:space/names:new-counter<span class="Special"> <- </span>copy outer <span class="Comment"># setup outer space; it *must* come from 'new-counter'</span> n/space:<span class="Constant">1</span><span class="Special"> <- </span>add n/space:<span class="Constant">1</span>, x ] <span class="muRecipe">def</span> main [ <span class="Constant">local-scope</span> <span class="Comment"># counter A</span> - a:address:array:location<span class="Special"> <- </span>new-counter <span class="Constant">34</span> + a:space<span class="Special"> <- </span>new-counter <span class="Constant">34</span> <span class="Comment"># counter B</span> - b:address:array:location<span class="Special"> <- </span>new-counter <span class="Constant">23</span> + b:space<span class="Special"> <- </span>new-counter <span class="Constant">23</span> <span class="Comment"># increment both by 2 but in different ways</span> increment-counter a, <span class="Constant">1</span> - b-value:number<span class="Special"> <- </span>increment-counter b, <span class="Constant">2</span> - a-value:number<span class="Special"> <- </span>increment-counter a, <span class="Constant">1</span> + b-value:num<span class="Special"> <- </span>increment-counter b, <span class="Constant">2</span> + a-value:num<span class="Special"> <- </span>increment-counter a, <span class="Constant">1</span> <span class="Comment"># check results</span> $print <span class="Constant">[Contents of counters]</span>, <span class="Constant">10/newline</span> $print <span class="Constant">[a: ]</span>, a-value, <span class="Constant">[ b: ]</span>, b-value, <span class="Constant">10/newline</span> diff --git a/html/display.mu.html b/html/display.mu.html index dccab090..45db818f 100644 --- a/html/display.mu.html +++ b/html/display.mu.html @@ -33,7 +33,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">def</span> main [ open-console print-character-to-display <span class="Constant">97</span>, <span class="Constant">1/red</span>, <span class="Constant">2/green</span> - <span class="Constant">1</span>:number/<span class="Special">raw</span>, <span class="Constant">2</span>:number/<span class="Special">raw <- </span>cursor-position-on-display + <span class="Constant">1</span>:num/<span class="Special">raw</span>, <span class="Constant">2</span>:num/<span class="Special">raw <- </span>cursor-position-on-display wait-for-some-interaction clear-display move-cursor-on-display <span class="Constant">0</span>, <span class="Constant">4</span> diff --git a/html/edit/001-editor.mu.html b/html/edit/001-editor.mu.html index 8eec4b3f..b61e405d 100644 --- a/html/edit/001-editor.mu.html +++ b/html/edit/001-editor.mu.html @@ -52,7 +52,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> run [ <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> ] screen-should-contain [ <span class="Comment"># top line of screen reserved for menu</span> @@ -64,26 +64,26 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muData">container</span> editor-data [ <span class="Comment"># editable text: doubly linked list of characters (head contains a special sentinel)</span> - data:address:duplex-list:character - top-of-screen:address:duplex-list:character - bottom-of-screen:address:duplex-list:character + data:&:duplex-list:char + top-of-screen:&:duplex-list:char + bottom-of-screen:&:duplex-list:char <span class="Comment"># location before cursor inside data</span> - before-cursor:address:duplex-list:character + before-cursor:&:duplex-list:char <span class="Comment"># raw bounds of display area on screen</span> <span class="Comment"># always displays from row 1 (leaving row 0 for a menu) and at most until bottom of screen</span> - left:number - right:number - bottom:number + left:num + right:num + bottom:num <span class="Comment"># raw screen coordinates of cursor</span> - cursor-row:number - cursor-column:number + cursor-row:num + cursor-column:num ] <span class="Comment"># creates a new editor widget and renders its initial appearance to screen</span> <span class="Comment"># top/left/right constrain the screen area available to the new editor</span> <span class="Comment"># right is exclusive</span> -<span class="muRecipe">def</span> new-editor s:text, screen:address:screen, left:number, right:number<span class="muRecipe"> -> </span>result:address:editor-data, screen:address:screen [ +<span class="muRecipe">def</span> new-editor s:text, screen:&:screen, left:num, right:num<span class="muRecipe"> -> </span>result:&:editor-data, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># no clipping of bounds</span> @@ -96,7 +96,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *result<span class="Special"> <- </span>put *result, <span class="Constant">cursor-row:offset</span>, <span class="Constant">1/top</span> *result<span class="Special"> <- </span>put *result, <span class="Constant">cursor-column:offset</span>, left <span class="Comment"># initialize empty contents</span> - init:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">167/§</span>, <span class="Constant">0/tail</span> + init:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">167/§</span>, <span class="Constant">0/tail</span> *result<span class="Special"> <- </span>put *result, <span class="Constant">data:offset</span>, init *result<span class="Special"> <- </span>put *result, <span class="Constant">top-of-screen:offset</span>, init *result<span class="Special"> <- </span>put *result, <span class="Constant">before-cursor:offset</span>, init @@ -106,20 +106,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> <editor-initialization></span> ] -<span class="muRecipe">def</span> insert-text editor:address:editor-data, text:text<span class="muRecipe"> -> </span>editor:address:editor-data [ +<span class="muRecipe">def</span> insert-text editor:&:editor-data, text:text<span class="muRecipe"> -> </span>editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># early exit if text is empty</span> <span class="muControl">return-unless</span> text, editor/same-as-ingredient:<span class="Constant">0</span> - len:number<span class="Special"> <- </span>length *text + len:num<span class="Special"> <- </span>length *text <span class="muControl">return-unless</span> len, editor/same-as-ingredient:<span class="Constant">0</span> - idx:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + idx:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># now we can start appending the rest, character by character</span> - curr:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> + curr:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal idx, len + done?:bool<span class="Special"> <- </span>greater-or-equal idx, len <span class="muControl">break-if</span> done? - c:character<span class="Special"> <- </span>index *text, idx + c:char<span class="Special"> <- </span>index *text, idx insert c, curr <span class="Comment"># next iter</span> curr<span class="Special"> <- </span>next curr @@ -132,8 +132,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-initializes-without-data [ assume-screen <span class="Constant">5/width</span>, <span class="Constant">3/height</span> run [ - <span class="Constant">1</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">0/data</span>, screen:address:screen, <span class="Constant">2/left</span>, <span class="Constant">5/right</span> - <span class="Constant">2</span>:editor-data<span class="Special"> <- </span>copy *<span class="Constant">1</span>:address:editor-data + <span class="Constant">1</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">0/data</span>, screen:&:screen, <span class="Constant">2/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:editor-data<span class="Special"> <- </span>copy *<span class="Constant">1</span>:&:editor-data ] memory-should-contain [ <span class="Comment"># 2 (data) <- just the § sentinel</span> @@ -156,52 +156,52 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># Assumes cursor should be at coordinates (cursor-row, cursor-column) and</span> <span class="Comment"># updates before-cursor to match. Might also move coordinates if they're</span> <span class="Comment"># outside text.</span> -<span class="muRecipe">def</span> render screen:address:screen, editor:address:editor-data<span class="muRecipe"> -> </span>last-row:number, last-column:number, screen:address:screen, editor:address:editor-data [ +<span class="muRecipe">def</span> render screen:&:screen, editor:&:editor-data<span class="muRecipe"> -> </span>last-row:num, last-column:num, screen:&:screen, editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> editor, <span class="Constant">1/top</span>, <span class="Constant">0/left</span>, screen/same-as-ingredient:<span class="Constant">0</span>, editor/same-as-ingredient:<span class="Constant">1</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - screen-height:number<span class="Special"> <- </span>screen-height screen - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + screen-height:num<span class="Special"> <- </span>screen-height screen + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> <span class="Comment"># traversing editor</span> - curr:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - prev:address:duplex-list:character<span class="Special"> <- </span>copy curr <span class="Comment"># just in case curr becomes null and we can't compute prev</span> + curr:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + prev:&:duplex-list:char<span class="Special"> <- </span>copy curr <span class="Comment"># just in case curr becomes null and we can't compute prev</span> curr<span class="Special"> <- </span>next curr <span class="Comment"># traversing screen</span> <span class="Constant"> +render-loop-initialization</span> - color:number<span class="Special"> <- </span>copy <span class="Constant">7/white</span> - row:number<span class="Special"> <- </span>copy <span class="Constant">1/top</span> - column:number<span class="Special"> <- </span>copy left - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + color:num<span class="Special"> <- </span>copy <span class="Constant">7/white</span> + row:num<span class="Special"> <- </span>copy <span class="Constant">1/top</span> + column:num<span class="Special"> <- </span>copy left + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> screen<span class="Special"> <- </span>move-cursor screen, row, column <span class="Delimiter">{</span> <span class="Constant"> +next-character</span> <span class="muControl">break-unless</span> curr - off-screen?:boolean<span class="Special"> <- </span>greater-or-equal row, screen-height + off-screen?:bool<span class="Special"> <- </span>greater-or-equal row, screen-height <span class="muControl">break-if</span> off-screen? <span class="Comment"># update editor-data.before-cursor</span> <span class="Comment"># Doing so at the start of each iteration ensures it stays one step behind</span> <span class="Comment"># the current character.</span> <span class="Delimiter">{</span> - at-cursor-row?:boolean<span class="Special"> <- </span>equal row, cursor-row + at-cursor-row?:bool<span class="Special"> <- </span>equal row, cursor-row <span class="muControl">break-unless</span> at-cursor-row? - at-cursor?:boolean<span class="Special"> <- </span>equal column, cursor-column + at-cursor?:bool<span class="Special"> <- </span>equal column, cursor-column <span class="muControl">break-unless</span> at-cursor? before-cursor<span class="Special"> <- </span>copy prev <span class="Delimiter">}</span> - c:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + c:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> <span class="Constant"> <character-c-received></span> <span class="Delimiter">{</span> <span class="Comment"># newline? move to left rather than 0</span> - newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> newline? <span class="Comment"># adjust cursor if necessary</span> <span class="Delimiter">{</span> - at-cursor-row?:boolean<span class="Special"> <- </span>equal row, cursor-row + at-cursor-row?:bool<span class="Special"> <- </span>equal row, cursor-row <span class="muControl">break-unless</span> at-cursor-row? - left-of-cursor?:boolean<span class="Special"> <- </span>lesser-than column, cursor-column + left-of-cursor?:bool<span class="Special"> <- </span>lesser-than column, cursor-column <span class="muControl">break-unless</span> left-of-cursor? cursor-column<span class="Special"> <- </span>copy column before-cursor<span class="Special"> <- </span>prev curr @@ -219,10 +219,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">{</span> <span class="Comment"># at right? wrap. even if there's only one more letter left; we need</span> <span class="Comment"># room for clicking on the cursor after it.</span> - at-right?:boolean<span class="Special"> <- </span>equal column, right + at-right?:bool<span class="Special"> <- </span>equal column, right <span class="muControl">break-unless</span> at-right? <span class="Comment"># print wrap icon</span> - wrap-icon:character<span class="Special"> <- </span>copy <span class="Constant">8617/loop-back-to-left</span> + wrap-icon:char<span class="Special"> <- </span>copy <span class="Constant">8617/loop-back-to-left</span> print screen, wrap-icon, <span class="Constant">245/grey</span> column<span class="Special"> <- </span>copy left row<span class="Special"> <- </span>add row, <span class="Constant">1</span> @@ -240,11 +240,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *editor<span class="Special"> <- </span>put *editor, <span class="Constant">bottom-of-screen:offset</span>, curr <span class="Comment"># is cursor to the right of the last line? move to end</span> <span class="Delimiter">{</span> - at-cursor-row?:boolean<span class="Special"> <- </span>equal row, cursor-row - cursor-outside-line?:boolean<span class="Special"> <- </span>lesser-or-equal column, cursor-column - before-cursor-on-same-line?:boolean<span class="Special"> <- </span>and at-cursor-row?, cursor-outside-line? - above-cursor-row?:boolean<span class="Special"> <- </span>lesser-than row, cursor-row - before-cursor?:boolean<span class="Special"> <- </span>or before-cursor-on-same-line?, above-cursor-row? + at-cursor-row?:bool<span class="Special"> <- </span>equal row, cursor-row + cursor-outside-line?:bool<span class="Special"> <- </span>lesser-or-equal column, cursor-column + before-cursor-on-same-line?:bool<span class="Special"> <- </span>and at-cursor-row?, cursor-outside-line? + above-cursor-row?:bool<span class="Special"> <- </span>lesser-than row, cursor-row + before-cursor?:bool<span class="Special"> <- </span>or before-cursor-on-same-line?, above-cursor-row? <span class="muControl">break-unless</span> before-cursor? cursor-row<span class="Special"> <- </span>copy row cursor-column<span class="Special"> <- </span>copy column @@ -257,7 +257,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> row, column, screen/same-as-ingredient:<span class="Constant">0</span>, editor/same-as-ingredient:<span class="Constant">1</span> ] -<span class="muRecipe">def</span> clear-screen-from screen:address:screen, row:number, column:number, left:number, right:number<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> clear-screen-from screen:&:screen, row:num, column:num, left:num, right:num<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if it's the real screen, use the optimized primitive</span> @@ -273,14 +273,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> screen/same-as-ingredient:<span class="Constant">0</span> ] -<span class="muRecipe">def</span> clear-rest-of-screen screen:address:screen, row:number, left:number, right:number<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> clear-rest-of-screen screen:&:screen, row:num, left:num, right:num<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> row<span class="Special"> <- </span>add row, <span class="Constant">1</span> screen<span class="Special"> <- </span>move-cursor screen, row, left - screen-height:number<span class="Special"> <- </span>screen-height screen + screen-height:num<span class="Special"> <- </span>screen-height screen <span class="Delimiter">{</span> - at-bottom-of-screen?:boolean<span class="Special"> <- </span>greater-or-equal row, screen-height + at-bottom-of-screen?:bool<span class="Special"> <- </span>greater-or-equal row, screen-height <span class="muControl">break-if</span> at-bottom-of-screen? screen<span class="Special"> <- </span>move-cursor screen, row, left clear-line-until screen, right @@ -294,7 +294,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ s:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def]</span> - new-editor s:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + new-editor s:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -308,7 +308,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">5/width</span>, <span class="Constant">5/height</span> run [ s:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - new-editor s:text, screen:address:screen, <span class="Constant">1/left</span>, <span class="Constant">5/right</span> + new-editor s:text, screen:&:screen, <span class="Constant">1/left</span>, <span class="Constant">5/right</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -322,7 +322,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ s:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def]</span> - new-editor s:text, screen:address:screen, <span class="Constant">1/left</span>, <span class="Constant">5/right</span> + new-editor s:text, screen:&:screen, <span class="Constant">1/left</span>, <span class="Constant">5/right</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -336,7 +336,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">5/width</span>, <span class="Constant">5/height</span> run [ s:text<span class="Special"> <- </span>new <span class="Constant">[abc def]</span> - new-editor s:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + new-editor s:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -356,7 +356,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">5/width</span>, <span class="Constant">5/height</span> run [ s:text<span class="Special"> <- </span>new <span class="Constant">[abcde]</span> - new-editor s:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + new-editor s:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> ] <span class="Comment"># still wrap, even though the line would fit. We need room to click on the</span> <span class="Comment"># end of the line</span> @@ -378,9 +378,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">5/width</span>, <span class="Constant">5/height</span> run [ <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -401,7 +401,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color s:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant"># de</span> <span class="Constant">f]</span> - new-editor s:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + new-editor s:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -431,14 +431,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># so far the previous color is all the information we need; that may change</span> -<span class="muRecipe">def</span> get-color color:number, c:character<span class="muRecipe"> -> </span>color:number [ +<span class="muRecipe">def</span> get-color color:num, c:char<span class="muRecipe"> -> </span>color:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - color-is-white?:boolean<span class="Special"> <- </span>equal color, <span class="Constant">7/white</span> + color-is-white?:bool<span class="Special"> <- </span>equal color, <span class="Constant">7/white</span> <span class="Comment"># if color is white and next character is '#', switch color to blue</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> color-is-white? - starting-comment?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">35/#</span> + starting-comment?:bool<span class="Special"> <- </span>equal c, <span class="Constant">35/#</span> <span class="muControl">break-unless</span> starting-comment? trace <span class="Constant">90</span>, <span class="Constant">[app]</span>, <span class="Constant">[switch color back to blue]</span> color<span class="Special"> <- </span>copy <span class="Constant">12/lightblue</span> @@ -446,9 +446,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="Comment"># if color is blue and next character is newline, switch color to white</span> <span class="Delimiter">{</span> - color-is-blue?:boolean<span class="Special"> <- </span>equal color, <span class="Constant">12/lightblue</span> + color-is-blue?:bool<span class="Special"> <- </span>equal color, <span class="Constant">12/lightblue</span> <span class="muControl">break-unless</span> color-is-blue? - ending-comment?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + ending-comment?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> ending-comment? trace <span class="Constant">90</span>, <span class="Constant">[app]</span>, <span class="Constant">[switch color back to white]</span> color<span class="Special"> <- </span>copy <span class="Constant">7/white</span> @@ -457,16 +457,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># if color is white (no comments) and next character is '<', switch color to red</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> color-is-white? - starting-assignment?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">60/<</span> + starting-assignment?:bool<span class="Special"> <- </span>equal c, <span class="Constant">60/<</span> <span class="muControl">break-unless</span> starting-assignment? color<span class="Special"> <- </span>copy <span class="Constant">1/red</span> <span class="muControl">jump</span> <span class="Constant">+exit:label</span> <span class="Delimiter">}</span> <span class="Comment"># if color is red and next character is space, switch color to white</span> <span class="Delimiter">{</span> - color-is-red?:boolean<span class="Special"> <- </span>equal color, <span class="Constant">1/red</span> + color-is-red?:bool<span class="Special"> <- </span>equal color, <span class="Constant">1/red</span> <span class="muControl">break-unless</span> color-is-red? - ending-assignment?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">32/space</span> + ending-assignment?:bool<span class="Special"> <- </span>equal c, <span class="Constant">32/space</span> <span class="muControl">break-unless</span> ending-assignment? color<span class="Special"> <- </span>copy <span class="Constant">7/white</span> <span class="muControl">jump</span> <span class="Constant">+exit:label</span> @@ -482,7 +482,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color s:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">d <- e</span> <span class="Constant">f]</span> - new-editor s:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">8/right</span> + new-editor s:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">8/right</span> ] screen-should-contain [ <span class="Constant"> . .</span> diff --git a/html/edit/002-typing.mu.html b/html/edit/002-typing.mu.html index bba168f6..815f5fab 100644 --- a/html/edit/002-typing.mu.html +++ b/html/edit/002-typing.mu.html @@ -41,26 +41,26 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> open-console - editor:address:editor-data<span class="Special"> <- </span>new-editor text, <span class="Constant">0/screen</span>, <span class="Constant">5/left</span>, <span class="Constant">45/right</span> + editor:&:editor-data<span class="Special"> <- </span>new-editor text, <span class="Constant">0/screen</span>, <span class="Constant">5/left</span>, <span class="Constant">45/right</span> editor-event-loop <span class="Constant">0/screen</span>, <span class="Constant">0/console</span>, editor close-console ] -<span class="muRecipe">def</span> editor-event-loop screen:address:screen, console:address:console, editor:address:editor-data<span class="muRecipe"> -> </span>screen:address:screen, console:address:console, editor:address:editor-data [ +<span class="muRecipe">def</span> editor-event-loop screen:&:screen, console:&:console, editor:&:editor-data<span class="muRecipe"> -> </span>screen:&:screen, console:&:console, editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> <span class="Comment"># looping over each (keyboard or touch) event as it occurs</span> <span class="Constant"> +next-event</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> screen<span class="Special"> <- </span>move-cursor screen, cursor-row, cursor-column - e:event, console:address:console, found?:boolean, quit?:boolean<span class="Special"> <- </span>read-event console + e:event, console:&:console, found?:bool, quit?:bool<span class="Special"> <- </span>read-event console <span class="muControl">loop-unless</span> found? <span class="muControl">break-if</span> quit? <span class="Comment"># only in tests</span> trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[next-event]</span> <span class="Comment"># 'touch' event</span> - t:touch-event, is-touch?:boolean<span class="Special"> <- </span>maybe-convert e, <span class="Constant">touch:variant</span> + t:touch-event, is-touch?:bool<span class="Special"> <- </span>maybe-convert e, <span class="Constant">touch:variant</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> is-touch? move-cursor-in-editor screen, editor, t @@ -69,7 +69,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># keyboard events</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> is-touch? - screen, editor, go-render?:boolean<span class="Special"> <- </span>handle-keyboard-event screen, editor, e + screen, editor, go-render?:bool<span class="Special"> <- </span>handle-keyboard-event screen, editor, e <span class="Delimiter">{</span> <span class="muControl">break-unless</span> go-render? screen<span class="Special"> <- </span>editor-render screen, editor @@ -80,23 +80,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># process click, return if it was on current editor</span> -<span class="muRecipe">def</span> move-cursor-in-editor screen:address:screen, editor:address:editor-data, t:touch-event<span class="muRecipe"> -> </span>in-focus?:boolean, editor:address:editor-data [ +<span class="muRecipe">def</span> move-cursor-in-editor screen:&:screen, editor:&:editor-data, t:touch-event<span class="muRecipe"> -> </span>in-focus?:bool, editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> editor, <span class="Constant">0/false</span> - click-row:number<span class="Special"> <- </span>get t, <span class="Constant">row:offset</span> + click-row:num<span class="Special"> <- </span>get t, <span class="Constant">row:offset</span> <span class="muControl">return-unless</span> click-row, <span class="Constant">0/false</span> <span class="Comment"># ignore clicks on 'menu'</span> - click-column:number<span class="Special"> <- </span>get t, <span class="Constant">column:offset</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - too-far-left?:boolean<span class="Special"> <- </span>lesser-than click-column, left + click-column:num<span class="Special"> <- </span>get t, <span class="Constant">column:offset</span> + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + too-far-left?:bool<span class="Special"> <- </span>lesser-than click-column, left <span class="muControl">return-if</span> too-far-left?, <span class="Constant">0/false</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - too-far-right?:boolean<span class="Special"> <- </span>greater-than click-column, right + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + too-far-right?:bool<span class="Special"> <- </span>greater-than click-column, right <span class="muControl">return-if</span> too-far-right?, <span class="Constant">0/false</span> <span class="Comment"># position cursor</span> <span class="Constant"> <move-cursor-begin></span> editor<span class="Special"> <- </span>snap-cursor screen, editor, click-row, click-column - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">0/never</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> <span class="Comment"># gain focus</span> <span class="muControl">return</span> <span class="Constant">1/true</span> @@ -105,50 +105,50 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># Variant of 'render' that only moves the cursor (coordinates and</span> <span class="Comment"># before-cursor). If it's past the end of a line, it 'slides' it left. If it's</span> <span class="Comment"># past the last line it positions at end of last line.</span> -<span class="muRecipe">def</span> snap-cursor screen:address:screen, editor:address:editor-data, target-row:number, target-column:number<span class="muRecipe"> -> </span>editor:address:editor-data [ +<span class="muRecipe">def</span> snap-cursor screen:&:screen, editor:&:editor-data, target-row:num, target-column:num<span class="muRecipe"> -> </span>editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> editor - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - screen-height:number<span class="Special"> <- </span>screen-height screen + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + screen-height:num<span class="Special"> <- </span>screen-height screen <span class="Comment"># count newlines until screen row</span> - curr:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - prev:address:duplex-list:character<span class="Special"> <- </span>copy curr <span class="Comment"># just in case curr becomes null and we can't compute prev</span> + curr:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + prev:&:duplex-list:char<span class="Special"> <- </span>copy curr <span class="Comment"># just in case curr becomes null and we can't compute prev</span> curr<span class="Special"> <- </span>next curr - row:number<span class="Special"> <- </span>copy <span class="Constant">1/top</span> - column:number<span class="Special"> <- </span>copy left + row:num<span class="Special"> <- </span>copy <span class="Constant">1/top</span> + column:num<span class="Special"> <- </span>copy left *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, target-row - cursor-row:number<span class="Special"> <- </span>copy target-row + cursor-row:num<span class="Special"> <- </span>copy target-row *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, target-column - cursor-column:number<span class="Special"> <- </span>copy target-column - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + cursor-column:num<span class="Special"> <- </span>copy target-column + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> <span class="Delimiter">{</span> <span class="Constant"> +next-character</span> <span class="muControl">break-unless</span> curr - off-screen?:boolean<span class="Special"> <- </span>greater-or-equal row, screen-height + off-screen?:bool<span class="Special"> <- </span>greater-or-equal row, screen-height <span class="muControl">break-if</span> off-screen? <span class="Comment"># update editor-data.before-cursor</span> <span class="Comment"># Doing so at the start of each iteration ensures it stays one step behind</span> <span class="Comment"># the current character.</span> <span class="Delimiter">{</span> - at-cursor-row?:boolean<span class="Special"> <- </span>equal row, cursor-row + at-cursor-row?:bool<span class="Special"> <- </span>equal row, cursor-row <span class="muControl">break-unless</span> at-cursor-row? - at-cursor?:boolean<span class="Special"> <- </span>equal column, cursor-column + at-cursor?:bool<span class="Special"> <- </span>equal column, cursor-column <span class="muControl">break-unless</span> at-cursor? before-cursor<span class="Special"> <- </span>copy prev *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor <span class="Delimiter">}</span> - c:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + c:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> <span class="Delimiter">{</span> <span class="Comment"># newline? move to left rather than 0</span> - newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> newline? <span class="Comment"># adjust cursor if necessary</span> <span class="Delimiter">{</span> - at-cursor-row?:boolean<span class="Special"> <- </span>equal row, cursor-row + at-cursor-row?:bool<span class="Special"> <- </span>equal row, cursor-row <span class="muControl">break-unless</span> at-cursor-row? - left-of-cursor?:boolean<span class="Special"> <- </span>lesser-than column, cursor-column + left-of-cursor?:bool<span class="Special"> <- </span>lesser-than column, cursor-column <span class="muControl">break-unless</span> left-of-cursor? cursor-column<span class="Special"> <- </span>copy column *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column @@ -165,7 +165,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">{</span> <span class="Comment"># at right? wrap. even if there's only one more letter left; we need</span> <span class="Comment"># room for clicking on the cursor after it.</span> - at-right?:boolean<span class="Special"> <- </span>equal column, right + at-right?:bool<span class="Special"> <- </span>equal column, right <span class="muControl">break-unless</span> at-right? column<span class="Special"> <- </span>copy left row<span class="Special"> <- </span>add row, <span class="Constant">1</span> @@ -179,11 +179,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="Comment"># is cursor to the right of the last line? move to end</span> <span class="Delimiter">{</span> - at-cursor-row?:boolean<span class="Special"> <- </span>equal row, cursor-row - cursor-outside-line?:boolean<span class="Special"> <- </span>lesser-or-equal column, cursor-column - before-cursor-on-same-line?:boolean<span class="Special"> <- </span>and at-cursor-row?, cursor-outside-line? - above-cursor-row?:boolean<span class="Special"> <- </span>lesser-than row, cursor-row - before-cursor?:boolean<span class="Special"> <- </span>or before-cursor-on-same-line?, above-cursor-row? + at-cursor-row?:bool<span class="Special"> <- </span>equal row, cursor-row + cursor-outside-line?:bool<span class="Special"> <- </span>lesser-or-equal column, cursor-column + before-cursor-on-same-line?:bool<span class="Special"> <- </span>and at-cursor-row?, cursor-outside-line? + above-cursor-row?:bool<span class="Special"> <- </span>lesser-than row, cursor-row + before-cursor?:bool<span class="Special"> <- </span>or before-cursor-on-same-line?, above-cursor-row? <span class="muControl">break-unless</span> before-cursor? cursor-row<span class="Special"> <- </span>copy row *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row @@ -196,39 +196,39 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># Process an event 'e' and try to minimally update the screen.</span> <span class="Comment"># Set 'go-render?' to true to indicate the caller must perform a non-minimal update.</span> -<span class="muRecipe">def</span> handle-keyboard-event screen:address:screen, editor:address:editor-data, e:event<span class="muRecipe"> -> </span>screen:address:screen, editor:address:editor-data, go-render?:boolean [ +<span class="muRecipe">def</span> handle-keyboard-event screen:&:screen, editor:&:editor-data, e:event<span class="muRecipe"> -> </span>screen:&:screen, editor:&:editor-data, go-render?:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return-unless</span> editor - screen-width:number<span class="Special"> <- </span>screen-width screen - screen-height:number<span class="Special"> <- </span>screen-height screen - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - save-row:number<span class="Special"> <- </span>copy cursor-row - save-column:number<span class="Special"> <- </span>copy cursor-column + screen-width:num<span class="Special"> <- </span>screen-width screen + screen-height:num<span class="Special"> <- </span>screen-height screen + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + save-row:num<span class="Special"> <- </span>copy cursor-row + save-column:num<span class="Special"> <- </span>copy cursor-column <span class="Comment"># character</span> <span class="Delimiter">{</span> - c:character, is-unicode?:boolean<span class="Special"> <- </span>maybe-convert e, <span class="Constant">text:variant</span> + c:char, is-unicode?:bool<span class="Special"> <- </span>maybe-convert e, <span class="Constant">text:variant</span> <span class="muControl">break-unless</span> is-unicode? trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[handle-keyboard-event: special character]</span> <span class="Comment"># exceptions for special characters go here</span> <span class="Constant"> <handle-special-character></span> <span class="Comment"># ignore any other special characters</span> - regular-character?:boolean<span class="Special"> <- </span>greater-or-equal c, <span class="Constant">32/space</span> + regular-character?:bool<span class="Special"> <- </span>greater-or-equal c, <span class="Constant">32/space</span> go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return-unless</span> regular-character? <span class="Comment"># otherwise type it in</span> <span class="Constant"> <insert-character-begin></span> - editor, screen, go-render?:boolean<span class="Special"> <- </span>insert-at-cursor editor, c, screen + editor, screen, go-render?:bool<span class="Special"> <- </span>insert-at-cursor editor, c, screen <span class="Constant"> <insert-character-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> <span class="Comment"># special key to modify the text or move the cursor</span> - k:number, is-keycode?:boolean<span class="Special"> <- </span>maybe-convert e:event, <span class="Constant">keycode:variant</span> + k:num, is-keycode?:bool<span class="Special"> <- </span>maybe-convert e:event, <span class="Constant">keycode:variant</span> assert is-keycode?, <span class="Constant">[event was of unknown type; neither keyboard nor mouse]</span> <span class="Comment"># handlers for each special key will go here</span> <span class="Constant"> <handle-special-key></span> @@ -236,35 +236,35 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> ] -<span class="muRecipe">def</span> insert-at-cursor editor:address:editor-data, c:character, screen:address:screen<span class="muRecipe"> -> </span>editor:address:editor-data, screen:address:screen, go-render?:boolean [ +<span class="muRecipe">def</span> insert-at-cursor editor:&:editor-data, c:char, screen:&:screen<span class="muRecipe"> -> </span>editor:&:editor-data, screen:&:screen, go-render?:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> insert c, before-cursor before-cursor<span class="Special"> <- </span>next before-cursor *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - save-row:number<span class="Special"> <- </span>copy cursor-row - save-column:number<span class="Special"> <- </span>copy cursor-column - screen-width:number<span class="Special"> <- </span>screen-width screen - screen-height:number<span class="Special"> <- </span>screen-height screen + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + save-row:num<span class="Special"> <- </span>copy cursor-row + save-column:num<span class="Special"> <- </span>copy cursor-column + screen-width:num<span class="Special"> <- </span>screen-width screen + screen-height:num<span class="Special"> <- </span>screen-height screen <span class="Comment"># occasionally we'll need to mess with the cursor</span> <span class="Constant"> <insert-character-special-case></span> <span class="Comment"># but mostly we'll just move the cursor right</span> cursor-column<span class="Special"> <- </span>add cursor-column, <span class="Constant">1</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column - next:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + next:&:duplex-list:char<span class="Special"> <- </span>next before-cursor <span class="Delimiter">{</span> <span class="Comment"># at end of all text? no need to scroll? just print the character and leave</span> - at-end?:boolean<span class="Special"> <- </span>equal next, <span class="Constant">0/null</span> + at-end?:bool<span class="Special"> <- </span>equal next, <span class="Constant">0/null</span> <span class="muControl">break-unless</span> at-end? - bottom:number<span class="Special"> <- </span>subtract screen-height, <span class="Constant">1</span> - at-bottom?:boolean<span class="Special"> <- </span>equal save-row, bottom - at-right?:boolean<span class="Special"> <- </span>equal save-column, right - overflow?:boolean<span class="Special"> <- </span>and at-bottom?, at-right? + bottom:num<span class="Special"> <- </span>subtract screen-height, <span class="Constant">1</span> + at-bottom?:bool<span class="Special"> <- </span>equal save-row, bottom + at-right?:bool<span class="Special"> <- </span>equal save-column, right + overflow?:bool<span class="Special"> <- </span>and at-bottom?, at-right? <span class="muControl">break-if</span> overflow? move-cursor screen, save-row, save-column print screen, c @@ -274,20 +274,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">{</span> <span class="Comment"># not at right margin? print the character and rest of line</span> <span class="muControl">break-unless</span> next - at-right?:boolean<span class="Special"> <- </span>greater-or-equal cursor-column, screen-width + at-right?:bool<span class="Special"> <- </span>greater-or-equal cursor-column, screen-width <span class="muControl">break-if</span> at-right? - curr:address:duplex-list:character<span class="Special"> <- </span>copy before-cursor + curr:&:duplex-list:char<span class="Special"> <- </span>copy before-cursor move-cursor screen, save-row, save-column - curr-column:number<span class="Special"> <- </span>copy save-column + curr-column:num<span class="Special"> <- </span>copy save-column <span class="Delimiter">{</span> <span class="Comment"># hit right margin? give up and let caller render</span> go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> - at-right?:boolean<span class="Special"> <- </span>greater-than curr-column, right + at-right?:bool<span class="Special"> <- </span>greater-than curr-column, right <span class="muControl">return-if</span> at-right? <span class="muControl">break-unless</span> curr <span class="Comment"># newline? done.</span> - currc:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> - at-newline?:boolean<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> + currc:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + at-newline?:bool<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-newline? print screen, currc curr-column<span class="Special"> <- </span>add curr-column, <span class="Constant">1</span> @@ -302,12 +302,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># helper for tests</span> -<span class="muRecipe">def</span> editor-render screen:address:screen, editor:address:editor-data<span class="muRecipe"> -> </span>screen:address:screen, editor:address:editor-data [ +<span class="muRecipe">def</span> editor-render screen:&:screen, editor:&:editor-data<span class="muRecipe"> -> </span>screen:&:screen, editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - row:number, column:number<span class="Special"> <- </span>render screen, editor + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + row:num, column:num<span class="Special"> <- </span>render screen, editor clear-line-until screen, right row<span class="Special"> <- </span>add row, <span class="Constant">1</span> draw-horizontal screen, row, left, right, <span class="Constant">9480/horizontal-dotted</span> @@ -318,11 +318,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-handles-empty-event-queue [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data assume-console <span class="Constant">[]</span> run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -335,16 +335,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-handles-mouse-clicks [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">1</span> <span class="Comment"># on the 'b'</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -362,15 +362,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-handles-mouse-clicks-outside-text [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">7</span> <span class="Comment"># last line, to the right of text</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># cursor row</span> @@ -383,15 +383,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">7</span> <span class="Comment"># interior line, to the right of text</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># cursor row</span> @@ -404,15 +404,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">7</span> <span class="Comment"># below text</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> <span class="Comment"># cursor row</span> @@ -425,17 +425,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> <span class="Comment"># editor occupies only left half of screen</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ <span class="Comment"># click on right half of screen</span> left-click <span class="Constant">3</span>, <span class="Constant">8</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -453,17 +453,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-handles-mouse-clicks-in-menu-area [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ <span class="Comment"># click on first, 'menu' row</span> left-click <span class="Constant">0</span>, <span class="Constant">3</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># no change to cursor</span> memory-should-contain [ @@ -475,14 +475,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-inserts-characters-into-empty-editor [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ type <span class="Constant">[abc]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -496,8 +496,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-inserts-characters-at-cursor [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># type two letters at different places</span> assume-console [ @@ -506,7 +506,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[d]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -520,15 +520,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-inserts-characters-at-cursor-2 [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">5</span> <span class="Comment"># right of last line</span> type <span class="Constant">[d]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -543,15 +543,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">5</span> <span class="Comment"># right of non-last line</span> type <span class="Constant">[e]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -566,15 +566,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-inserts-characters-at-cursor-3 [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">5</span> <span class="Comment"># below all text</span> type <span class="Constant">[d]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -589,15 +589,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">5</span> <span class="Comment"># below all text</span> type <span class="Constant">[e]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -613,15 +613,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">5</span> <span class="Comment"># below all text</span> type <span class="Constant">[ef]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -636,13 +636,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-moves-cursor-after-inserting-characters [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ab]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data assume-console [ type <span class="Constant">[01]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -657,14 +657,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-wraps-line-on-insert [ assume-screen <span class="Constant">5/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># type a letter</span> assume-console [ type <span class="Constant">[e]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># no wrap yet</span> screen-should-contain [ @@ -679,7 +679,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[f]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># now wrap</span> screen-should-contain [ @@ -696,17 +696,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abcdefg</span> <span class="Constant">defg]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># type more text at the start</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">0</span> type <span class="Constant">[abc]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor is not wrapped</span> memory-should-contain [ @@ -729,26 +729,26 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># if either:</span> <span class="Comment"># a) we're at the end of the line and at the column of the wrap indicator, or</span> <span class="Comment"># b) we're not at end of line and just before the column of the wrap indicator</span> - wrap-column:number<span class="Special"> <- </span>copy right - before-wrap-column:number<span class="Special"> <- </span>subtract wrap-column, <span class="Constant">1</span> - at-wrap?:boolean<span class="Special"> <- </span>greater-or-equal cursor-column, wrap-column - just-before-wrap?:boolean<span class="Special"> <- </span>greater-or-equal cursor-column, before-wrap-column - next:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + wrap-column:num<span class="Special"> <- </span>copy right + before-wrap-column:num<span class="Special"> <- </span>subtract wrap-column, <span class="Constant">1</span> + at-wrap?:bool<span class="Special"> <- </span>greater-or-equal cursor-column, wrap-column + just-before-wrap?:bool<span class="Special"> <- </span>greater-or-equal cursor-column, before-wrap-column + next:&:duplex-list:char<span class="Special"> <- </span>next before-cursor <span class="Comment"># at end of line? next == 0 || next.value == 10/newline</span> - at-end-of-line?:boolean<span class="Special"> <- </span>equal next, <span class="Constant">0</span> + at-end-of-line?:bool<span class="Special"> <- </span>equal next, <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> at-end-of-line? - next-character:character<span class="Special"> <- </span>get *next, <span class="Constant">value:offset</span> + next-character:char<span class="Special"> <- </span>get *next, <span class="Constant">value:offset</span> at-end-of-line?<span class="Special"> <- </span>equal next-character, <span class="Constant">10/newline</span> <span class="Delimiter">}</span> <span class="Comment"># break unless ((eol? and at-wrap?) or (~eol? and just-before-wrap?))</span> - move-cursor-to-next-line?:boolean<span class="Special"> <- </span>copy <span class="Constant">0/false</span> + move-cursor-to-next-line?:bool<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> at-end-of-line? move-cursor-to-next-line?<span class="Special"> <- </span>copy just-before-wrap? <span class="Comment"># if we're moving the cursor because it's in the middle of a wrapping</span> <span class="Comment"># line, adjust it to left-most column</span> - potential-new-cursor-column:number<span class="Special"> <- </span>copy left + potential-new-cursor-column:num<span class="Special"> <- </span>copy left <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> at-end-of-line? @@ -756,7 +756,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># if we're moving the cursor because it's at the end of a wrapping line,</span> <span class="Comment"># adjust it to one past the left-most column to make room for the</span> <span class="Comment"># newly-inserted wrap-indicator</span> - potential-new-cursor-column:number<span class="Special"> <- </span>add left, <span class="Constant">1/make-room-for-wrap-indicator</span> + potential-new-cursor-column:num<span class="Special"> <- </span>add left, <span class="Constant">1/make-room-for-wrap-indicator</span> <span class="Delimiter">}</span> <span class="muControl">break-unless</span> move-cursor-to-next-line? cursor-column<span class="Special"> <- </span>copy potential-new-cursor-column @@ -765,7 +765,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row <span class="Comment"># if we're out of the screen, scroll down</span> <span class="Delimiter">{</span> - below-screen?:boolean<span class="Special"> <- </span>greater-or-equal cursor-row, screen-height + below-screen?:bool<span class="Special"> <- </span>greater-or-equal cursor-row, screen-height <span class="muControl">break-unless</span> below-screen? <span class="Constant"> <scroll-down></span> <span class="Delimiter">}</span> @@ -777,15 +777,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-wraps-cursor-after-inserting-characters-in-middle-of-line [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abcde]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">3</span> <span class="Comment"># right before the wrap icon</span> type <span class="Constant">[f]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -806,7 +806,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor containing two lines</span> contents:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">xyz]</span> - <span class="Constant">1</span>:address:editor-data/<span class="Special">raw <- </span>new-editor contents, screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">1</span>:&:editor-data/<span class="Special">raw <- </span>new-editor contents, screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .abc .</span> @@ -818,7 +818,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[de]</span> <span class="Comment"># trigger wrap</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">1</span>:address:editor-data/<span class="Special">raw</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">1</span>:&:editor-data/<span class="Special">raw</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -832,15 +832,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-wraps-cursor-to-left-margin [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abcde]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">2/left</span>, <span class="Constant">7/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">2/left</span>, <span class="Constant">7/right</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">5</span> <span class="Comment"># line is full; no wrap icon yet</span> type <span class="Constant">[01]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -858,7 +858,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># if newline, move cursor to start of next line, and maybe align indent with previous line</span> <span class="muData">container</span> editor-data [ - indent?:boolean + indent?:bool ] <span class="muRecipe">after</span> <span class="Constant"><editor-initialization></span> [ @@ -868,13 +868,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-moves-cursor-down-after-inserting-newline [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> assume-console [ type <span class="Constant">[0</span> <span class="Constant">1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -887,7 +887,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-special-character></span> [ <span class="Delimiter">{</span> - newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> newline? <span class="Constant"> <insert-enter-begin></span> editor<span class="Special"> <- </span>insert-new-line-and-indent editor, screen @@ -897,15 +897,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> insert-new-line-and-indent editor:address:editor-data, screen:address:screen<span class="muRecipe"> -> </span>editor:address:editor-data, screen:address:screen, go-render?:boolean [ +<span class="muRecipe">def</span> insert-new-line-and-indent editor:&:editor-data, screen:&:screen<span class="muRecipe"> -> </span>editor:&:editor-data, screen:&:screen, go-render?:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - screen-height:number<span class="Special"> <- </span>screen-height screen + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + screen-height:num<span class="Special"> <- </span>screen-height screen <span class="Comment"># insert newline</span> insert <span class="Constant">10/newline</span>, before-cursor before-cursor<span class="Special"> <- </span>next before-cursor @@ -916,7 +916,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column <span class="Comment"># maybe scroll</span> <span class="Delimiter">{</span> - below-screen?:boolean<span class="Special"> <- </span>greater-or-equal cursor-row, screen-height <span class="Comment"># must be equal, never greater</span> + below-screen?:bool<span class="Special"> <- </span>greater-or-equal cursor-row, screen-height <span class="Comment"># must be equal, never greater</span> <span class="muControl">break-unless</span> below-screen? <span class="Constant"> <scroll-down></span> go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> @@ -924,16 +924,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row <span class="Delimiter">}</span> <span class="Comment"># indent if necessary</span> - indent?:boolean<span class="Special"> <- </span>get *editor, <span class="Constant">indent?:offset</span> + indent?:bool<span class="Special"> <- </span>get *editor, <span class="Constant">indent?:offset</span> <span class="muControl">return-unless</span> indent? - d:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> - end-of-previous-line:address:duplex-list:character<span class="Special"> <- </span>prev before-cursor - indent:number<span class="Special"> <- </span>line-indent end-of-previous-line, d - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + d:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> + end-of-previous-line:&:duplex-list:char<span class="Special"> <- </span>prev before-cursor + indent:num<span class="Special"> <- </span>line-indent end-of-previous-line, d + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> - indent-done?:boolean<span class="Special"> <- </span>greater-or-equal i, indent + indent-done?:bool<span class="Special"> <- </span>greater-or-equal i, indent <span class="muControl">break-if</span> indent-done? - editor, screen, go-render?:boolean<span class="Special"> <- </span>insert-at-cursor editor, <span class="Constant">32/space</span>, screen + editor, screen, go-render?:bool<span class="Special"> <- </span>insert-at-cursor editor, <span class="Constant">32/space</span>, screen i<span class="Special"> <- </span>add i, <span class="Constant">1</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> @@ -941,23 +941,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># takes a pointer 'curr' into the doubly-linked list and its sentinel, counts</span> <span class="Comment"># the number of spaces at the start of the line containing 'curr'.</span> -<span class="muRecipe">def</span> line-indent curr:address:duplex-list:character, start:address:duplex-list:character<span class="muRecipe"> -> </span>result:number [ +<span class="muRecipe">def</span> line-indent curr:&:duplex-list:char, start:&:duplex-list:char<span class="muRecipe"> -> </span>result:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - result:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + result:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="muControl">return-unless</span> curr - at-start?:boolean<span class="Special"> <- </span>equal curr, start + at-start?:bool<span class="Special"> <- </span>equal curr, start <span class="muControl">return-if</span> at-start? <span class="Delimiter">{</span> curr<span class="Special"> <- </span>prev curr <span class="muControl">break-unless</span> curr - at-start?:boolean<span class="Special"> <- </span>equal curr, start + at-start?:bool<span class="Special"> <- </span>equal curr, start <span class="muControl">break-if</span> at-start? - c:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> - at-newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + c:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + at-newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-newline? <span class="Comment"># if c is a space, increment result</span> - is-space?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">32/space</span> + is-space?:bool<span class="Special"> <- </span>equal c, <span class="Constant">32/space</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> is-space? result<span class="Special"> <- </span>add result, <span class="Constant">1</span> @@ -974,13 +974,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-moves-cursor-down-after-inserting-newline-2 [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">1/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">1/left</span>, <span class="Constant">10/right</span> assume-console [ type <span class="Constant">[0</span> <span class="Constant">1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -994,7 +994,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-clears-previous-line-completely-after-inserting-newline [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abcde]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> assume-console [ press enter ] @@ -1006,7 +1006,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> . .</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># line should be fully cleared</span> screen-should-contain [ @@ -1023,7 +1023,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ab</span> <span class="Constant"> cd</span> <span class="Constant">ef]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># position cursor after 'cd' and hit 'newline'</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">8</span> @@ -1031,9 +1031,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor should be below start of previous line</span> memory-should-contain [ @@ -1047,7 +1047,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ab</span> <span class="Constant"> cd</span> <span class="Constant">ef]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># position cursor after 'cd' and hit 'newline' surrounded by paste markers</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">8</span> @@ -1056,9 +1056,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press <span class="Constant">65506</span> <span class="Comment"># end paste</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor should be below start of previous line</span> memory-should-contain [ @@ -1069,7 +1069,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-special-key></span> [ <span class="Delimiter">{</span> - paste-start?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65507/paste-start</span> + paste-start?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65507/paste-start</span> <span class="muControl">break-unless</span> paste-start? *editor<span class="Special"> <- </span>put *editor, <span class="Constant">indent?:offset</span>, <span class="Constant">0/false</span> go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> @@ -1079,7 +1079,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-special-key></span> [ <span class="Delimiter">{</span> - paste-end?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65506/paste-end</span> + paste-end?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65506/paste-end</span> <span class="muControl">break-unless</span> paste-end? *editor<span class="Special"> <- </span>put *editor, <span class="Constant">indent?:offset</span>, <span class="Constant">1/true</span> go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> @@ -1089,28 +1089,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="SalientComment">## helpers</span> -<span class="muRecipe">def</span> draw-horizontal screen:address:screen, row:number, x:number, right:number<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> draw-horizontal screen:&:screen, row:num, x:num, right:num<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - style:character, style-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + style:char, style-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> style-found? style<span class="Special"> <- </span>copy <span class="Constant">9472/horizontal</span> <span class="Delimiter">}</span> - color:number, color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + color:num, color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default color to white</span> <span class="muControl">break-if</span> color-found? color<span class="Special"> <- </span>copy <span class="Constant">245/grey</span> <span class="Delimiter">}</span> - bg-color:number, bg-color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + bg-color:num, bg-color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> bg-color-found? bg-color<span class="Special"> <- </span>copy <span class="Constant">0/black</span> <span class="Delimiter">}</span> screen<span class="Special"> <- </span>move-cursor screen, row, x <span class="Delimiter">{</span> - continue?:boolean<span class="Special"> <- </span>lesser-or-equal x, right <span class="Comment"># right is inclusive, to match editor-data semantics</span> + continue?:bool<span class="Special"> <- </span>lesser-or-equal x, right <span class="Comment"># right is inclusive, to match editor-data semantics</span> <span class="muControl">break-unless</span> continue? print screen, style, color, bg-color x<span class="Special"> <- </span>add x, <span class="Constant">1</span> diff --git a/html/edit/003-shortcuts.mu.html b/html/edit/003-shortcuts.mu.html index ce053fd8..90879f62 100644 --- a/html/edit/003-shortcuts.mu.html +++ b/html/edit/003-shortcuts.mu.html @@ -43,12 +43,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># just one character in final line</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ab</span> <span class="Constant">cd]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> assume-console [ press tab ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -59,11 +59,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-special-character></span> [ <span class="Delimiter">{</span> - tab?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">9/tab</span> + tab?:bool<span class="Special"> <- </span>equal c, <span class="Constant">9/tab</span> <span class="muControl">break-unless</span> tab? <span class="Constant"> <insert-character-begin></span> - editor, screen, go-render?:boolean<span class="Special"> <- </span>insert-at-cursor editor, <span class="Constant">32/space</span>, screen - editor, screen, go-render?:boolean<span class="Special"> <- </span>insert-at-cursor editor, <span class="Constant">32/space</span>, screen + editor, screen, go-render?:bool<span class="Special"> <- </span>insert-at-cursor editor, <span class="Constant">32/space</span>, screen + editor, screen, go-render?:bool<span class="Special"> <- </span>insert-at-cursor editor, <span class="Constant">32/space</span>, screen <span class="Constant"> <insert-character-end></span> go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="muControl">return</span> @@ -75,17 +75,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-handles-backspace-key [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">1</span> press backspace ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -102,10 +102,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-special-character></span> [ <span class="Delimiter">{</span> - delete-previous-character?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">8/backspace</span> + delete-previous-character?:bool<span class="Special"> <- </span>equal c, <span class="Constant">8/backspace</span> <span class="muControl">break-unless</span> delete-previous-character? <span class="Constant"> <backspace-character-begin></span> - editor, screen, go-render?:boolean, backspaced-cell:address:duplex-list:character<span class="Special"> <- </span>delete-before-cursor editor, screen + editor, screen, go-render?:bool, backspaced-cell:&:duplex-list:char<span class="Special"> <- </span>delete-before-cursor editor, screen <span class="Constant"> <backspace-character-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> @@ -114,45 +114,45 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># return values:</span> <span class="Comment"># go-render? - whether caller needs to update the screen</span> <span class="Comment"># backspaced-cell - value deleted (or 0 if nothing was deleted) so we can save it for undo, etc.</span> -<span class="muRecipe">def</span> delete-before-cursor editor:address:editor-data, screen:address:screen<span class="muRecipe"> -> </span>editor:address:editor-data, screen:address:screen, go-render?:boolean, backspaced-cell:address:duplex-list:character [ +<span class="muRecipe">def</span> delete-before-cursor editor:&:editor-data, screen:&:screen<span class="muRecipe"> -> </span>editor:&:editor-data, screen:&:screen, go-render?:bool, backspaced-cell:&:duplex-list:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - data:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + data:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> <span class="Comment"># if at start of text (before-cursor at § sentinel), return</span> - prev:address:duplex-list:character<span class="Special"> <- </span>prev before-cursor + prev:&:duplex-list:char<span class="Special"> <- </span>prev before-cursor go-render?, backspaced-cell<span class="Special"> <- </span>copy <span class="Constant">0/no-more-render</span>, <span class="Constant">0/nothing-deleted</span> <span class="muControl">return-unless</span> prev trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[delete-before-cursor]</span> - original-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - editor, scroll?:boolean<span class="Special"> <- </span>move-cursor-coordinates-left editor - backspaced-cell:address:duplex-list:character<span class="Special"> <- </span>copy before-cursor + original-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + editor, scroll?:bool<span class="Special"> <- </span>move-cursor-coordinates-left editor + backspaced-cell:&:duplex-list:char<span class="Special"> <- </span>copy before-cursor data<span class="Special"> <- </span>remove before-cursor, data <span class="Comment"># will also neatly trim next/prev pointers in backspaced-cell/before-cursor</span> before-cursor<span class="Special"> <- </span>copy prev *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="muControl">return-if</span> scroll? - screen-width:number<span class="Special"> <- </span>screen-width screen - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + screen-width:num<span class="Special"> <- </span>screen-width screen + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> <span class="Comment"># did we just backspace over a newline?</span> - same-row?:boolean<span class="Special"> <- </span>equal cursor-row, original-row + same-row?:bool<span class="Special"> <- </span>equal cursor-row, original-row go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="muControl">return-unless</span> same-row? - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - curr:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + curr:&:duplex-list:char<span class="Special"> <- </span>next before-cursor screen<span class="Special"> <- </span>move-cursor screen, cursor-row, cursor-column - curr-column:number<span class="Special"> <- </span>copy cursor-column + curr-column:num<span class="Special"> <- </span>copy cursor-column <span class="Delimiter">{</span> <span class="Comment"># hit right margin? give up and let caller render</span> - at-right?:boolean<span class="Special"> <- </span>greater-or-equal curr-column, right + at-right?:bool<span class="Special"> <- </span>greater-or-equal curr-column, right go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="muControl">return-if</span> at-right? <span class="muControl">break-unless</span> curr <span class="Comment"># newline? done.</span> - currc:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> - at-newline?:boolean<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> + currc:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + at-newline?:bool<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-newline? screen<span class="Special"> <- </span>print screen, currc curr-column<span class="Special"> <- </span>add curr-column, <span class="Constant">1</span> @@ -160,21 +160,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">loop</span> <span class="Delimiter">}</span> <span class="Comment"># we're guaranteed not to be at the right margin</span> - space:character<span class="Special"> <- </span>copy <span class="Constant">32/space</span> + space:char<span class="Special"> <- </span>copy <span class="Constant">32/space</span> screen<span class="Special"> <- </span>print screen, space go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> ] -<span class="muRecipe">def</span> move-cursor-coordinates-left editor:address:editor-data<span class="muRecipe"> -> </span>editor:address:editor-data, go-render?:boolean [ +<span class="muRecipe">def</span> move-cursor-coordinates-left editor:&:editor-data<span class="muRecipe"> -> </span>editor:&:editor-data, go-render?:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> <span class="Comment"># if not at left margin, move one character left</span> <span class="Delimiter">{</span> - at-left-margin?:boolean<span class="Special"> <- </span>equal cursor-column, left + at-left-margin?:bool<span class="Special"> <- </span>equal cursor-column, left <span class="muControl">break-if</span> at-left-margin? trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[decrementing cursor column]</span> cursor-column<span class="Special"> <- </span>subtract cursor-column, <span class="Constant">1</span> @@ -183,8 +183,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> <span class="Delimiter">}</span> <span class="Comment"># if at left margin, we must move to previous row:</span> - top-of-screen?:boolean<span class="Special"> <- </span>equal cursor-row, <span class="Constant">1</span> <span class="Comment"># exclude menu bar</span> - go-render?:boolean<span class="Special"> <- </span>copy <span class="Constant">0/false</span> + top-of-screen?:bool<span class="Special"> <- </span>equal cursor-row, <span class="Constant">1</span> <span class="Comment"># exclude menu bar</span> + go-render?:bool<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> top-of-screen? cursor-row<span class="Special"> <- </span>subtract cursor-row, <span class="Constant">1</span> @@ -197,19 +197,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="Comment"># case 1: if previous character was newline, figure out how long the previous line is</span> - previous-character:character<span class="Special"> <- </span>get *before-cursor, <span class="Constant">value:offset</span> - previous-character-is-newline?:boolean<span class="Special"> <- </span>equal previous-character, <span class="Constant">10/newline</span> + previous-character:char<span class="Special"> <- </span>get *before-cursor, <span class="Constant">value:offset</span> + previous-character-is-newline?:bool<span class="Special"> <- </span>equal previous-character, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> previous-character-is-newline? <span class="Comment"># compute length of previous line</span> trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[switching to previous line]</span> - d:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> - end-of-line:number<span class="Special"> <- </span>previous-line-length before-cursor, d - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - width:number<span class="Special"> <- </span>subtract right, left - wrap?:boolean<span class="Special"> <- </span>greater-than end-of-line, width + d:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> + end-of-line:num<span class="Special"> <- </span>previous-line-length before-cursor, d + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + width:num<span class="Special"> <- </span>subtract right, left + wrap?:bool<span class="Special"> <- </span>greater-than end-of-line, width <span class="Delimiter">{</span> <span class="muControl">break-unless</span> wrap? - _, column-offset:number<span class="Special"> <- </span>divide-with-remainder end-of-line, width + _, column-offset:num<span class="Special"> <- </span>divide-with-remainder end-of-line, width cursor-column<span class="Special"> <- </span>add left, column-offset *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column <span class="Delimiter">}</span> @@ -222,27 +222,27 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="Comment"># case 2: if previous-character was not newline, we're just at a wrapped line</span> trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[wrapping to previous line]</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> cursor-column<span class="Special"> <- </span>subtract right, <span class="Constant">1</span> <span class="Comment"># leave room for wrap icon</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column ] <span class="Comment"># takes a pointer 'curr' into the doubly-linked list and its sentinel, counts</span> <span class="Comment"># the length of the previous line before the 'curr' pointer.</span> -<span class="muRecipe">def</span> previous-line-length curr:address:duplex-list:character, start:address:duplex-list:character<span class="muRecipe"> -> </span>result:number [ +<span class="muRecipe">def</span> previous-line-length curr:&:duplex-list:char, start:&:duplex-list:char<span class="muRecipe"> -> </span>result:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - result:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + result:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="muControl">return-unless</span> curr - at-start?:boolean<span class="Special"> <- </span>equal curr, start + at-start?:bool<span class="Special"> <- </span>equal curr, start <span class="muControl">return-if</span> at-start? <span class="Delimiter">{</span> curr<span class="Special"> <- </span>prev curr <span class="muControl">break-unless</span> curr - at-start?:boolean<span class="Special"> <- </span>equal curr, start + at-start?:bool<span class="Special"> <- </span>equal curr, start <span class="muControl">break-if</span> at-start? - c:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> - at-newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + c:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + at-newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-newline? result<span class="Special"> <- </span>add result, <span class="Constant">1</span> <span class="muControl">loop</span> @@ -254,15 +254,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># just one character in final line</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ab</span> <span class="Constant">cd]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">0</span> <span class="Comment"># cursor at only character in final line</span> press backspace ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -281,8 +281,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize editor with two long-ish but non-wrapping lines</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc def</span> <span class="Constant">ghi jkl]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># position the cursor at the start of the second and hit backspace</span> assume-console [ @@ -290,7 +290,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press backspace ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># resulting single line should wrap correctly</span> screen-should-contain [ @@ -306,8 +306,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Comment"># initialize editor in part of the screen with a long line</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc def ghij]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">8/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">8/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># confirm that it wraps</span> screen-should-contain [ <span class="Constant"> . .</span> @@ -322,7 +322,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press backspace ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># resulting single line should wrap correctly and not overflow its bounds</span> screen-should-contain [ @@ -339,14 +339,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-handles-delete-key [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ press delete ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -360,7 +360,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press delete ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -373,44 +373,44 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-special-key></span> [ <span class="Delimiter">{</span> - delete-next-character?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65522/delete</span> + delete-next-character?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65522/delete</span> <span class="muControl">break-unless</span> delete-next-character? <span class="Constant"> <delete-character-begin></span> - editor, screen, go-render?:boolean, deleted-cell:address:duplex-list:character<span class="Special"> <- </span>delete-at-cursor editor, screen + editor, screen, go-render?:bool, deleted-cell:&:duplex-list:char<span class="Special"> <- </span>delete-at-cursor editor, screen <span class="Constant"> <delete-character-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> delete-at-cursor editor:address:editor-data, screen:address:screen<span class="muRecipe"> -> </span>editor:address:editor-data, screen:address:screen, go-render?:boolean, deleted-cell:address:duplex-list:character [ +<span class="muRecipe">def</span> delete-at-cursor editor:&:editor-data, screen:&:screen<span class="muRecipe"> -> </span>editor:&:editor-data, screen:&:screen, go-render?:bool, deleted-cell:&:duplex-list:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - data:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> - deleted-cell:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + data:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> + deleted-cell:&:duplex-list:char<span class="Special"> <- </span>next before-cursor go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return-unless</span> deleted-cell - currc:character<span class="Special"> <- </span>get *deleted-cell, <span class="Constant">value:offset</span> + currc:char<span class="Special"> <- </span>get *deleted-cell, <span class="Constant">value:offset</span> data<span class="Special"> <- </span>remove deleted-cell, data - deleted-newline?:boolean<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> + deleted-newline?:bool<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="muControl">return-if</span> deleted-newline? <span class="Comment"># wasn't a newline? render rest of line</span> - curr:address:duplex-list:character<span class="Special"> <- </span>next before-cursor <span class="Comment"># refresh after remove above</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + curr:&:duplex-list:char<span class="Special"> <- </span>next before-cursor <span class="Comment"># refresh after remove above</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> screen<span class="Special"> <- </span>move-cursor screen, cursor-row, cursor-column - curr-column:number<span class="Special"> <- </span>copy cursor-column - screen-width:number<span class="Special"> <- </span>screen-width screen + curr-column:num<span class="Special"> <- </span>copy cursor-column + screen-width:num<span class="Special"> <- </span>screen-width screen <span class="Delimiter">{</span> <span class="Comment"># hit right margin? give up and let caller render</span> - at-right?:boolean<span class="Special"> <- </span>greater-or-equal curr-column, screen-width + at-right?:bool<span class="Special"> <- </span>greater-or-equal curr-column, screen-width go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="muControl">return-if</span> at-right? <span class="muControl">break-unless</span> curr <span class="Comment"># newline? done.</span> - currc:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> - at-newline?:boolean<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> + currc:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + at-newline?:bool<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-newline? screen<span class="Special"> <- </span>print screen, currc curr-column<span class="Special"> <- </span>add curr-column, <span class="Constant">1</span> @@ -418,7 +418,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">loop</span> <span class="Delimiter">}</span> <span class="Comment"># we're guaranteed not to be at the right margin</span> - space:character<span class="Special"> <- </span>copy <span class="Constant">32/space</span> + space:char<span class="Special"> <- </span>copy <span class="Constant">32/space</span> screen<span class="Special"> <- </span>print screen, space go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> ] @@ -428,15 +428,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-moves-cursor-right-with-key [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ press right-arrow type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -449,41 +449,41 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-special-key></span> [ <span class="Delimiter">{</span> - move-to-next-character?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65514/right-arrow</span> + move-to-next-character?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65514/right-arrow</span> <span class="muControl">break-unless</span> move-to-next-character? <span class="Comment"># if not at end of text</span> - next-cursor:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + next-cursor:&:duplex-list:char<span class="Special"> <- </span>next before-cursor <span class="muControl">break-unless</span> next-cursor <span class="Comment"># scan to next character</span> <span class="Constant"> <move-cursor-begin></span> before-cursor<span class="Special"> <- </span>copy next-cursor *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor - editor, go-render?:boolean<span class="Special"> <- </span>move-cursor-coordinates-right editor, screen-height + editor, go-render?:bool<span class="Special"> <- </span>move-cursor-coordinates-right editor, screen-height screen<span class="Special"> <- </span>move-cursor screen, cursor-row, cursor-column - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">2/right-arrow</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">2/right-arrow</span> <span class="Constant"> <move-cursor-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> move-cursor-coordinates-right editor:address:editor-data, screen-height:number<span class="muRecipe"> -> </span>editor:address:editor-data, go-render?:boolean [ +<span class="muRecipe">def</span> move-cursor-coordinates-right editor:&:editor-data, screen-height:num<span class="muRecipe"> -> </span>editor:&:editor-data, go-render?:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor <span class="Constant">before-cursor:offset</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor <span class="Constant">before-cursor:offset</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> <span class="Comment"># if crossed a newline, move cursor to start of next row</span> <span class="Delimiter">{</span> - old-cursor-character:character<span class="Special"> <- </span>get *before-cursor, <span class="Constant">value:offset</span> - was-at-newline?:boolean<span class="Special"> <- </span>equal old-cursor-character, <span class="Constant">10/newline</span> + old-cursor-character:char<span class="Special"> <- </span>get *before-cursor, <span class="Constant">value:offset</span> + was-at-newline?:bool<span class="Special"> <- </span>equal old-cursor-character, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> was-at-newline? cursor-row<span class="Special"> <- </span>add cursor-row, <span class="Constant">1</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row cursor-column<span class="Special"> <- </span>copy left *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column - below-screen?:boolean<span class="Special"> <- </span>greater-or-equal cursor-row, screen-height <span class="Comment"># must be equal</span> + below-screen?:bool<span class="Special"> <- </span>greater-or-equal cursor-row, screen-height <span class="Comment"># must be equal</span> go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return-unless</span> below-screen? <span class="Constant"> <scroll-down></span> @@ -495,20 +495,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># if the line wraps, move cursor to start of next row</span> <span class="Delimiter">{</span> <span class="Comment"># if we're at the column just before the wrap indicator</span> - wrap-column:number<span class="Special"> <- </span>subtract right, <span class="Constant">1</span> - at-wrap?:boolean<span class="Special"> <- </span>equal cursor-column, wrap-column + wrap-column:num<span class="Special"> <- </span>subtract right, <span class="Constant">1</span> + at-wrap?:bool<span class="Special"> <- </span>equal cursor-column, wrap-column <span class="muControl">break-unless</span> at-wrap? <span class="Comment"># and if next character isn't newline</span> - next:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + next:&:duplex-list:char<span class="Special"> <- </span>next before-cursor <span class="muControl">break-unless</span> next - next-character:character<span class="Special"> <- </span>get *next, <span class="Constant">value:offset</span> - newline?:boolean<span class="Special"> <- </span>equal next-character, <span class="Constant">10/newline</span> + next-character:char<span class="Special"> <- </span>get *next, <span class="Constant">value:offset</span> + newline?:bool<span class="Special"> <- </span>equal next-character, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> newline? cursor-row<span class="Special"> <- </span>add cursor-row, <span class="Constant">1</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row cursor-column<span class="Special"> <- </span>copy left *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column - below-screen?:boolean<span class="Special"> <- </span>greater-or-equal cursor-row, screen-height <span class="Comment"># must be equal</span> + below-screen?:bool<span class="Special"> <- </span>greater-or-equal cursor-row, screen-height <span class="Comment"># must be equal</span> <span class="muControl">return-unless</span> below-screen?, editor/same-as-ingredient:<span class="Constant">0</span>, <span class="Constant">0/no-more-render</span> <span class="Constant"> <scroll-down></span> cursor-row<span class="Special"> <- </span>subtract cursor-row, <span class="Constant">1</span> <span class="Comment"># bring back into screen range</span> @@ -526,8 +526,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># type right-arrow a few times to get to start of second line</span> assume-console [ @@ -537,7 +537,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press right-arrow <span class="Comment"># next line</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] check-trace-count-for-label <span class="Constant">0</span>, <span class="Constant">[print-character]</span> <span class="Comment"># type something and ensure it goes where it should</span> @@ -545,7 +545,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -561,8 +561,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">1/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">1/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data assume-console [ press right-arrow press right-arrow @@ -571,7 +571,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -585,17 +585,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-moves-cursor-to-next-wrapped-line-with-right-arrow [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abcdef]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">3</span> press right-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -615,8 +615,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Comment"># line just barely wrapping</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abcde]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># position cursor at last character before wrap and hit right-arrow</span> assume-console [ @@ -624,9 +624,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press right-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -637,9 +637,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press right-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -651,17 +651,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-moves-cursor-to-next-wrapped-line-with-right-arrow-3 [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abcdef]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">1/left</span>, <span class="Constant">6/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">1/left</span>, <span class="Constant">6/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">4</span> press right-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] screen-should-contain [ <span class="Constant"> . .</span> @@ -681,8 +681,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># move to end of line, press right-arrow, type a character</span> assume-console [ @@ -691,7 +691,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># new character should be in next line</span> screen-should-contain [ @@ -711,8 +711,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-moves-cursor-left-with-key [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">2</span> @@ -720,7 +720,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -733,18 +733,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-special-key></span> [ <span class="Delimiter">{</span> - move-to-previous-character?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65515/left-arrow</span> + move-to-previous-character?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65515/left-arrow</span> <span class="muControl">break-unless</span> move-to-previous-character? trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[left arrow]</span> <span class="Comment"># if not at start of text (before-cursor at § sentinel)</span> - prev:address:duplex-list:character<span class="Special"> <- </span>prev before-cursor + prev:&:duplex-list:char<span class="Special"> <- </span>prev before-cursor go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return-unless</span> prev <span class="Constant"> <move-cursor-begin></span> editor, go-render?<span class="Special"> <- </span>move-cursor-coordinates-left editor before-cursor<span class="Special"> <- </span>copy prev *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">1/left-arrow</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">1/left-arrow</span> <span class="Constant"> <move-cursor-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> @@ -755,8 +755,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize editor with two lines</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># position cursor at start of second line (so there's no previous newline)</span> assume-console [ @@ -764,9 +764,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press left-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -781,8 +781,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">g]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># position cursor further down (so there's a newline before the character at</span> <span class="Comment"># the cursor)</span> @@ -792,7 +792,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -809,8 +809,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">g]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># position cursor at start of text, press left-arrow, then type a character</span> assume-console [ @@ -819,7 +819,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># left-arrow should have had no effect</span> screen-should-contain [ @@ -838,8 +838,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> d] - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># position cursor right after empty line</span> assume-console [ @@ -848,7 +848,7 @@ d] type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -864,8 +864,8 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Comment"># initialize editor with a wrapping line</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abcdef]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> screen-should-contain [ <span class="Constant"> . .</span> @@ -880,9 +880,9 @@ d] press left-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># previous row</span> @@ -896,8 +896,8 @@ d] <span class="Comment"># initialize editor with a wrapping line followed by a second line</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abcdef</span> <span class="Constant">g]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> screen-should-contain [ <span class="Constant"> . .</span> @@ -912,9 +912,9 @@ d] press left-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> <span class="Comment"># previous row</span> @@ -928,8 +928,8 @@ d] <span class="Comment"># initialize editor with a line on the verge of wrapping, followed by a second line</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abcd</span> <span class="Constant">e]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> screen-should-contain [ <span class="Constant"> . .</span> @@ -944,9 +944,9 @@ d] press left-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># previous row</span> @@ -963,17 +963,17 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">1</span> press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -984,7 +984,7 @@ d] type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -997,46 +997,46 @@ d] <span class="muRecipe">after</span> <span class="Constant"><handle-special-key></span> [ <span class="Delimiter">{</span> - move-to-previous-line?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65517/up-arrow</span> + move-to-previous-line?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65517/up-arrow</span> <span class="muControl">break-unless</span> move-to-previous-line? <span class="Constant"> <move-cursor-begin></span> editor, go-render?<span class="Special"> <- </span>move-to-previous-line editor - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">3/up-arrow</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">3/up-arrow</span> <span class="Constant"> <move-cursor-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> move-to-previous-line editor:address:editor-data<span class="muRecipe"> -> </span>editor:address:editor-data, go-render?:boolean [ +<span class="muRecipe">def</span> move-to-previous-line editor:&:editor-data<span class="muRecipe"> -> </span>editor:&:editor-data, go-render?:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - already-at-top?:boolean<span class="Special"> <- </span>lesser-or-equal cursor-row, <span class="Constant">1/top</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + already-at-top?:bool<span class="Special"> <- </span>lesser-or-equal cursor-row, <span class="Constant">1/top</span> <span class="Delimiter">{</span> <span class="Comment"># if cursor not at top, move it</span> <span class="muControl">break-if</span> already-at-top? <span class="Comment"># if not at newline, move to start of line (previous newline)</span> <span class="Comment"># then scan back another line</span> <span class="Comment"># if either step fails, give up without modifying cursor or coordinates</span> - curr:address:duplex-list:character<span class="Special"> <- </span>copy before-cursor + curr:&:duplex-list:char<span class="Special"> <- </span>copy before-cursor <span class="Delimiter">{</span> - old:address:duplex-list:character<span class="Special"> <- </span>copy curr - c2:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> - at-newline?:boolean<span class="Special"> <- </span>equal c2, <span class="Constant">10/newline</span> + old:&:duplex-list:char<span class="Special"> <- </span>copy curr + c2:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + at-newline?:bool<span class="Special"> <- </span>equal c2, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-newline? - curr:address:duplex-list:character<span class="Special"> <- </span>before-previous-line curr, editor - no-motion?:boolean<span class="Special"> <- </span>equal curr, old + curr:&:duplex-list:char<span class="Special"> <- </span>before-previous-line curr, editor + no-motion?:bool<span class="Special"> <- </span>equal curr, old go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return-if</span> no-motion? <span class="Delimiter">}</span> <span class="Delimiter">{</span> old<span class="Special"> <- </span>copy curr curr<span class="Special"> <- </span>before-previous-line curr, editor - no-motion?:boolean<span class="Special"> <- </span>equal curr, old + no-motion?:bool<span class="Special"> <- </span>equal curr, old go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return-if</span> no-motion? <span class="Delimiter">}</span> @@ -1045,16 +1045,16 @@ d] cursor-row<span class="Special"> <- </span>subtract cursor-row, <span class="Constant">1</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row <span class="Comment"># scan ahead to right column or until end of line</span> - target-column:number<span class="Special"> <- </span>copy cursor-column + target-column:num<span class="Special"> <- </span>copy cursor-column cursor-column<span class="Special"> <- </span>copy left *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal cursor-column, target-column + done?:bool<span class="Special"> <- </span>greater-or-equal cursor-column, target-column <span class="muControl">break-if</span> done? - curr:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + curr:&:duplex-list:char<span class="Special"> <- </span>next before-cursor <span class="muControl">break-unless</span> curr - currc:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> - at-newline?:boolean<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> + currc:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + at-newline?:bool<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-newline? <span class="Comment">#</span> before-cursor<span class="Special"> <- </span>copy curr @@ -1079,17 +1079,17 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ab</span> <span class="Constant">def]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">3</span> press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1100,7 +1100,7 @@ d] type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1115,17 +1115,17 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new [ <span class="muRecipe">def</span>] - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">3</span> press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1136,7 +1136,7 @@ d] type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1153,8 +1153,8 @@ d] <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># click on the third line and hit up-arrow, so you end up just after a newline</span> assume-console [ @@ -1162,9 +1162,9 @@ d] press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -1175,7 +1175,7 @@ d] type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1192,17 +1192,17 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># cursor starts out at (1, 0)</span> assume-console [ press down-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># ..and ends at (2, 0)</span> memory-should-contain [ @@ -1214,7 +1214,7 @@ d] type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1227,38 +1227,38 @@ d] <span class="muRecipe">after</span> <span class="Constant"><handle-special-key></span> [ <span class="Delimiter">{</span> - move-to-next-line?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65516/down-arrow</span> + move-to-next-line?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65516/down-arrow</span> <span class="muControl">break-unless</span> move-to-next-line? <span class="Constant"> <move-cursor-begin></span> editor, go-render?<span class="Special"> <- </span>move-to-next-line editor, screen-height - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">4/down-arrow</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">4/down-arrow</span> <span class="Constant"> <move-cursor-end></span> <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> move-to-next-line editor:address:editor-data, screen-height:number<span class="muRecipe"> -> </span>editor:address:editor-data, go-render?:boolean [ +<span class="muRecipe">def</span> move-to-next-line editor:&:editor-data, screen-height:num<span class="muRecipe"> -> </span>editor:&:editor-data, go-render?:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - last-line:number<span class="Special"> <- </span>subtract screen-height, <span class="Constant">1</span> - already-at-bottom?:boolean<span class="Special"> <- </span>greater-or-equal cursor-row, last-line + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + last-line:num<span class="Special"> <- </span>subtract screen-height, <span class="Constant">1</span> + already-at-bottom?:bool<span class="Special"> <- </span>greater-or-equal cursor-row, last-line <span class="Delimiter">{</span> <span class="Comment"># if cursor not at bottom, move it</span> <span class="muControl">break-if</span> already-at-bottom? <span class="Comment"># scan to start of next line, then to right column or until end of line</span> - max:number<span class="Special"> <- </span>subtract right, left - next-line:address:duplex-list:character<span class="Special"> <- </span>before-start-of-next-line before-cursor, max + max:num<span class="Special"> <- </span>subtract right, left + next-line:&:duplex-list:char<span class="Special"> <- </span>before-start-of-next-line before-cursor, max <span class="Delimiter">{</span> <span class="Comment"># already at end of buffer? try to scroll up (so we can see more</span> <span class="Comment"># warnings or sandboxes below)</span> - no-motion?:boolean<span class="Special"> <- </span>equal next-line, before-cursor + no-motion?:bool<span class="Special"> <- </span>equal next-line, before-cursor <span class="muControl">break-unless</span> no-motion? - scroll?:boolean<span class="Special"> <- </span>greater-than cursor-row, <span class="Constant">1</span> + scroll?:bool<span class="Special"> <- </span>greater-than cursor-row, <span class="Constant">1</span> <span class="muControl">break-if</span> scroll?, <span class="Constant">+try-to-scroll:label</span> go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return</span> @@ -1267,16 +1267,16 @@ d] *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row before-cursor<span class="Special"> <- </span>copy next-line *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor - target-column:number<span class="Special"> <- </span>copy cursor-column + target-column:num<span class="Special"> <- </span>copy cursor-column cursor-column<span class="Special"> <- </span>copy left *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal cursor-column, target-column + done?:bool<span class="Special"> <- </span>greater-or-equal cursor-column, target-column <span class="muControl">break-if</span> done? - curr:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + curr:&:duplex-list:char<span class="Special"> <- </span>next before-cursor <span class="muControl">break-unless</span> curr - currc:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> - at-newline?:boolean<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> + currc:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + at-newline?:bool<span class="Special"> <- </span>equal currc, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-newline? <span class="Comment">#</span> before-cursor<span class="Special"> <- </span>copy curr @@ -1297,17 +1297,17 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">de]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">3</span> press down-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -1318,7 +1318,7 @@ d] type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1335,8 +1335,8 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># start on second line, press ctrl-a</span> assume-console [ @@ -1344,9 +1344,9 @@ d] press ctrl-a ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves to start of line</span> memory-should-contain [ @@ -1358,11 +1358,11 @@ d] <span class="muRecipe">after</span> <span class="Constant"><handle-special-character></span> [ <span class="Delimiter">{</span> - move-to-start-of-line?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">1/ctrl-a</span> + move-to-start-of-line?:bool<span class="Special"> <- </span>equal c, <span class="Constant">1/ctrl-a</span> <span class="muControl">break-unless</span> move-to-start-of-line? <span class="Constant"> <move-cursor-begin></span> move-to-start-of-line editor - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">0/never</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return</span> @@ -1371,33 +1371,33 @@ d] <span class="muRecipe">after</span> <span class="Constant"><handle-special-key></span> [ <span class="Delimiter">{</span> - move-to-start-of-line?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65521/home</span> + move-to-start-of-line?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65521/home</span> <span class="muControl">break-unless</span> move-to-start-of-line? <span class="Constant"> <move-cursor-begin></span> move-to-start-of-line editor - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">0/never</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> move-to-start-of-line editor:address:editor-data<span class="muRecipe"> -> </span>editor:address:editor-data [ +<span class="muRecipe">def</span> move-to-start-of-line editor:&:editor-data<span class="muRecipe"> -> </span>editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># update cursor column</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - cursor-column:number<span class="Special"> <- </span>copy left + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + cursor-column:num<span class="Special"> <- </span>copy left *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column <span class="Comment"># update before-cursor</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - init:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + init:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> <span class="Comment"># while not at start of line, move </span> <span class="Delimiter">{</span> - at-start-of-text?:boolean<span class="Special"> <- </span>equal before-cursor, init + at-start-of-text?:bool<span class="Special"> <- </span>equal before-cursor, init <span class="muControl">break-if</span> at-start-of-text? - prev:character<span class="Special"> <- </span>get *before-cursor, <span class="Constant">value:offset</span> - at-start-of-line?:boolean<span class="Special"> <- </span>equal prev, <span class="Constant">10/newline</span> + prev:char<span class="Special"> <- </span>get *before-cursor, <span class="Constant">value:offset</span> + at-start-of-line?:bool<span class="Special"> <- </span>equal prev, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-start-of-line? before-cursor<span class="Special"> <- </span>prev before-cursor *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor @@ -1410,8 +1410,8 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># start on first line (no newline before), press ctrl-a</span> assume-console [ @@ -1419,9 +1419,9 @@ d] press ctrl-a ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves to start of line</span> memory-should-contain [ @@ -1435,7 +1435,7 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Constant"> $clear-trace</span> <span class="Comment"># start on second line, press 'home'</span> assume-console [ @@ -1443,9 +1443,9 @@ d] press home ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves to start of line</span> memory-should-contain [ @@ -1459,8 +1459,8 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># start on first line (no newline before), press 'home'</span> assume-console [ @@ -1468,9 +1468,9 @@ d] press home ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves to start of line</span> memory-should-contain [ @@ -1486,8 +1486,8 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># start on first line, press ctrl-e</span> assume-console [ @@ -1495,9 +1495,9 @@ d] press ctrl-e ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves to end of line</span> memory-should-contain [ @@ -1510,9 +1510,9 @@ d] type <span class="Constant">[z]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1530,11 +1530,11 @@ d] <span class="muRecipe">after</span> <span class="Constant"><handle-special-character></span> [ <span class="Delimiter">{</span> - move-to-end-of-line?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">5/ctrl-e</span> + move-to-end-of-line?:bool<span class="Special"> <- </span>equal c, <span class="Constant">5/ctrl-e</span> <span class="muControl">break-unless</span> move-to-end-of-line? <span class="Constant"> <move-cursor-begin></span> move-to-end-of-line editor - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">0/never</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return</span> @@ -1543,28 +1543,28 @@ d] <span class="muRecipe">after</span> <span class="Constant"><handle-special-key></span> [ <span class="Delimiter">{</span> - move-to-end-of-line?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65520/end</span> + move-to-end-of-line?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65520/end</span> <span class="muControl">break-unless</span> move-to-end-of-line? <span class="Constant"> <move-cursor-begin></span> move-to-end-of-line editor - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">0/never</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> move-to-end-of-line editor:address:editor-data<span class="muRecipe"> -> </span>editor:address:editor-data [ +<span class="muRecipe">def</span> move-to-end-of-line editor:&:editor-data<span class="muRecipe"> -> </span>editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> <span class="Comment"># while not at start of line, move </span> <span class="Delimiter">{</span> - next:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + next:&:duplex-list:char<span class="Special"> <- </span>next before-cursor <span class="muControl">break-unless</span> next <span class="Comment"># end of text</span> - nextc:character<span class="Special"> <- </span>get *next, <span class="Constant">value:offset</span> - at-end-of-line?:boolean<span class="Special"> <- </span>equal nextc, <span class="Constant">10/newline</span> + nextc:char<span class="Special"> <- </span>get *next, <span class="Constant">value:offset</span> + at-end-of-line?:bool<span class="Special"> <- </span>equal nextc, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-end-of-line? before-cursor<span class="Special"> <- </span>copy next *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor @@ -1578,8 +1578,8 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># start on second line (no newline after), press ctrl-e</span> assume-console [ @@ -1587,9 +1587,9 @@ d] press ctrl-e ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves to end of line</span> memory-should-contain [ @@ -1603,8 +1603,8 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># start on first line, press 'end'</span> assume-console [ @@ -1612,9 +1612,9 @@ d] press end ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves to end of line</span> memory-should-contain [ @@ -1628,8 +1628,8 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># start on second line (no newline after), press 'end'</span> assume-console [ @@ -1637,9 +1637,9 @@ d] press end ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves to end of line</span> memory-should-contain [ @@ -1655,14 +1655,14 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># start on second line, press ctrl-u</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">2</span> press ctrl-u ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># cursor deletes to start of line</span> screen-should-contain [ @@ -1676,41 +1676,41 @@ d] <span class="muRecipe">after</span> <span class="Constant"><handle-special-character></span> [ <span class="Delimiter">{</span> - delete-to-start-of-line?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">21/ctrl-u</span> + delete-to-start-of-line?:bool<span class="Special"> <- </span>equal c, <span class="Constant">21/ctrl-u</span> <span class="muControl">break-unless</span> delete-to-start-of-line? <span class="Constant"> <delete-to-start-of-line-begin></span> - deleted-cells:address:duplex-list:character<span class="Special"> <- </span>delete-to-start-of-line editor + deleted-cells:&:duplex-list:char<span class="Special"> <- </span>delete-to-start-of-line editor <span class="Constant"> <delete-to-start-of-line-end></span> go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> delete-to-start-of-line editor:address:editor-data<span class="muRecipe"> -> </span>result:address:duplex-list:character, editor:address:editor-data [ +<span class="muRecipe">def</span> delete-to-start-of-line editor:&:editor-data<span class="muRecipe"> -> </span>result:&:duplex-list:char, editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># compute range to delete</span> - init:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - start:address:duplex-list:character<span class="Special"> <- </span>copy before-cursor - end:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + init:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + start:&:duplex-list:char<span class="Special"> <- </span>copy before-cursor + end:&:duplex-list:char<span class="Special"> <- </span>next before-cursor <span class="Delimiter">{</span> - at-start-of-text?:boolean<span class="Special"> <- </span>equal start, init + at-start-of-text?:bool<span class="Special"> <- </span>equal start, init <span class="muControl">break-if</span> at-start-of-text? - curr:character<span class="Special"> <- </span>get *start, <span class="Constant">value:offset</span> - at-start-of-line?:boolean<span class="Special"> <- </span>equal curr, <span class="Constant">10/newline</span> + curr:char<span class="Special"> <- </span>get *start, <span class="Constant">value:offset</span> + at-start-of-line?:bool<span class="Special"> <- </span>equal curr, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-start-of-line? start<span class="Special"> <- </span>prev start assert start, <span class="Constant">[delete-to-start-of-line tried to move before start of text]</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> <span class="Comment"># snip it out</span> - result:address:duplex-list:character<span class="Special"> <- </span>next start + result:&:duplex-list:char<span class="Special"> <- </span>next start remove-between start, end <span class="Comment"># adjust cursor</span> before-cursor<span class="Special"> <- </span>copy start *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, left ] @@ -1718,14 +1718,14 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># start on first line (no newline before), press ctrl-u</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">2</span> press ctrl-u ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># cursor deletes to start of line</span> screen-should-contain [ @@ -1741,14 +1741,14 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># start past end of line, press ctrl-u</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">3</span> press ctrl-u ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># cursor deletes to start of line</span> screen-should-contain [ @@ -1764,14 +1764,14 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># start past end of final line, press ctrl-u</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">3</span> press ctrl-u ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># cursor deletes to start of line</span> screen-should-contain [ @@ -1789,14 +1789,14 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># start on first line, press ctrl-k</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">1</span> press ctrl-k ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># cursor deletes to end of line</span> screen-should-contain [ @@ -1810,27 +1810,27 @@ d] <span class="muRecipe">after</span> <span class="Constant"><handle-special-character></span> [ <span class="Delimiter">{</span> - delete-to-end-of-line?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">11/ctrl-k</span> + delete-to-end-of-line?:bool<span class="Special"> <- </span>equal c, <span class="Constant">11/ctrl-k</span> <span class="muControl">break-unless</span> delete-to-end-of-line? <span class="Constant"> <delete-to-end-of-line-begin></span> - deleted-cells:address:duplex-list:character<span class="Special"> <- </span>delete-to-end-of-line editor + deleted-cells:&:duplex-list:char<span class="Special"> <- </span>delete-to-end-of-line editor <span class="Constant"> <delete-to-end-of-line-end></span> go-render?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> delete-to-end-of-line editor:address:editor-data<span class="muRecipe"> -> </span>result:address:duplex-list:character, editor:address:editor-data [ +<span class="muRecipe">def</span> delete-to-end-of-line editor:&:editor-data<span class="muRecipe"> -> </span>result:&:duplex-list:char, editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># compute range to delete</span> - start:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - end:address:duplex-list:character<span class="Special"> <- </span>next start + start:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + end:&:duplex-list:char<span class="Special"> <- </span>next start <span class="Delimiter">{</span> - at-end-of-text?:boolean<span class="Special"> <- </span>equal end, <span class="Constant">0/null</span> + at-end-of-text?:bool<span class="Special"> <- </span>equal end, <span class="Constant">0/null</span> <span class="muControl">break-if</span> at-end-of-text? - curr:character<span class="Special"> <- </span>get *end, <span class="Constant">value:offset</span> - at-end-of-line?:boolean<span class="Special"> <- </span>equal curr, <span class="Constant">10/newline</span> + curr:char<span class="Special"> <- </span>get *end, <span class="Constant">value:offset</span> + at-end-of-line?:bool<span class="Special"> <- </span>equal curr, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-end-of-line? end<span class="Special"> <- </span>next end <span class="muControl">loop</span> @@ -1844,14 +1844,14 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># start on second line (no newline after), press ctrl-k</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">1</span> press ctrl-k ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># cursor deletes to end of line</span> screen-should-contain [ @@ -1867,14 +1867,14 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># start at end of line</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">2</span> press ctrl-k ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># cursor deletes just last character</span> screen-should-contain [ @@ -1890,14 +1890,14 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># start past end of line</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">3</span> press ctrl-k ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># cursor deletes nothing</span> screen-should-contain [ @@ -1913,14 +1913,14 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># start at end of text</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">2</span> press ctrl-k ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># cursor deletes just the final character</span> screen-should-contain [ @@ -1936,14 +1936,14 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[123</span> <span class="Constant">456]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> <span class="Comment"># start past end of text</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">3</span> press ctrl-k ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># cursor deletes nothing</span> screen-should-contain [ @@ -1965,7 +1965,7 @@ d] <span class="Constant">b</span> <span class="Constant">c</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .a .</span> @@ -1978,7 +1978,7 @@ d] press down-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen slides by one line</span> screen-should-contain [ @@ -1991,14 +1991,14 @@ d] <span class="muRecipe">after</span> <span class="Constant"><scroll-down></span> [ trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[scroll down]</span> - top-of-screen:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - max:number<span class="Special"> <- </span>subtract right, left - old-top:address:duplex-list:character<span class="Special"> <- </span>copy top-of-screen + top-of-screen:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + max:num<span class="Special"> <- </span>subtract right, left + old-top:&:duplex-list:char<span class="Special"> <- </span>copy top-of-screen top-of-screen<span class="Special"> <- </span>before-start-of-next-line top-of-screen, max *editor<span class="Special"> <- </span>put *editor, <span class="Constant">top-of-screen:offset</span>, top-of-screen - no-movement?:boolean<span class="Special"> <- </span>equal old-top, top-of-screen + no-movement?:bool<span class="Special"> <- </span>equal old-top, top-of-screen go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return-if</span> no-movement? ] @@ -2006,25 +2006,25 @@ d] <span class="Comment"># takes a pointer into the doubly-linked list, scans ahead at most 'max'</span> <span class="Comment"># positions until the next newline</span> <span class="Comment"># beware: never return null pointer.</span> -<span class="muRecipe">def</span> before-start-of-next-line original:address:duplex-list:character, max:number<span class="muRecipe"> -> </span>curr:address:duplex-list:character [ +<span class="muRecipe">def</span> before-start-of-next-line original:&:duplex-list:char, max:num<span class="muRecipe"> -> </span>curr:&:duplex-list:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - count:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - curr:address:duplex-list:character<span class="Special"> <- </span>copy original + count:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + curr:&:duplex-list:char<span class="Special"> <- </span>copy original <span class="Comment"># skip the initial newline if it exists</span> <span class="Delimiter">{</span> - c:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> - at-newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + c:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + at-newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> at-newline? curr<span class="Special"> <- </span>next curr count<span class="Special"> <- </span>add count, <span class="Constant">1</span> <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="muControl">return-unless</span> curr, original - done?:boolean<span class="Special"> <- </span>greater-or-equal count, max + done?:bool<span class="Special"> <- </span>greater-or-equal count, max <span class="muControl">break-if</span> done? - c:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> - at-newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + c:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + at-newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-if</span> at-newline? curr<span class="Special"> <- </span>next curr count<span class="Special"> <- </span>add count, <span class="Constant">1</span> @@ -2043,7 +2043,7 @@ d] <span class="Constant">g</span> <span class="Constant">h</span> <span class="Constant">i]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .abcd↩ .</span> @@ -2056,7 +2056,7 @@ d] press down-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows partial wrapped line</span> screen-should-contain [ @@ -2075,14 +2075,14 @@ d] <span class="Constant">k</span> <span class="Constant">l</span> <span class="Constant">m]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> <span class="Comment"># position cursor at last line, then try to move further down</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">0</span> press down-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows partial wrapped line containing a wrap icon</span> screen-should-contain [ @@ -2096,7 +2096,7 @@ d] press down-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows partial wrapped line</span> screen-should-contain [ @@ -2114,16 +2114,16 @@ d] <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[a</span> <span class="Constant">b</span> <span class="Constant">cdef]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> <span class="Comment"># position cursor at end, type a character</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">4</span> type <span class="Constant">[g]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen scrolls</span> screen-should-contain [ @@ -2144,16 +2144,16 @@ d] <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[a</span> <span class="Constant">b</span> <span class="Constant">c]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">4</span> type [ ] ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen scrolls</span> screen-should-contain [ @@ -2175,16 +2175,16 @@ d] <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[a</span> <span class="Constant">b</span> <span class="Constant">cdefgh]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> <span class="Comment"># position cursor at end of screen and try to move right</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">3</span> press right-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen scrolls</span> screen-should-contain [ @@ -2207,16 +2207,16 @@ d] <span class="Constant">b</span> <span class="Constant">c</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> <span class="Comment"># position cursor at end of screen and try to move right</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">3</span> press right-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen scrolls</span> screen-should-contain [ @@ -2235,8 +2235,8 @@ d] assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">de]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Constant"> $clear-trace</span> <span class="Comment"># try to move down past end of text</span> assume-console [ @@ -2244,9 +2244,9 @@ d] press down-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen should scroll, moving cursor to end of text</span> memory-should-contain [ @@ -2257,7 +2257,7 @@ d] type <span class="Constant">[0]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -2272,9 +2272,9 @@ d] press down-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen stops scrolling because cursor is already at top</span> memory-should-contain [ @@ -2286,7 +2286,7 @@ d] type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -2307,7 +2307,7 @@ d] <span class="Constant">e</span> <span class="Constant">f</span> <span class="Constant">g]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> <span class="Comment"># scroll down one page and one line</span> assume-console [ press page-down @@ -2315,7 +2315,7 @@ d] press down-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen scrolls down 3 lines</span> screen-should-contain [ @@ -2336,7 +2336,7 @@ d] <span class="Constant">b</span> <span class="Constant">c</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .a .</span> @@ -2349,7 +2349,7 @@ d] press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen slides by one line</span> screen-should-contain [ @@ -2362,11 +2362,11 @@ d] <span class="muRecipe">after</span> <span class="Constant"><scroll-up></span> [ trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[scroll up]</span> - top-of-screen:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - old-top:address:duplex-list:character<span class="Special"> <- </span>copy top-of-screen + top-of-screen:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + old-top:&:duplex-list:char<span class="Special"> <- </span>copy top-of-screen top-of-screen<span class="Special"> <- </span>before-previous-line top-of-screen, editor *editor<span class="Special"> <- </span>put *editor, <span class="Constant">top-of-screen:offset</span>, top-of-screen - no-movement?:boolean<span class="Special"> <- </span>equal old-top, top-of-screen + no-movement?:bool<span class="Special"> <- </span>equal old-top, top-of-screen go-render?<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="muControl">return-if</span> no-movement? ] @@ -2374,39 +2374,39 @@ d] <span class="Comment"># takes a pointer into the doubly-linked list, scans back to before start of</span> <span class="Comment"># previous *wrapped* line</span> <span class="Comment"># beware: never return null pointer</span> -<span class="muRecipe">def</span> before-previous-line in:address:duplex-list:character, editor:address:editor-data<span class="muRecipe"> -> </span>out:address:duplex-list:character [ +<span class="muRecipe">def</span> before-previous-line in:&:duplex-list:char, editor:&:editor-data<span class="muRecipe"> -> </span>out:&:duplex-list:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - curr:address:duplex-list:character<span class="Special"> <- </span>copy in - c:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + curr:&:duplex-list:char<span class="Special"> <- </span>copy in + c:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> <span class="Comment"># compute max, number of characters to skip</span> <span class="Comment"># 1 + len%(width-1)</span> <span class="Comment"># except rotate second term to vary from 1 to width-1 rather than 0 to width-2</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - max-line-length:number<span class="Special"> <- </span>subtract right, left, <span class="Constant">-1/exclusive-right</span>, <span class="Constant">1/wrap-icon</span> - sentinel:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> - len:number<span class="Special"> <- </span>previous-line-length curr, sentinel + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + max-line-length:num<span class="Special"> <- </span>subtract right, left, <span class="Constant">-1/exclusive-right</span>, <span class="Constant">1/wrap-icon</span> + sentinel:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> + len:num<span class="Special"> <- </span>previous-line-length curr, sentinel <span class="Delimiter">{</span> <span class="muControl">break-if</span> len <span class="Comment"># empty line; just skip this newline</span> - prev:address:duplex-list:character<span class="Special"> <- </span>prev curr + prev:&:duplex-list:char<span class="Special"> <- </span>prev curr <span class="muControl">return-unless</span> prev, curr <span class="muControl">return</span> prev <span class="Delimiter">}</span> - _, max:number<span class="Special"> <- </span>divide-with-remainder len, max-line-length + _, max:num<span class="Special"> <- </span>divide-with-remainder len, max-line-length <span class="Comment"># remainder 0 => scan one width-worth</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> max max<span class="Special"> <- </span>copy max-line-length <span class="Delimiter">}</span> max<span class="Special"> <- </span>add max, <span class="Constant">1</span> - count:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + count:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Comment"># skip 'max' characters</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal count, max + done?:bool<span class="Special"> <- </span>greater-or-equal count, max <span class="muControl">break-if</span> done? - prev:address:duplex-list:character<span class="Special"> <- </span>prev curr + prev:&:duplex-list:char<span class="Special"> <- </span>prev curr <span class="muControl">break-unless</span> prev curr<span class="Special"> <- </span>copy prev count<span class="Special"> <- </span>add count, <span class="Constant">1</span> @@ -2424,7 +2424,7 @@ d] <span class="Constant">g</span> <span class="Constant">h</span> <span class="Constant">i]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .abcd↩ .</span> @@ -2436,7 +2436,7 @@ d] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -2449,7 +2449,7 @@ d] press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows partial wrapped line</span> screen-should-contain [ @@ -2468,13 +2468,13 @@ d] <span class="Constant">k</span> <span class="Constant">l</span> <span class="Constant">m]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> <span class="Comment"># position cursor at top of second page</span> assume-console [ press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -2488,7 +2488,7 @@ d] press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows partial wrapped line</span> screen-should-contain [ @@ -2503,7 +2503,7 @@ d] press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows partial wrapped line</span> screen-should-contain [ @@ -2518,7 +2518,7 @@ d] press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows partial wrapped line</span> screen-should-contain [ @@ -2541,7 +2541,7 @@ d] <span class="Constant">g</span> <span class="Constant">h</span> <span class="Constant">i]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">6/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">6/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .abcde↩ .</span> @@ -2553,7 +2553,7 @@ d] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -2566,7 +2566,7 @@ d] press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows partial wrapped line</span> screen-should-contain [ @@ -2587,12 +2587,12 @@ d] c d e] - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">6/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">6/right</span> assume-console [ press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -2604,7 +2604,7 @@ e] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -2616,7 +2616,7 @@ e] press page-up ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -2635,13 +2635,13 @@ e] <span class="Constant">c</span> <span class="Constant">d</span> <span class="Constant">e]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> <span class="Comment"># position cursor at top of second page</span> assume-console [ press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -2654,9 +2654,9 @@ e] press left-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen scrolls</span> screen-should-contain [ @@ -2679,7 +2679,7 @@ e] <span class="Constant">b</span> <span class="Constant">c</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .a .</span> @@ -2694,7 +2694,7 @@ e] press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen slides by one line</span> screen-should-contain [ @@ -2708,7 +2708,7 @@ e] press up-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen remains unchanged</span> screen-should-contain [ @@ -2727,7 +2727,7 @@ e] <span class="Constant">b</span> <span class="Constant">c</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .a .</span> @@ -2739,7 +2739,7 @@ e] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows next page</span> screen-should-contain [ @@ -2752,15 +2752,15 @@ e] <span class="muRecipe">after</span> <span class="Constant"><handle-special-character></span> [ <span class="Delimiter">{</span> - page-down?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">6/ctrl-f</span> + page-down?:bool<span class="Special"> <- </span>equal c, <span class="Constant">6/ctrl-f</span> <span class="muControl">break-unless</span> page-down? - old-top:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + old-top:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> <span class="Constant"> <move-cursor-begin></span> page-down editor - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">0/never</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> - top-of-screen:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - no-movement?:boolean<span class="Special"> <- </span>equal top-of-screen, old-top + top-of-screen:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + no-movement?:bool<span class="Special"> <- </span>equal top-of-screen, old-top go-render?<span class="Special"> <- </span>not no-movement? <span class="muControl">return</span> <span class="Delimiter">}</span> @@ -2768,15 +2768,15 @@ e] <span class="muRecipe">after</span> <span class="Constant"><handle-special-key></span> [ <span class="Delimiter">{</span> - page-down?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65518/page-down</span> + page-down?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65518/page-down</span> <span class="muControl">break-unless</span> page-down? - old-top:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + old-top:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> <span class="Constant"> <move-cursor-begin></span> page-down editor - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">0/never</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> - top-of-screen:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - no-movement?:boolean<span class="Special"> <- </span>equal top-of-screen, old-top + top-of-screen:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + no-movement?:bool<span class="Special"> <- </span>equal top-of-screen, old-top go-render?<span class="Special"> <- </span>not no-movement? <span class="muControl">return</span> <span class="Delimiter">}</span> @@ -2784,21 +2784,21 @@ e] <span class="Comment"># page-down skips entire wrapped lines, so it can't scroll past lines</span> <span class="Comment"># taking up the entire screen</span> -<span class="muRecipe">def</span> page-down editor:address:editor-data<span class="muRecipe"> -> </span>editor:address:editor-data [ +<span class="muRecipe">def</span> page-down editor:&:editor-data<span class="muRecipe"> -> </span>editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if editor contents don't overflow screen, do nothing</span> - bottom-of-screen:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">bottom-of-screen:offset</span> + bottom-of-screen:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">bottom-of-screen:offset</span> <span class="muControl">return-unless</span> bottom-of-screen <span class="Comment"># if not, position cursor at final character</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>prev bottom-of-screen + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>prev bottom-of-screen *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor <span class="Comment"># keep one line in common with previous page</span> <span class="Delimiter">{</span> - last:character<span class="Special"> <- </span>get *before-cursor, <span class="Constant">value:offset</span> - newline?:boolean<span class="Special"> <- </span>equal last, <span class="Constant">10/newline</span> - <span class="muControl">break-unless</span> newline?:boolean + last:char<span class="Special"> <- </span>get *before-cursor, <span class="Constant">value:offset</span> + newline?:bool<span class="Special"> <- </span>equal last, <span class="Constant">10/newline</span> + <span class="muControl">break-unless</span> newline?:bool before-cursor<span class="Special"> <- </span>prev before-cursor *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor <span class="Delimiter">}</span> @@ -2812,8 +2812,8 @@ e] assume-screen <span class="Constant">10/width</span>, <span class="Constant">4/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[a</span> <span class="Constant">b]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .a .</span> @@ -2825,7 +2825,7 @@ e] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen remains unmodified</span> screen-should-contain [ @@ -2844,7 +2844,7 @@ e] <span class="Constant">b</span> <span class="Constant">cdefgh]</span> <span class="Comment"># editor screen triggers wrap of last line</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> <span class="Comment"># some part of last line is not displayed</span> screen-should-contain [ <span class="Constant"> . .</span> @@ -2857,7 +2857,7 @@ e] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows entire wrapped line</span> screen-should-contain [ @@ -2875,7 +2875,7 @@ e] <span class="Comment"># and still has something left over</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[a</span> <span class="Constant">bcdefgh]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> <span class="Comment"># some part of last line is not displayed</span> screen-should-contain [ <span class="Constant"> . .</span> @@ -2888,7 +2888,7 @@ e] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows entire wrapped line</span> screen-should-contain [ @@ -2907,7 +2907,7 @@ e] <span class="Constant">b</span> <span class="Constant">c</span> <span class="Constant">d]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .a .</span> @@ -2919,7 +2919,7 @@ e] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows next page</span> screen-should-contain [ @@ -2933,7 +2933,7 @@ e] press page-up ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows original page again</span> screen-should-contain [ @@ -2946,15 +2946,15 @@ e] <span class="muRecipe">after</span> <span class="Constant"><handle-special-character></span> [ <span class="Delimiter">{</span> - page-up?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">2/ctrl-b</span> + page-up?:bool<span class="Special"> <- </span>equal c, <span class="Constant">2/ctrl-b</span> <span class="muControl">break-unless</span> page-up? - old-top:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + old-top:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> <span class="Constant"> <move-cursor-begin></span> editor<span class="Special"> <- </span>page-up editor, screen-height - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">0/never</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> - top-of-screen:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - no-movement?:boolean<span class="Special"> <- </span>equal top-of-screen, old-top + top-of-screen:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + no-movement?:bool<span class="Special"> <- </span>equal top-of-screen, old-top go-render?<span class="Special"> <- </span>not no-movement? <span class="muControl">return</span> <span class="Delimiter">}</span> @@ -2962,31 +2962,31 @@ e] <span class="muRecipe">after</span> <span class="Constant"><handle-special-key></span> [ <span class="Delimiter">{</span> - page-up?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65519/page-up</span> + page-up?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65519/page-up</span> <span class="muControl">break-unless</span> page-up? - old-top:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + old-top:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> <span class="Constant"> <move-cursor-begin></span> editor<span class="Special"> <- </span>page-up editor, screen-height - undo-coalesce-tag:number<span class="Special"> <- </span>copy <span class="Constant">0/never</span> + undo-coalesce-tag:num<span class="Special"> <- </span>copy <span class="Constant">0/never</span> <span class="Constant"> <move-cursor-end></span> - top-of-screen:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - no-movement?:boolean<span class="Special"> <- </span>equal top-of-screen, old-top + top-of-screen:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + no-movement?:bool<span class="Special"> <- </span>equal top-of-screen, old-top <span class="Comment"># don't bother re-rendering if nothing changed. todo: test this</span> go-render?<span class="Special"> <- </span>not no-movement? <span class="muControl">return</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> page-up editor:address:editor-data, screen-height:number<span class="muRecipe"> -> </span>editor:address:editor-data [ +<span class="muRecipe">def</span> page-up editor:&:editor-data, screen-height:num<span class="muRecipe"> -> </span>editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - max:number<span class="Special"> <- </span>subtract screen-height, <span class="Constant">1/menu-bar</span>, <span class="Constant">1/overlapping-line</span> - count:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - top-of-screen:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + max:num<span class="Special"> <- </span>subtract screen-height, <span class="Constant">1/menu-bar</span>, <span class="Constant">1/overlapping-line</span> + count:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + top-of-screen:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal count, max + done?:bool<span class="Special"> <- </span>greater-or-equal count, max <span class="muControl">break-if</span> done? - prev:address:duplex-list:character<span class="Special"> <- </span>before-previous-line top-of-screen, editor + prev:&:duplex-list:char<span class="Special"> <- </span>before-previous-line top-of-screen, editor <span class="muControl">break-unless</span> prev top-of-screen<span class="Special"> <- </span>copy prev *editor<span class="Special"> <- </span>put *editor, <span class="Constant">top-of-screen:offset</span>, top-of-screen @@ -3007,7 +3007,7 @@ e] <span class="Constant">f</span> <span class="Constant">g</span> <span class="Constant">h]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .a .</span> @@ -3020,7 +3020,7 @@ e] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows third page</span> screen-should-contain [ @@ -3034,7 +3034,7 @@ e] press page-up ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows second page</span> screen-should-contain [ @@ -3048,7 +3048,7 @@ e] press page-up ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows original page again</span> screen-should-contain [ @@ -3074,7 +3074,7 @@ e] <span class="Constant">n</span> <span class="Constant">o]</span> <span class="Comment"># editor screen triggers wrap of last line</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> <span class="Comment"># some part of last line is not displayed</span> screen-should-contain [ <span class="Constant"> . .</span> @@ -3091,7 +3091,7 @@ e] press down-arrow ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows entire wrapped line</span> screen-should-contain [ @@ -3107,7 +3107,7 @@ e] press page-up ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen resets</span> screen-should-contain [ @@ -3127,7 +3127,7 @@ e] <span class="Comment"># and still has something left over</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[a</span> <span class="Constant">bcdefgh]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> <span class="Comment"># some part of last line is not displayed</span> screen-should-contain [ <span class="Constant"> . .</span> @@ -3140,7 +3140,7 @@ e] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen shows entire wrapped line</span> screen-should-contain [ @@ -3154,7 +3154,7 @@ e] press page-up ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># screen resets</span> screen-should-contain [ @@ -3177,7 +3177,7 @@ e] <span class="Constant">gxx</span> <span class="Constant">hxx</span> <span class="Constant">]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .axx .</span> @@ -3188,7 +3188,7 @@ e] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -3200,7 +3200,7 @@ e] press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -3213,7 +3213,7 @@ e] press page-up ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -3235,7 +3235,7 @@ exy fxy gxy ] - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">4/right</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .axy .</span> @@ -3246,7 +3246,7 @@ gxy press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -3258,7 +3258,7 @@ gxy press page-down ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -3271,7 +3271,7 @@ gxy press page-up ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> diff --git a/html/edit/004-programming-environment.mu.html b/html/edit/004-programming-environment.mu.html index 24b66e0d..a50eacb9 100644 --- a/html/edit/004-programming-environment.mu.html +++ b/html/edit/004-programming-environment.mu.html @@ -45,90 +45,90 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color initial-recipe:text<span class="Special"> <- </span>restore <span class="Constant">[recipes.mu]</span> initial-sandbox:text<span class="Special"> <- </span>new <span class="Constant">[]</span> hide-screen <span class="Constant">0/screen</span> - env:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment <span class="Constant">0/screen</span>, initial-recipe, initial-sandbox + env:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment <span class="Constant">0/screen</span>, initial-recipe, initial-sandbox render-all <span class="Constant">0/screen</span>, env, render event-loop <span class="Constant">0/screen</span>, <span class="Constant">0/console</span>, env <span class="Comment"># never gets here</span> ] <span class="muData">container</span> programming-environment-data [ - recipes:address:editor-data - current-sandbox:address:editor-data - sandbox-in-focus?:boolean <span class="Comment"># false => cursor in recipes; true => cursor in current-sandbox</span> + recipes:&:editor-data + current-sandbox:&:editor-data + sandbox-in-focus?:bool <span class="Comment"># false => cursor in recipes; true => cursor in current-sandbox</span> ] -<span class="muRecipe">def</span> new-programming-environment screen:address:screen, initial-recipe-contents:text, initial-sandbox-contents:text<span class="muRecipe"> -> </span>result:address:programming-environment-data, screen:address:screen [ +<span class="muRecipe">def</span> new-programming-environment screen:&:screen, initial-recipe-contents:text, initial-sandbox-contents:text<span class="muRecipe"> -> </span>result:&:programming-environment-data, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - width:number<span class="Special"> <- </span>screen-width screen - height:number<span class="Special"> <- </span>screen-height screen + width:num<span class="Special"> <- </span>screen-width screen + height:num<span class="Special"> <- </span>screen-height screen <span class="Comment"># top menu</span> result<span class="Special"> <- </span>new <span class="Constant">programming-environment-data:type</span> draw-horizontal screen, <span class="Constant">0</span>, <span class="Constant">0/left</span>, width, <span class="Constant">32/space</span>, <span class="Constant">0/black</span>, <span class="Constant">238/grey</span> - button-start:number<span class="Special"> <- </span>subtract width, <span class="Constant">20</span> - button-on-screen?:boolean<span class="Special"> <- </span>greater-or-equal button-start, <span class="Constant">0</span> + button-start:num<span class="Special"> <- </span>subtract width, <span class="Constant">20</span> + button-on-screen?:bool<span class="Special"> <- </span>greater-or-equal button-start, <span class="Constant">0</span> assert button-on-screen?, <span class="Constant">[screen too narrow for menu]</span> screen<span class="Special"> <- </span>move-cursor screen, <span class="Constant">0/row</span>, button-start print screen, <span class="Constant">[ run (F4) ]</span>, <span class="Constant">255/white</span>, <span class="Constant">161/reddish</span> <span class="Comment"># dotted line down the middle</span> - divider:number, _<span class="Special"> <- </span>divide-with-remainder width, <span class="Constant">2</span> + divider:num, _<span class="Special"> <- </span>divide-with-remainder width, <span class="Constant">2</span> draw-vertical screen, divider, <span class="Constant">1/top</span>, height, <span class="Constant">9482/vertical-dotted</span> <span class="Comment"># recipe editor on the left</span> - recipes:address:editor-data<span class="Special"> <- </span>new-editor initial-recipe-contents, screen, <span class="Constant">0/left</span>, divider/right + recipes:&:editor-data<span class="Special"> <- </span>new-editor initial-recipe-contents, screen, <span class="Constant">0/left</span>, divider/right <span class="Comment"># sandbox editor on the right</span> - sandbox-left:number<span class="Special"> <- </span>add divider, <span class="Constant">1</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>new-editor initial-sandbox-contents, screen, sandbox-left, width/right + sandbox-left:num<span class="Special"> <- </span>add divider, <span class="Constant">1</span> + current-sandbox:&:editor-data<span class="Special"> <- </span>new-editor initial-sandbox-contents, screen, sandbox-left, width/right *result<span class="Special"> <- </span>put *result, <span class="Constant">recipes:offset</span>, recipes *result<span class="Special"> <- </span>put *result, <span class="Constant">current-sandbox:offset</span>, current-sandbox *result<span class="Special"> <- </span>put *result, <span class="Constant">sandbox-in-focus?:offset</span>, <span class="Constant">0/false</span> <span class="Constant"> <programming-environment-initialization></span> ] -<span class="muRecipe">def</span> event-loop screen:address:screen, console:address:console, env:address:programming-environment-data<span class="muRecipe"> -> </span>screen:address:screen, console:address:console, env:address:programming-environment-data [ +<span class="muRecipe">def</span> event-loop screen:&:screen, console:&:console, env:&:programming-environment-data<span class="muRecipe"> -> </span>screen:&:screen, console:&:console, env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - recipes:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> - sandbox-in-focus?:boolean<span class="Special"> <- </span>get *env, <span class="Constant">sandbox-in-focus?:offset</span> + recipes:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + sandbox-in-focus?:bool<span class="Special"> <- </span>get *env, <span class="Constant">sandbox-in-focus?:offset</span> <span class="Comment"># if we fall behind we'll stop updating the screen, but then we have to</span> <span class="Comment"># render the entire screen when we catch up.</span> <span class="Comment"># todo: test this</span> - render-all-on-no-more-events?:boolean<span class="Special"> <- </span>copy <span class="Constant">0/false</span> + render-all-on-no-more-events?:bool<span class="Special"> <- </span>copy <span class="Constant">0/false</span> <span class="Delimiter">{</span> <span class="Comment"># looping over each (keyboard or touch) event as it occurs</span> <span class="Constant"> +next-event</span> - e:event, console, found?:boolean, quit?:boolean<span class="Special"> <- </span>read-event console + e:event, console, found?:bool, quit?:bool<span class="Special"> <- </span>read-event console <span class="muControl">loop-unless</span> found? <span class="muControl">break-if</span> quit? <span class="Comment"># only in tests</span> trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[next-event]</span> <span class="Constant"> <handle-event></span> <span class="Comment"># check for global events that will trigger regardless of which editor has focus</span> <span class="Delimiter">{</span> - k:number, is-keycode?:boolean<span class="Special"> <- </span>maybe-convert e:event, <span class="Constant">keycode:variant</span> + k:num, is-keycode?:bool<span class="Special"> <- </span>maybe-convert e:event, <span class="Constant">keycode:variant</span> <span class="muControl">break-unless</span> is-keycode? <span class="Constant"> <global-keypress></span> <span class="Delimiter">}</span> <span class="Delimiter">{</span> - c:character, is-unicode?:boolean<span class="Special"> <- </span>maybe-convert e:event, <span class="Constant">text:variant</span> + c:char, is-unicode?:bool<span class="Special"> <- </span>maybe-convert e:event, <span class="Constant">text:variant</span> <span class="muControl">break-unless</span> is-unicode? <span class="Constant"> <global-type></span> <span class="Delimiter">}</span> <span class="Comment"># 'touch' event - send to both sides, see what picks it up</span> <span class="Delimiter">{</span> - t:touch-event, is-touch?:boolean<span class="Special"> <- </span>maybe-convert e:event, <span class="Constant">touch:variant</span> + t:touch-event, is-touch?:bool<span class="Special"> <- </span>maybe-convert e:event, <span class="Constant">touch:variant</span> <span class="muControl">break-unless</span> is-touch? <span class="Comment"># ignore all but 'left-click' events for now</span> <span class="Comment"># todo: test this</span> - touch-type:number<span class="Special"> <- </span>get t, <span class="Constant">type:offset</span> - is-left-click?:boolean<span class="Special"> <- </span>equal touch-type, <span class="Constant">65513/mouse-left</span> + touch-type:num<span class="Special"> <- </span>get t, <span class="Constant">type:offset</span> + is-left-click?:bool<span class="Special"> <- </span>equal touch-type, <span class="Constant">65513/mouse-left</span> <span class="muControl">loop-unless</span> is-left-click?, <span class="Constant">+next-event:label</span> - click-row:number<span class="Special"> <- </span>get t, <span class="Constant">row:offset</span> - click-column:number<span class="Special"> <- </span>get t, <span class="Constant">column:offset</span> + click-row:num<span class="Special"> <- </span>get t, <span class="Constant">row:offset</span> + click-column:num<span class="Special"> <- </span>get t, <span class="Constant">column:offset</span> <span class="Comment"># later exceptions for non-editor touches will go here</span> <span class="Constant"> <global-touch></span> <span class="Comment"># send to both editors</span> _<span class="Special"> <- </span>move-cursor-in-editor screen, recipes, t - sandbox-in-focus?:boolean<span class="Special"> <- </span>move-cursor-in-editor screen, current-sandbox, t + sandbox-in-focus?:bool<span class="Special"> <- </span>move-cursor-in-editor screen, current-sandbox, t *env<span class="Special"> <- </span>put *env, <span class="Constant">sandbox-in-focus?:offset</span>, sandbox-in-focus? screen<span class="Special"> <- </span>update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env <span class="muControl">loop</span> <span class="Constant">+next-event:label</span> @@ -136,10 +136,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># 'resize' event - redraw editor</span> <span class="Comment"># todo: test this after supporting resize in assume-console</span> <span class="Delimiter">{</span> - r:resize-event, is-resize?:boolean<span class="Special"> <- </span>maybe-convert e:event, <span class="Constant">resize:variant</span> + r:resize-event, is-resize?:bool<span class="Special"> <- </span>maybe-convert e:event, <span class="Constant">resize:variant</span> <span class="muControl">break-unless</span> is-resize? <span class="Comment"># if more events, we're still resizing; wait until we stop</span> - more-events?:boolean<span class="Special"> <- </span>has-more-events? console + more-events?:bool<span class="Special"> <- </span>has-more-events? console <span class="Delimiter">{</span> <span class="muControl">break-unless</span> more-events? render-all-on-no-more-events?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="Comment"># no rendering now, full rendering on some future event</span> @@ -155,13 +155,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># if it's not global and not a touch event, send to appropriate editor</span> <span class="Delimiter">{</span> hide-screen screen - sandbox-in-focus?:boolean<span class="Special"> <- </span>get *env, <span class="Constant">sandbox-in-focus?:offset</span> + sandbox-in-focus?:bool<span class="Special"> <- </span>get *env, <span class="Constant">sandbox-in-focus?:offset</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> sandbox-in-focus? - screen, recipes, render?:boolean<span class="Special"> <- </span>handle-keyboard-event screen, recipes, e:event + screen, recipes, render?:bool<span class="Special"> <- </span>handle-keyboard-event screen, recipes, e:event <span class="Comment"># refresh screen only if no more events</span> <span class="Comment"># if there are more events to process, wait for them to clear up, then make sure you render-all afterward.</span> - more-events?:boolean<span class="Special"> <- </span>has-more-events? console + more-events?:bool<span class="Special"> <- </span>has-more-events? console <span class="Delimiter">{</span> <span class="muControl">break-unless</span> more-events? render-all-on-no-more-events?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="Comment"># no rendering now, full rendering on some future event</span> @@ -186,10 +186,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> sandbox-in-focus? - screen, current-sandbox, render?:boolean<span class="Special"> <- </span>handle-keyboard-event screen, current-sandbox, e:event + screen, current-sandbox, render?:bool<span class="Special"> <- </span>handle-keyboard-event screen, current-sandbox, e:event <span class="Comment"># refresh screen only if no more events</span> <span class="Comment"># if there are more events to process, wait for them to clear up, then make sure you render-all afterward.</span> - more-events?:boolean<span class="Special"> <- </span>has-more-events? console + more-events?:bool<span class="Special"> <- </span>has-more-events? console <span class="Delimiter">{</span> <span class="muControl">break-unless</span> more-events? render-all-on-no-more-events?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="Comment"># no rendering now, full rendering on some future event</span> @@ -220,24 +220,24 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> resize screen:address:screen, env:address:programming-environment-data<span class="muRecipe"> -> </span>env:address:programming-environment-data, screen:address:screen [ +<span class="muRecipe">def</span> resize screen:&:screen, env:&:programming-environment-data<span class="muRecipe"> -> </span>env:&:programming-environment-data, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> clear-screen screen <span class="Comment"># update screen dimensions</span> - width:number<span class="Special"> <- </span>screen-width screen - divider:number, _<span class="Special"> <- </span>divide-with-remainder width, <span class="Constant">2</span> + width:num<span class="Special"> <- </span>screen-width screen + divider:num, _<span class="Special"> <- </span>divide-with-remainder width, <span class="Constant">2</span> <span class="Comment"># update recipe editor</span> - recipes:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> - right:number<span class="Special"> <- </span>subtract divider, <span class="Constant">1</span> + recipes:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> + right:num<span class="Special"> <- </span>subtract divider, <span class="Constant">1</span> *recipes<span class="Special"> <- </span>put *recipes, <span class="Constant">right:offset</span>, right <span class="Comment"># reset cursor (later we'll try to preserve its position)</span> *recipes<span class="Special"> <- </span>put *recipes, <span class="Constant">cursor-row:offset</span>, <span class="Constant">1</span> *recipes<span class="Special"> <- </span>put *recipes, <span class="Constant">cursor-column:offset</span>, <span class="Constant">0</span> <span class="Comment"># update sandbox editor</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> - left:number<span class="Special"> <- </span>add divider, <span class="Constant">1</span> + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + left:num<span class="Special"> <- </span>add divider, <span class="Constant">1</span> *current-sandbox<span class="Special"> <- </span>put *current-sandbox, <span class="Constant">left:offset</span>, left - right:number<span class="Special"> <- </span>subtract width, <span class="Constant">1</span> + right:num<span class="Special"> <- </span>subtract width, <span class="Constant">1</span> *current-sandbox<span class="Special"> <- </span>put *current-sandbox, <span class="Constant">right:offset</span>, right <span class="Comment"># reset cursor (later we'll try to preserve its position)</span> *current-sandbox<span class="Special"> <- </span>put *current-sandbox, <span class="Constant">cursor-row:offset</span>, <span class="Constant">1</span> @@ -247,49 +247,49 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># Variant of 'render' that updates cursor-row and cursor-column based on</span> <span class="Comment"># before-cursor (rather than the other way around). If before-cursor moves</span> <span class="Comment"># off-screen, it resets cursor-row and cursor-column.</span> -<span class="muRecipe">def</span> render-without-moving-cursor screen:address:screen, editor:address:editor-data<span class="muRecipe"> -> </span>last-row:number, last-column:number, screen:address:screen, editor:address:editor-data [ +<span class="muRecipe">def</span> render-without-moving-cursor screen:&:screen, editor:&:editor-data<span class="muRecipe"> -> </span>last-row:num, last-column:num, screen:&:screen, editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> editor, <span class="Constant">1/top</span>, <span class="Constant">0/left</span>, screen/same-as-ingredient:<span class="Constant">0</span>, editor/same-as-ingredient:<span class="Constant">1</span> - left:number<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> - screen-height:number<span class="Special"> <- </span>screen-height screen - right:number<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> - curr:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - prev:address:duplex-list:character<span class="Special"> <- </span>copy curr <span class="Comment"># just in case curr becomes null and we can't compute prev</span> + left:num<span class="Special"> <- </span>get *editor, <span class="Constant">left:offset</span> + screen-height:num<span class="Special"> <- </span>screen-height screen + right:num<span class="Special"> <- </span>get *editor, <span class="Constant">right:offset</span> + curr:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + prev:&:duplex-list:char<span class="Special"> <- </span>copy curr <span class="Comment"># just in case curr becomes null and we can't compute prev</span> curr<span class="Special"> <- </span>next curr <span class="Constant"> +render-loop-initialization</span> - color:number<span class="Special"> <- </span>copy <span class="Constant">7/white</span> - row:number<span class="Special"> <- </span>copy <span class="Constant">1/top</span> - column:number<span class="Special"> <- </span>copy left + color:num<span class="Special"> <- </span>copy <span class="Constant">7/white</span> + row:num<span class="Special"> <- </span>copy <span class="Constant">1/top</span> + column:num<span class="Special"> <- </span>copy left <span class="Comment"># save before-cursor</span> - old-before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + old-before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> <span class="Comment"># initialze cursor-row/cursor-column/before-cursor to the top of the screen</span> <span class="Comment"># by default</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, row *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, column - top-of-screen:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + top-of-screen:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, top-of-screen screen<span class="Special"> <- </span>move-cursor screen, row, column <span class="Delimiter">{</span> <span class="Constant"> +next-character</span> <span class="muControl">break-unless</span> curr - off-screen?:boolean<span class="Special"> <- </span>greater-or-equal row, screen-height + off-screen?:bool<span class="Special"> <- </span>greater-or-equal row, screen-height <span class="muControl">break-if</span> off-screen? <span class="Comment"># if we find old-before-cursor still on the new resized screen, update</span> <span class="Comment"># editor-data.cursor-row and editor-data.cursor-column based on</span> <span class="Comment"># old-before-cursor</span> <span class="Delimiter">{</span> - at-cursor?:boolean<span class="Special"> <- </span>equal old-before-cursor, prev + at-cursor?:bool<span class="Special"> <- </span>equal old-before-cursor, prev <span class="muControl">break-unless</span> at-cursor? *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, row *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, column *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, old-before-cursor <span class="Delimiter">}</span> - c:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + c:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> <span class="Constant"> <character-c-received></span> <span class="Delimiter">{</span> <span class="Comment"># newline? move to left rather than 0</span> - newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> newline? <span class="Comment"># clear rest of line in this window</span> clear-line-until screen, right @@ -304,10 +304,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">{</span> <span class="Comment"># at right? wrap. even if there's only one more letter left; we need</span> <span class="Comment"># room for clicking on the cursor after it.</span> - at-right?:boolean<span class="Special"> <- </span>equal column, right + at-right?:bool<span class="Special"> <- </span>equal column, right <span class="muControl">break-unless</span> at-right? <span class="Comment"># print wrap icon</span> - wrap-icon:character<span class="Special"> <- </span>copy <span class="Constant">8617/loop-back-to-left</span> + wrap-icon:char<span class="Special"> <- </span>copy <span class="Constant">8617/loop-back-to-left</span> print screen, wrap-icon, <span class="Constant">245/grey</span> column<span class="Special"> <- </span>copy left row<span class="Special"> <- </span>add row, <span class="Constant">1</span> @@ -334,7 +334,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize both halves of screen</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[def]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text <span class="Comment"># focus on both sides</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">1</span> @@ -342,11 +342,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># check cursor column in each</span> run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:address:editor-data<span class="Special"> <- </span>get *<span class="Constant">3</span>:address:programming-environment-data, <span class="Constant">recipes:offset</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>get *<span class="Constant">4</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> - <span class="Constant">6</span>:address:editor-data<span class="Special"> <- </span>get *<span class="Constant">3</span>:address:programming-environment-data, <span class="Constant">current-sandbox:offset</span> - <span class="Constant">7</span>:number<span class="Special"> <- </span>get *<span class="Constant">6</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:&:editor-data<span class="Special"> <- </span>get *<span class="Constant">3</span>:&:programming-environment-data, <span class="Constant">recipes:offset</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>get *<span class="Constant">4</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">6</span>:&:editor-data<span class="Special"> <- </span>get *<span class="Constant">3</span>:&:programming-environment-data, <span class="Constant">current-sandbox:offset</span> + <span class="Constant">7</span>:num<span class="Special"> <- </span>get *<span class="Constant">6</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] memory-should-contain [ <span class="Constant">5</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -360,8 +360,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize both halves of screen</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[def]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render <span class="Comment"># type one letter in each of them</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">1</span> @@ -370,11 +370,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:address:editor-data<span class="Special"> <- </span>get *<span class="Constant">3</span>:address:programming-environment-data, <span class="Constant">recipes:offset</span> - <span class="Constant">5</span>:number<span class="Special"> <- </span>get *<span class="Constant">4</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> - <span class="Constant">6</span>:address:editor-data<span class="Special"> <- </span>get *<span class="Constant">3</span>:address:programming-environment-data, <span class="Constant">current-sandbox:offset</span> - <span class="Constant">7</span>:number<span class="Special"> <- </span>get *<span class="Constant">6</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:&:editor-data<span class="Special"> <- </span>get *<span class="Constant">3</span>:&:programming-environment-data, <span class="Constant">recipes:offset</span> + <span class="Constant">5</span>:num<span class="Special"> <- </span>get *<span class="Constant">4</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">6</span>:&:editor-data<span class="Special"> <- </span>get *<span class="Constant">3</span>:&:programming-environment-data, <span class="Constant">current-sandbox:offset</span> + <span class="Constant">7</span>:num<span class="Special"> <- </span>get *<span class="Constant">6</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] screen-should-contain [ <span class="Constant"> . run (F4) . # this line has a different background, but we don't test that yet</span> @@ -388,8 +388,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># show the cursor at the right window</span> run [ - <span class="Constant">8</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">8</span>:character/cursor + <span class="Constant">8</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">8</span>:char/cursor ] screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -405,8 +405,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[def]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render ] <span class="Comment"># divider isn't messed up</span> screen-should-contain [ @@ -423,14 +423,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">30/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[def]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render <span class="Comment"># initialize programming environment and highlight cursor</span> assume-console <span class="Constant">[]</span> run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor ] <span class="Comment"># is cursor at the right place?</span> screen-should-contain [ @@ -444,9 +444,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[z]</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor ] <span class="Comment"># cursor should still be right</span> screen-should-contain [ @@ -464,8 +464,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊abc .</span> @@ -479,9 +479,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press backspace ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor ] <span class="Comment"># cursor moves to end of old line</span> screen-should-contain [ @@ -492,47 +492,47 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -<span class="muRecipe">def</span> render-all screen:address:screen, env:address:programming-environment-data, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor-data)<span class="muRecipe"> -> </span>number number (address screen) (address editor-data))<span class="Delimiter">}</span><span class="muRecipe"> -> </span>screen:address:screen, env:address:programming-environment-data [ +<span class="muRecipe">def</span> render-all screen:&:screen, env:&:programming-environment-data, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor-data)<span class="muRecipe"> -> </span>number number (address screen) (address editor-data))<span class="Delimiter">}</span><span class="muRecipe"> -> </span>screen:&:screen, env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> trace <span class="Constant">10</span>, <span class="Constant">[app]</span>, <span class="Constant">[render all]</span> hide-screen screen <span class="Comment"># top menu</span> trace <span class="Constant">11</span>, <span class="Constant">[app]</span>, <span class="Constant">[render top menu]</span> - width:number<span class="Special"> <- </span>screen-width screen + width:num<span class="Special"> <- </span>screen-width screen draw-horizontal screen, <span class="Constant">0</span>, <span class="Constant">0/left</span>, width, <span class="Constant">32/space</span>, <span class="Constant">0/black</span>, <span class="Constant">238/grey</span> - button-start:number<span class="Special"> <- </span>subtract width, <span class="Constant">20</span> - button-on-screen?:boolean<span class="Special"> <- </span>greater-or-equal button-start, <span class="Constant">0</span> + button-start:num<span class="Special"> <- </span>subtract width, <span class="Constant">20</span> + button-on-screen?:bool<span class="Special"> <- </span>greater-or-equal button-start, <span class="Constant">0</span> assert button-on-screen?, <span class="Constant">[screen too narrow for menu]</span> screen<span class="Special"> <- </span>move-cursor screen, <span class="Constant">0/row</span>, button-start print screen, <span class="Constant">[ run (F4) ]</span>, <span class="Constant">255/white</span>, <span class="Constant">161/reddish</span> <span class="Comment"># dotted line down the middle</span> trace <span class="Constant">11</span>, <span class="Constant">[app]</span>, <span class="Constant">[render divider]</span> - divider:number, _<span class="Special"> <- </span>divide-with-remainder width, <span class="Constant">2</span> - height:number<span class="Special"> <- </span>screen-height screen + divider:num, _<span class="Special"> <- </span>divide-with-remainder width, <span class="Constant">2</span> + height:num<span class="Special"> <- </span>screen-height screen draw-vertical screen, divider, <span class="Constant">1/top</span>, height, <span class="Constant">9482/vertical-dotted</span> <span class="Comment">#</span> screen<span class="Special"> <- </span>render-recipes screen, env, render-editor screen<span class="Special"> <- </span>render-sandbox-side screen, env, render-editor <span class="Constant"> <render-components-end></span> <span class="Comment">#</span> - recipes:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> - sandbox-in-focus?:boolean<span class="Special"> <- </span>get *env, <span class="Constant">sandbox-in-focus?:offset</span> + recipes:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + sandbox-in-focus?:bool<span class="Special"> <- </span>get *env, <span class="Constant">sandbox-in-focus?:offset</span> screen<span class="Special"> <- </span>update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env <span class="Comment">#</span> show-screen screen ] -<span class="muRecipe">def</span> render-recipes screen:address:screen, env:address:programming-environment-data, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor-data)<span class="muRecipe"> -> </span>number number (address screen) (address editor-data))<span class="Delimiter">}</span><span class="muRecipe"> -> </span>screen:address:screen, env:address:programming-environment-data [ +<span class="muRecipe">def</span> render-recipes screen:&:screen, env:&:programming-environment-data, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor-data)<span class="muRecipe"> -> </span>number number (address screen) (address editor-data))<span class="Delimiter">}</span><span class="muRecipe"> -> </span>screen:&:screen, env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> trace <span class="Constant">11</span>, <span class="Constant">[app]</span>, <span class="Constant">[render recipes]</span> - recipes:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> + recipes:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> <span class="Comment"># render recipes</span> - left:number<span class="Special"> <- </span>get *recipes, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *recipes, <span class="Constant">right:offset</span> - row:number, column:number, screen<span class="Special"> <- </span>call render-editor, screen, recipes + left:num<span class="Special"> <- </span>get *recipes, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *recipes, <span class="Constant">right:offset</span> + row:num, column:num, screen<span class="Special"> <- </span>call render-editor, screen, recipes clear-line-until screen, right row<span class="Special"> <- </span>add row, <span class="Constant">1</span> <span class="Constant"> <render-recipe-components-end></span> @@ -543,13 +543,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># replaced in a later layer</span> -<span class="muRecipe">def</span> render-sandbox-side screen:address:screen, env:address:programming-environment-data, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor-data)<span class="muRecipe"> -> </span>number number (address screen) (address editor-data))<span class="Delimiter">}</span><span class="muRecipe"> -> </span>screen:address:screen, env:address:programming-environment-data [ +<span class="muRecipe">def</span> render-sandbox-side screen:&:screen, env:&:programming-environment-data, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor-data)<span class="muRecipe"> -> </span>number number (address screen) (address editor-data))<span class="Delimiter">}</span><span class="muRecipe"> -> </span>screen:&:screen, env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> - left:number<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">right:offset</span> - row:number, column:number, screen, current-sandbox<span class="Special"> <- </span>call render-editor, screen, current-sandbox + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + left:num<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">right:offset</span> + row:num, column:num, screen, current-sandbox<span class="Special"> <- </span>call render-editor, screen, current-sandbox clear-line-until screen, right row<span class="Special"> <- </span>add row, <span class="Constant">1</span> <span class="Comment"># draw solid line after code (you'll see why in later layers)</span> @@ -558,48 +558,48 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color clear-screen-from screen, row, left, left, right ] -<span class="muRecipe">def</span> update-cursor screen:address:screen, recipes:address:editor-data, current-sandbox:address:editor-data, sandbox-in-focus?:boolean, env:address:programming-environment-data<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> update-cursor screen:&:screen, recipes:&:editor-data, current-sandbox:&:editor-data, sandbox-in-focus?:bool, env:&:programming-environment-data<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Constant"> <update-cursor-special-cases></span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> sandbox-in-focus? - cursor-row:number<span class="Special"> <- </span>get *recipes, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *recipes, <span class="Constant">cursor-column:offset</span> + cursor-row:num<span class="Special"> <- </span>get *recipes, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *recipes, <span class="Constant">cursor-column:offset</span> <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> sandbox-in-focus? - cursor-row:number<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">cursor-column:offset</span> + cursor-row:num<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">cursor-column:offset</span> <span class="Delimiter">}</span> screen<span class="Special"> <- </span>move-cursor screen, cursor-row, cursor-column ] <span class="Comment"># like 'render' for texts, but with colorization for comments like in the editor</span> -<span class="muRecipe">def</span> render-code screen:address:screen, s:text, left:number, right:number, row:number<span class="muRecipe"> -> </span>row:number, screen:address:screen [ +<span class="muRecipe">def</span> render-code screen:&:screen, s:text, left:num, right:num, row:num<span class="muRecipe"> -> </span>row:num, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> s - color:number<span class="Special"> <- </span>copy <span class="Constant">7/white</span> - column:number<span class="Special"> <- </span>copy left + color:num<span class="Special"> <- </span>copy <span class="Constant">7/white</span> + column:num<span class="Special"> <- </span>copy left screen<span class="Special"> <- </span>move-cursor screen, row, column - screen-height:number<span class="Special"> <- </span>screen-height screen - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - len:number<span class="Special"> <- </span>length *s + screen-height:num<span class="Special"> <- </span>screen-height screen + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + len:num<span class="Special"> <- </span>length *s <span class="Delimiter">{</span> <span class="Constant"> +next-character</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? done?<span class="Special"> <- </span>greater-or-equal row, screen-height <span class="muControl">break-if</span> done? - c:character<span class="Special"> <- </span>index *s, i + c:char<span class="Special"> <- </span>index *s, i <span class="Constant"><character-c-received></span> <span class="Comment"># only line different from render</span> <span class="Delimiter">{</span> <span class="Comment"># at right? wrap.</span> - at-right?:boolean<span class="Special"> <- </span>equal column, right + at-right?:bool<span class="Special"> <- </span>equal column, right <span class="muControl">break-unless</span> at-right? <span class="Comment"># print wrap icon</span> - wrap-icon:character<span class="Special"> <- </span>copy <span class="Constant">8617/loop-back-to-left</span> + wrap-icon:char<span class="Special"> <- </span>copy <span class="Constant">8617/loop-back-to-left</span> print screen, wrap-icon, <span class="Constant">245/grey</span> column<span class="Special"> <- </span>copy left row<span class="Special"> <- </span>add row, <span class="Constant">1</span> @@ -609,13 +609,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color i<span class="Special"> <- </span>add i, <span class="Constant">1</span> <span class="Delimiter">{</span> <span class="Comment"># newline? move to left rather than 0</span> - newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> newline? <span class="Comment"># clear rest of line in this window</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-than column, right + done?:bool<span class="Special"> <- </span>greater-than column, right <span class="muControl">break-if</span> done? - space:character<span class="Special"> <- </span>copy <span class="Constant">32/space</span> + space:char<span class="Special"> <- </span>copy <span class="Constant">32/space</span> print screen, space column<span class="Special"> <- </span>add column, <span class="Constant">1</span> <span class="muControl">loop</span> @@ -629,7 +629,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color column<span class="Special"> <- </span>add column, <span class="Constant">1</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> - was-at-left?:boolean<span class="Special"> <- </span>equal column, left + was-at-left?:bool<span class="Special"> <- </span>equal column, left clear-line-until screen, right <span class="Delimiter">{</span> <span class="muControl">break-if</span> was-at-left? @@ -642,9 +642,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-type></span> [ <span class="Delimiter">{</span> - redraw-screen?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">12/ctrl-l</span> + redraw-screen?:bool<span class="Special"> <- </span>equal c, <span class="Constant">12/ctrl-l</span> <span class="muControl">break-unless</span> redraw-screen? - screen<span class="Special"> <- </span>render-all screen, env:address:programming-environment-data, render + screen<span class="Special"> <- </span>render-all screen, env:&:programming-environment-data, render sync-screen screen <span class="muControl">loop</span> <span class="Constant">+next-event:label</span> <span class="Delimiter">}</span> @@ -655,9 +655,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-type></span> [ <span class="Delimiter">{</span> - switch-side?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">14/ctrl-n</span> + switch-side?:bool<span class="Special"> <- </span>equal c, <span class="Constant">14/ctrl-n</span> <span class="muControl">break-unless</span> switch-side? - sandbox-in-focus?:boolean<span class="Special"> <- </span>get *env, <span class="Constant">sandbox-in-focus?:offset</span> + sandbox-in-focus?:bool<span class="Special"> <- </span>get *env, <span class="Constant">sandbox-in-focus?:offset</span> sandbox-in-focus?<span class="Special"> <- </span>not sandbox-in-focus? *env<span class="Special"> <- </span>put *env, <span class="Constant">sandbox-in-focus?:offset</span>, sandbox-in-focus? screen<span class="Special"> <- </span>update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env @@ -667,22 +667,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="SalientComment">## helpers</span> -<span class="muRecipe">def</span> draw-vertical screen:address:screen, col:number, y:number, bottom:number<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> draw-vertical screen:&:screen, col:num, y:num, bottom:num<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - style:character, style-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + style:char, style-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> style-found? style<span class="Special"> <- </span>copy <span class="Constant">9474/vertical</span> <span class="Delimiter">}</span> - color:number, color-found?:boolean<span class="Special"> <- </span><span class="Constant">next-ingredient</span> + color:num, color-found?:bool<span class="Special"> <- </span><span class="Constant">next-ingredient</span> <span class="Delimiter">{</span> <span class="Comment"># default color to white</span> <span class="muControl">break-if</span> color-found? color<span class="Special"> <- </span>copy <span class="Constant">245/grey</span> <span class="Delimiter">}</span> <span class="Delimiter">{</span> - continue?:boolean<span class="Special"> <- </span>lesser-than y, bottom + continue?:bool<span class="Special"> <- </span>lesser-than y, bottom <span class="muControl">break-unless</span> continue? screen<span class="Special"> <- </span>move-cursor screen, y, col print screen, style, color diff --git a/html/edit/005-sandbox.mu.html b/html/edit/005-sandbox.mu.html index 47a291e5..b6585eda 100644 --- a/html/edit/005-sandbox.mu.html +++ b/html/edit/005-sandbox.mu.html @@ -48,7 +48,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color initial-recipe:text<span class="Special"> <- </span>restore <span class="Constant">[recipes.mu]</span> initial-sandbox:text<span class="Special"> <- </span>new <span class="Constant">[]</span> hide-screen <span class="Constant">0/screen</span> - env:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment <span class="Constant">0/screen</span>, initial-recipe, initial-sandbox + env:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment <span class="Constant">0/screen</span>, initial-recipe, initial-sandbox env<span class="Special"> <- </span>restore-sandboxes env render-all <span class="Constant">0/screen</span>, env, render event-loop <span class="Constant">0/screen</span>, <span class="Constant">0/console</span>, env @@ -56,9 +56,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muData">container</span> programming-environment-data [ - sandbox:address:sandbox-data <span class="Comment"># list of sandboxes, from top to bottom</span> - render-from:number - number-of-sandboxes:number + sandbox:&:sandbox-data <span class="Comment"># list of sandboxes, from top to bottom</span> + render-from:num + number-of-sandboxes:num ] <span class="muRecipe">after</span> <span class="Constant"><programming-environment-initialization></span> [ @@ -70,10 +70,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color response:text <span class="Comment"># coordinates to track clicks</span> <span class="Comment"># constraint: will be 0 for sandboxes at positions before env.render-from</span> - starting-row-on-screen:number - code-ending-row-on-screen:number <span class="Comment"># past end of code</span> - screen:address:screen <span class="Comment"># prints in the sandbox go here</span> - next-sandbox:address:sandbox-data + starting-row-on-screen:num + code-ending-row-on-screen:num <span class="Comment"># past end of code</span> + screen:&:screen <span class="Comment"># prints in the sandbox go here</span> + next-sandbox:&:sandbox-data ] <span class="muScenario">scenario</span> run-and-show-results [ @@ -83,13 +83,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Comment"># sandbox editor contains an instruction without storing outputs</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[divide-with-remainder 11, 3]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text <span class="Comment"># run the code in the editors</span> assume-console [ press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># check that screen prints the results</span> screen-should-contain [ @@ -139,7 +139,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># check that screen prints the results</span> screen-should-contain [ @@ -162,10 +162,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-keypress></span> [ <span class="Comment"># F4? load all code and run all sandboxes.</span> <span class="Delimiter">{</span> - do-run?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65532/F4</span> + do-run?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65532/F4</span> <span class="muControl">break-unless</span> do-run? screen<span class="Special"> <- </span>update-status screen, <span class="Constant">[running... ]</span>, <span class="Constant">245/grey</span> - error?:boolean, env, screen<span class="Special"> <- </span>run-sandboxes env, screen + error?:bool, env, screen<span class="Special"> <- </span>run-sandboxes env, screen <span class="Comment"># F4 might update warnings and results on both sides</span> screen<span class="Special"> <- </span>render-all screen, env, render <span class="Delimiter">{</span> @@ -177,39 +177,39 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> run-sandboxes env:address:programming-environment-data, screen:address:screen<span class="muRecipe"> -> </span>errors-found?:boolean, env:address:programming-environment-data, screen:address:screen [ +<span class="muRecipe">def</span> run-sandboxes env:&:programming-environment-data, screen:&:screen<span class="muRecipe"> -> </span>errors-found?:bool, env:&:programming-environment-data, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - errors-found?:boolean, env, screen<span class="Special"> <- </span>update-recipes env, screen + errors-found?:bool, env, screen<span class="Special"> <- </span>update-recipes env, screen <span class="muControl">return-if</span> errors-found? <span class="Comment"># check contents of right editor (sandbox)</span> <span class="Constant"> <run-sandboxes-begin></span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> <span class="Delimiter">{</span> sandbox-contents:text<span class="Special"> <- </span>editor-contents current-sandbox <span class="muControl">break-unless</span> sandbox-contents <span class="Comment"># if contents exist, first save them</span> <span class="Comment"># run them and turn them into a new sandbox-data</span> - new-sandbox:address:sandbox-data<span class="Special"> <- </span>new <span class="Constant">sandbox-data:type</span> + new-sandbox:&:sandbox-data<span class="Special"> <- </span>new <span class="Constant">sandbox-data:type</span> *new-sandbox<span class="Special"> <- </span>put *new-sandbox, <span class="Constant">data:offset</span>, sandbox-contents <span class="Comment"># push to head of sandbox list</span> - dest:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + dest:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> *new-sandbox<span class="Special"> <- </span>put *new-sandbox, <span class="Constant">next-sandbox:offset</span>, dest *env<span class="Special"> <- </span>put *env, <span class="Constant">sandbox:offset</span>, new-sandbox <span class="Comment"># update sandbox count</span> - sandbox-count:number<span class="Special"> <- </span>get *env, <span class="Constant">number-of-sandboxes:offset</span> + sandbox-count:num<span class="Special"> <- </span>get *env, <span class="Constant">number-of-sandboxes:offset</span> sandbox-count<span class="Special"> <- </span>add sandbox-count, <span class="Constant">1</span> *env<span class="Special"> <- </span>put *env, <span class="Constant">number-of-sandboxes:offset</span>, sandbox-count <span class="Comment"># clear sandbox editor</span> - init:address:duplex-list:character<span class="Special"> <- </span>push <span class="Constant">167/§</span>, <span class="Constant">0/tail</span> + init:&:duplex-list:char<span class="Special"> <- </span>push <span class="Constant">167/§</span>, <span class="Constant">0/tail</span> *current-sandbox<span class="Special"> <- </span>put *current-sandbox, <span class="Constant">data:offset</span>, init *current-sandbox<span class="Special"> <- </span>put *current-sandbox, <span class="Constant">top-of-screen:offset</span>, init <span class="Delimiter">}</span> <span class="Comment"># save all sandboxes before running, just in case we die when running</span> save-sandboxes env <span class="Comment"># run all sandboxes</span> - curr:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> - idx:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + curr:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + idx:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> curr curr<span class="Special"> <- </span>update-sandbox curr, env, idx @@ -222,10 +222,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># copy code from recipe editor, persist, load into mu</span> <span class="Comment"># replaced in a later layer (whereupon errors-found? will actually be set)</span> -<span class="muRecipe">def</span> update-recipes env:address:programming-environment-data, screen:address:screen<span class="muRecipe"> -> </span>errors-found?:boolean, env:address:programming-environment-data, screen:address:screen [ +<span class="muRecipe">def</span> update-recipes env:&:programming-environment-data, screen:&:screen<span class="muRecipe"> -> </span>errors-found?:bool, env:&:programming-environment-data, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - recipes:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> + recipes:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> in:text<span class="Special"> <- </span>editor-contents recipes save <span class="Constant">[recipes.mu]</span>, in <span class="Comment"># newlayer: persistence</span> reload in @@ -233,30 +233,30 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># replaced in a later layer</span> -<span class="muRecipe">def!</span> update-sandbox sandbox:address:sandbox-data, env:address:programming-environment-data, idx:number<span class="muRecipe"> -> </span>sandbox:address:sandbox-data, env:address:programming-environment-data [ +<span class="muRecipe">def!</span> update-sandbox sandbox:&:sandbox-data, env:&:programming-environment-data, idx:num<span class="muRecipe"> -> </span>sandbox:&:sandbox-data, env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> data:text<span class="Special"> <- </span>get *sandbox, <span class="Constant">data:offset</span> - response:text, _, fake-screen:address:screen<span class="Special"> <- </span>run-sandboxed data + response:text, _, fake-screen:&:screen<span class="Special"> <- </span>run-sandboxed data *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">response:offset</span>, response *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">screen:offset</span>, fake-screen ] -<span class="muRecipe">def</span> update-status screen:address:screen, msg:text, color:number<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> update-status screen:&:screen, msg:text, color:num<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> screen<span class="Special"> <- </span>move-cursor screen, <span class="Constant">0</span>, <span class="Constant">2</span> screen<span class="Special"> <- </span>print screen, msg, color, <span class="Constant">238/grey/background</span> ] -<span class="muRecipe">def</span> save-sandboxes env:address:programming-environment-data [ +<span class="muRecipe">def</span> save-sandboxes env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> <span class="Comment"># first clear previous versions, in case we deleted some sandbox</span> $system <span class="Constant">[rm lesson/[0-9]</span>* >/dev/null <span class="Constant">2</span>>/dev/null] <span class="Comment"># some shells can't handle '>&'</span> - curr:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> - idx:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + curr:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + idx:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> curr data:text<span class="Special"> <- </span>get *curr, <span class="Constant">data:offset</span> @@ -269,18 +269,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> ] -<span class="muRecipe">def!</span> render-sandbox-side screen:address:screen, env:address:programming-environment-data, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor-data)<span class="muRecipe"> -> </span>number number (address screen) (address editor-data))<span class="Delimiter">}</span><span class="muRecipe"> -> </span>screen:address:screen, env:address:programming-environment-data [ +<span class="muRecipe">def!</span> render-sandbox-side screen:&:screen, env:&:programming-environment-data, <span class="Delimiter">{</span>render-editor: (<span class="muRecipe">recipe</span> (address screen) (address editor-data)<span class="muRecipe"> -> </span>number number (address screen) (address editor-data))<span class="Delimiter">}</span><span class="muRecipe"> -> </span>screen:&:screen, env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> trace <span class="Constant">11</span>, <span class="Constant">[app]</span>, <span class="Constant">[render sandbox side]</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> - row:number, column:number<span class="Special"> <- </span>copy <span class="Constant">1</span>, <span class="Constant">0</span> - left:number<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> - right:number<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">right:offset</span> + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + row:num, column:num<span class="Special"> <- </span>copy <span class="Constant">1</span>, <span class="Constant">0</span> + left:num<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> + right:num<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">right:offset</span> <span class="Comment"># render sandbox editor</span> - render-from:number<span class="Special"> <- </span>get *env, <span class="Constant">render-from:offset</span> + render-from:num<span class="Special"> <- </span>get *env, <span class="Constant">render-from:offset</span> <span class="Delimiter">{</span> - render-current-sandbox?:boolean<span class="Special"> <- </span>equal render-from, <span class="Constant">-1</span> + render-current-sandbox?:bool<span class="Special"> <- </span>equal render-from, <span class="Constant">-1</span> <span class="muControl">break-unless</span> render-current-sandbox? row, column, screen, current-sandbox<span class="Special"> <- </span>call render-editor, screen, current-sandbox clear-screen-from screen, row, column, left, right @@ -288,19 +288,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="Comment"># render sandboxes</span> draw-horizontal screen, row, left, right, <span class="Constant">9473/horizontal-double</span> - sandbox:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + sandbox:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> row, screen<span class="Special"> <- </span>render-sandboxes screen, sandbox, left, right, row, render-from clear-rest-of-screen screen, row, left, right ] -<span class="muRecipe">def</span> render-sandboxes screen:address:screen, sandbox:address:sandbox-data, left:number, right:number, row:number, render-from:number, idx:number<span class="muRecipe"> -> </span>row:number, screen:address:screen, sandbox:address:sandbox-data [ +<span class="muRecipe">def</span> render-sandboxes screen:&:screen, sandbox:&:sandbox-data, left:num, right:num, row:num, render-from:num, idx:num<span class="muRecipe"> -> </span>row:num, screen:&:screen, sandbox:&:sandbox-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> sandbox - screen-height:number<span class="Special"> <- </span>screen-height screen - at-bottom?:boolean<span class="Special"> <- </span>greater-or-equal row, screen-height - <span class="muControl">return-if</span> at-bottom?:boolean - hidden?:boolean<span class="Special"> <- </span>lesser-than idx, render-from + screen-height:num<span class="Special"> <- </span>screen-height screen + at-bottom?:bool<span class="Special"> <- </span>greater-or-equal row, screen-height + <span class="muControl">return-if</span> at-bottom?:bool + hidden?:bool<span class="Special"> <- </span>lesser-than idx, render-from <span class="Delimiter">{</span> <span class="muControl">break-if</span> hidden? <span class="Comment"># render sandbox menu</span> @@ -319,8 +319,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color sandbox-response:text<span class="Special"> <- </span>get *sandbox, <span class="Constant">response:offset</span> <span class="Constant"> <render-sandbox-results></span> <span class="Delimiter">{</span> - sandbox-screen:address:screen<span class="Special"> <- </span>get *sandbox, <span class="Constant">screen:offset</span> - empty-screen?:boolean<span class="Special"> <- </span>fake-screen-is-empty? sandbox-screen + sandbox-screen:&:screen<span class="Special"> <- </span>get *sandbox, <span class="Constant">screen:offset</span> + empty-screen?:bool<span class="Special"> <- </span>fake-screen-is-empty? sandbox-screen <span class="muControl">break-if</span> empty-screen? row, screen<span class="Special"> <- </span>render-screen screen, sandbox-screen, left, right, row <span class="Delimiter">}</span> @@ -330,7 +330,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color row, screen<span class="Special"> <- </span>render-text screen, sandbox-response, left, right, <span class="Constant">245/grey</span>, row <span class="Delimiter">}</span> <span class="Constant"> +render-sandbox-end</span> - at-bottom?:boolean<span class="Special"> <- </span>greater-or-equal row, screen-height + at-bottom?:bool<span class="Special"> <- </span>greater-or-equal row, screen-height <span class="muControl">return-if</span> at-bottom? <span class="Comment"># draw solid line after sandbox</span> draw-horizontal screen, row, left, right, <span class="Constant">9473/horizontal-double</span> @@ -343,28 +343,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> <end-render-sandbox-reset-hidden></span> <span class="Delimiter">}</span> <span class="Comment"># draw next sandbox</span> - next-sandbox:address:sandbox-data<span class="Special"> <- </span>get *sandbox, <span class="Constant">next-sandbox:offset</span> - next-idx:number<span class="Special"> <- </span>add idx, <span class="Constant">1</span> + next-sandbox:&:sandbox-data<span class="Special"> <- </span>get *sandbox, <span class="Constant">next-sandbox:offset</span> + next-idx:num<span class="Special"> <- </span>add idx, <span class="Constant">1</span> row, screen<span class="Special"> <- </span>render-sandboxes screen, next-sandbox, left, right, row, render-from, next-idx ] -<span class="muRecipe">def</span> render-sandbox-menu screen:address:screen, sandbox-index:number, left:number, right:number<span class="muRecipe"> -> </span>screen:address:screen [ +<span class="muRecipe">def</span> render-sandbox-menu screen:&:screen, sandbox-index:num, left:num, right:num<span class="muRecipe"> -> </span>screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> move-cursor-to-column screen, left - edit-button-left:number, edit-button-right:number, copy-button-left:number, copy-button-right:number, delete-button-left:number<span class="Special"> <- </span>sandbox-menu-columns left, right + edit-button-left:num, edit-button-right:num, copy-button-left:num, copy-button-right:num, delete-button-left:num<span class="Special"> <- </span>sandbox-menu-columns left, right print screen, sandbox-index, <span class="Constant">232/dark-grey</span>, <span class="Constant">245/grey</span> - start-buttons:number<span class="Special"> <- </span>subtract edit-button-left, <span class="Constant">1</span> + start-buttons:num<span class="Special"> <- </span>subtract edit-button-left, <span class="Constant">1</span> clear-line-until screen, start-buttons, <span class="Constant">245/grey</span> print screen, <span class="Constant">[edit]</span>, <span class="Constant">232/black</span>, <span class="Constant">94/background-orange</span> clear-line-until screen, edit-button-right, <span class="Constant">94/background-orange</span> - _, col:number<span class="Special"> <- </span>cursor-position screen - at-start-of-copy-button?:boolean<span class="Special"> <- </span>equal col, copy-button-left + _, col:num<span class="Special"> <- </span>cursor-position screen + at-start-of-copy-button?:bool<span class="Special"> <- </span>equal col, copy-button-left assert at-start-of-copy-button?, <span class="Constant">[aaa]</span> print screen, <span class="Constant">[copy]</span>, <span class="Constant">232/black</span>, <span class="Constant">58/background-green</span> clear-line-until screen, copy-button-right, <span class="Constant">58/background-green</span> - _, col:number<span class="Special"> <- </span>cursor-position screen - at-start-of-delete-button?:boolean<span class="Special"> <- </span>equal col, delete-button-left + _, col:num<span class="Special"> <- </span>cursor-position screen + at-start-of-delete-button?:bool<span class="Special"> <- </span>equal col, delete-button-left assert at-start-of-delete-button?, <span class="Constant">[bbb]</span> print screen, <span class="Constant">[delete]</span>, <span class="Constant">232/black</span>, <span class="Constant">52/background-red</span> clear-line-until screen, right, <span class="Constant">52/background-red</span> @@ -373,45 +373,45 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># divide up the menu bar for a sandbox into 3 segments, for edit/copy/delete buttons</span> <span class="Comment"># delete-button-right == right</span> <span class="Comment"># all left/right pairs are inclusive</span> -<span class="muRecipe">def</span> sandbox-menu-columns left:number, right:number<span class="muRecipe"> -> </span>edit-button-left:number, edit-button-right:number, copy-button-left:number, copy-button-right:number, delete-button-left:number [ +<span class="muRecipe">def</span> sandbox-menu-columns left:num, right:num<span class="muRecipe"> -> </span>edit-button-left:num, edit-button-right:num, copy-button-left:num, copy-button-right:num, delete-button-left:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - start-buttons:number<span class="Special"> <- </span>add left, <span class="Constant">4/space-for-sandbox-index</span> - buttons-space:number<span class="Special"> <- </span>subtract right, start-buttons - button-width:number<span class="Special"> <- </span>divide-with-remainder buttons-space, <span class="Constant">3</span> <span class="Comment"># integer division</span> - buttons-wide-enough?:boolean<span class="Special"> <- </span>greater-or-equal button-width, <span class="Constant">8</span> + start-buttons:num<span class="Special"> <- </span>add left, <span class="Constant">4/space-for-sandbox-index</span> + buttons-space:num<span class="Special"> <- </span>subtract right, start-buttons + button-width:num<span class="Special"> <- </span>divide-with-remainder buttons-space, <span class="Constant">3</span> <span class="Comment"># integer division</span> + buttons-wide-enough?:bool<span class="Special"> <- </span>greater-or-equal button-width, <span class="Constant">8</span> assert buttons-wide-enough?, <span class="Constant">[sandbox must be at least 30 or so characters wide]</span> - edit-button-left:number<span class="Special"> <- </span>copy start-buttons - copy-button-left:number<span class="Special"> <- </span>add start-buttons, button-width - edit-button-right:number<span class="Special"> <- </span>subtract copy-button-left, <span class="Constant">1</span> - delete-button-left:number<span class="Special"> <- </span>subtract right, button-width - copy-button-right:number<span class="Special"> <- </span>subtract delete-button-left, <span class="Constant">1</span> + edit-button-left:num<span class="Special"> <- </span>copy start-buttons + copy-button-left:num<span class="Special"> <- </span>add start-buttons, button-width + edit-button-right:num<span class="Special"> <- </span>subtract copy-button-left, <span class="Constant">1</span> + delete-button-left:num<span class="Special"> <- </span>subtract right, button-width + copy-button-right:num<span class="Special"> <- </span>subtract delete-button-left, <span class="Constant">1</span> ] <span class="Comment"># print a text 's' to 'editor' in 'color' starting at 'row'</span> <span class="Comment"># clear rest of last line, move cursor to next line</span> -<span class="muRecipe">def</span> render-text screen:address:screen, s:text, left:number, right:number, color:number, row:number<span class="muRecipe"> -> </span>row:number, screen:address:screen [ +<span class="muRecipe">def</span> render-text screen:&:screen, s:text, left:num, right:num, color:num, row:num<span class="muRecipe"> -> </span>row:num, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> s - column:number<span class="Special"> <- </span>copy left + column:num<span class="Special"> <- </span>copy left screen<span class="Special"> <- </span>move-cursor screen, row, column - screen-height:number<span class="Special"> <- </span>screen-height screen - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - len:number<span class="Special"> <- </span>length *s + screen-height:num<span class="Special"> <- </span>screen-height screen + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + len:num<span class="Special"> <- </span>length *s <span class="Delimiter">{</span> <span class="Constant"> +next-character</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? done?<span class="Special"> <- </span>greater-or-equal row, screen-height <span class="muControl">break-if</span> done? - c:character<span class="Special"> <- </span>index *s, i + c:char<span class="Special"> <- </span>index *s, i <span class="Delimiter">{</span> <span class="Comment"># at right? wrap.</span> - at-right?:boolean<span class="Special"> <- </span>equal column, right + at-right?:bool<span class="Special"> <- </span>equal column, right <span class="muControl">break-unless</span> at-right? <span class="Comment"># print wrap icon</span> - wrap-icon:character<span class="Special"> <- </span>copy <span class="Constant">8617/loop-back-to-left</span> + wrap-icon:char<span class="Special"> <- </span>copy <span class="Constant">8617/loop-back-to-left</span> print screen, wrap-icon, <span class="Constant">245/grey</span> column<span class="Special"> <- </span>copy left row<span class="Special"> <- </span>add row, <span class="Constant">1</span> @@ -421,13 +421,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color i<span class="Special"> <- </span>add i, <span class="Constant">1</span> <span class="Delimiter">{</span> <span class="Comment"># newline? move to left rather than 0</span> - newline?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> + newline?:bool<span class="Special"> <- </span>equal c, <span class="Constant">10/newline</span> <span class="muControl">break-unless</span> newline? <span class="Comment"># clear rest of line in this window</span> <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-than column, right + done?:bool<span class="Special"> <- </span>greater-than column, right <span class="muControl">break-if</span> done? - space:character<span class="Special"> <- </span>copy <span class="Constant">32/space</span> + space:char<span class="Special"> <- </span>copy <span class="Constant">32/space</span> print screen, space column<span class="Special"> <- </span>add column, <span class="Constant">1</span> <span class="muControl">loop</span> @@ -441,7 +441,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color column<span class="Special"> <- </span>add column, <span class="Constant">1</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> - was-at-left?:boolean<span class="Special"> <- </span>equal column, left + was-at-left?:bool<span class="Special"> <- </span>equal column, left clear-line-until screen, right <span class="Delimiter">{</span> <span class="muControl">break-if</span> was-at-left? @@ -451,13 +451,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># assumes programming environment has no sandboxes; restores them from previous session</span> -<span class="muRecipe">def</span> restore-sandboxes env:address:programming-environment-data<span class="muRecipe"> -> </span>env:address:programming-environment-data [ +<span class="muRecipe">def</span> restore-sandboxes env:&:programming-environment-data<span class="muRecipe"> -> </span>env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># read all scenarios, pushing them to end of a list of scenarios</span> - idx:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - curr:address:sandbox-data<span class="Special"> <- </span>copy <span class="Constant">0</span> - prev:address:sandbox-data<span class="Special"> <- </span>copy <span class="Constant">0</span> + idx:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + curr:&:sandbox-data<span class="Special"> <- </span>copy <span class="Constant">0</span> + prev:&:sandbox-data<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> filename:text<span class="Special"> <- </span>to-text idx contents:text<span class="Special"> <- </span>restore filename @@ -485,7 +485,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># print the fake sandbox screen to 'screen' with appropriate delimiters</span> <span class="Comment"># leave cursor at start of next line</span> -<span class="muRecipe">def</span> render-screen screen:address:screen, sandbox-screen:address:screen, left:number, right:number, row:number<span class="muRecipe"> -> </span>row:number, screen:address:screen [ +<span class="muRecipe">def</span> render-screen screen:&:screen, sandbox-screen:&:screen, left:num, right:num, row:num<span class="muRecipe"> -> </span>row:num, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">return-unless</span> sandbox-screen @@ -493,39 +493,39 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color row<span class="Special"> <- </span>render-text screen, <span class="Constant">[screen:]</span>, left, right, <span class="Constant">245/grey</span>, row screen<span class="Special"> <- </span>move-cursor screen, row, left <span class="Comment"># start printing sandbox-screen</span> - column:number<span class="Special"> <- </span>copy left - s-width:number<span class="Special"> <- </span>screen-width sandbox-screen - s-height:number<span class="Special"> <- </span>screen-height sandbox-screen - buf:address:array:screen-cell<span class="Special"> <- </span>get *sandbox-screen, <span class="Constant">data:offset</span> - stop-printing:number<span class="Special"> <- </span>add left, s-width, <span class="Constant">3</span> - max-column:number<span class="Special"> <- </span>min stop-printing, right - i:number<span class="Special"> <- </span>copy <span class="Constant">0</span> - len:number<span class="Special"> <- </span>length *buf - screen-height:number<span class="Special"> <- </span>screen-height screen + column:num<span class="Special"> <- </span>copy left + s-width:num<span class="Special"> <- </span>screen-width sandbox-screen + s-height:num<span class="Special"> <- </span>screen-height sandbox-screen + buf:&:@:screen-cell<span class="Special"> <- </span>get *sandbox-screen, <span class="Constant">data:offset</span> + stop-printing:num<span class="Special"> <- </span>add left, s-width, <span class="Constant">3</span> + max-column:num<span class="Special"> <- </span>min stop-printing, right + i:num<span class="Special"> <- </span>copy <span class="Constant">0</span> + len:num<span class="Special"> <- </span>length *buf + screen-height:num<span class="Special"> <- </span>screen-height screen <span class="Delimiter">{</span> - done?:boolean<span class="Special"> <- </span>greater-or-equal i, len + done?:bool<span class="Special"> <- </span>greater-or-equal i, len <span class="muControl">break-if</span> done? done?<span class="Special"> <- </span>greater-or-equal row, screen-height <span class="muControl">break-if</span> done? column<span class="Special"> <- </span>copy left screen<span class="Special"> <- </span>move-cursor screen, row, column <span class="Comment"># initial leader for each row: two spaces and a '.'</span> - space:character<span class="Special"> <- </span>copy <span class="Constant">32/space</span> + space:char<span class="Special"> <- </span>copy <span class="Constant">32/space</span> print screen, space, <span class="Constant">245/grey</span> print screen, space, <span class="Constant">245/grey</span> - full-stop:character<span class="Special"> <- </span>copy <span class="Constant">46/period</span> + full-stop:char<span class="Special"> <- </span>copy <span class="Constant">46/period</span> print screen, full-stop, <span class="Constant">245/grey</span> column<span class="Special"> <- </span>add left, <span class="Constant">3</span> <span class="Delimiter">{</span> <span class="Comment"># print row</span> - row-done?:boolean<span class="Special"> <- </span>greater-or-equal column, max-column + row-done?:bool<span class="Special"> <- </span>greater-or-equal column, max-column <span class="muControl">break-if</span> row-done? curr:screen-cell<span class="Special"> <- </span>index *buf, i - c:character<span class="Special"> <- </span>get curr, <span class="Constant">contents:offset</span> - color:number<span class="Special"> <- </span>get curr, <span class="Constant">color:offset</span> + c:char<span class="Special"> <- </span>get curr, <span class="Constant">contents:offset</span> + color:num<span class="Special"> <- </span>get curr, <span class="Constant">color:offset</span> <span class="Delimiter">{</span> <span class="Comment"># damp whites down to grey</span> - white?:boolean<span class="Special"> <- </span>equal color, <span class="Constant">7/white</span> + white?:bool<span class="Special"> <- </span>equal color, <span class="Constant">7/white</span> <span class="muControl">break-unless</span> white? color<span class="Special"> <- </span>copy <span class="Constant">245/grey</span> <span class="Delimiter">}</span> @@ -539,7 +539,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color column<span class="Special"> <- </span>add column, <span class="Constant">1</span> <span class="Delimiter">{</span> <span class="Comment"># clear rest of current line</span> - line-done?:boolean<span class="Special"> <- </span>greater-than column, right + line-done?:bool<span class="Special"> <- </span>greater-than column, right <span class="muControl">break-if</span> line-done? print screen, space column<span class="Special"> <- </span>add column, <span class="Constant">1</span> @@ -557,23 +557,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ </span> <span class="Constant">recipe foo [</span> <span class="Constant">local-scope</span> -<span class="Constant">z:number <- add 2, 2</span> +<span class="Constant">z:num <- add 2, 2</span> <span class="Constant">reply z</span> <span class="Constant">]</span>] <span class="Comment"># sandbox editor contains an instruction without storing outputs</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[foo]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text <span class="Comment"># run the code in the editors</span> assume-console [ press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> <span class="Constant"> .recipe foo [ ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> .local-scope ┊0 edit copy delete .</span> - <span class="Constant"> .z:number <- add 2, 2 ┊foo .</span> + <span class="Constant"> .z:num <- add 2, 2 ┊foo .</span> <span class="Constant"> .reply z ┊4 .</span> <span class="Constant"> .] ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ .</span> @@ -587,7 +587,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># check that screen updates the result on the right</span> screen-should-contain [ @@ -595,7 +595,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> . ┊ .</span> <span class="Constant"> .recipe foo [ ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> .local-scope ┊0 edit copy delete .</span> - <span class="Constant"> .z:number <- add 2, 3 ┊foo .</span> + <span class="Constant"> .z:num <- add 2, 3 ┊foo .</span> <span class="Constant"> .reply z ┊5 .</span> <span class="Constant"> .] ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ .</span> @@ -610,13 +610,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Comment"># right editor contains an instruction</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[print-integer screen, 4]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text <span class="Comment"># run the code in the editor</span> assume-console [ press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># check that it prints a little toy screen</span> screen-should-contain [ @@ -636,18 +636,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -<span class="muRecipe">def</span> editor-contents editor:address:editor-data<span class="muRecipe"> -> </span>result:text [ +<span class="muRecipe">def</span> editor-contents editor:&:editor-data<span class="muRecipe"> -> </span>result:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - buf:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">80</span> - curr:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> + buf:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">80</span> + curr:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> <span class="Comment"># skip § sentinel</span> assert curr, <span class="Constant">[editor without data is illegal; must have at least a sentinel]</span> curr<span class="Special"> <- </span>next curr <span class="muControl">return-unless</span> curr, <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> curr - c:character<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> + c:char<span class="Special"> <- </span>get *curr, <span class="Constant">value:offset</span> buf<span class="Special"> <- </span>append buf, c curr<span class="Special"> <- </span>next curr <span class="muControl">loop</span> @@ -658,15 +658,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> editor-provides-edited-contents [ assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">2</span> type <span class="Constant">[def]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:text<span class="Special"> <- </span>editor-contents <span class="Constant">2</span>:address:editor-data - <span class="Constant">4</span>:array:character<span class="Special"> <- </span>copy *<span class="Constant">3</span>:text + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:text<span class="Special"> <- </span>editor-contents <span class="Constant">2</span>:&:editor-data + <span class="Constant">4</span>:@:char<span class="Special"> <- </span>copy *<span class="Constant">3</span>:text ] memory-should-contain [ <span class="Constant">4</span>:array:character<span class="Special"> <- </span><span class="Constant">[abdefc]</span> @@ -679,13 +679,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> trace-until <span class="Constant">100/app</span> assume-screen <span class="Constant">100/width</span>, <span class="Constant">10/height</span> - env:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">[]</span>, <span class="Constant">[]</span> + env:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">[]</span>, <span class="Constant">[]</span> render-all screen, env, render assume-console [ press enter press down-arrow ] - event-loop screen, console:address:console, env + event-loop screen, console:&:console, env <span class="Comment"># no scroll</span> screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -700,16 +700,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> trace-until <span class="Constant">100/app</span> assume-screen <span class="Constant">100/width</span>, <span class="Constant">10/height</span> - env:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">[]</span>, <span class="Constant">[]</span> + env:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">[]</span>, <span class="Constant">[]</span> render-all screen, env, render assume-console [ press enter press up-arrow press down-arrow <span class="Comment"># while cursor isn't at bottom</span> ] - event-loop screen, console:address:console, env - cursor:character<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, cursor + event-loop screen, console:&:console, env + cursor:char<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, cursor <span class="Comment"># cursor moves back to bottom</span> screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -724,7 +724,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># layers will add other stuff to the left side below the editor (error messages)</span> <span class="muData">container</span> programming-environment-data [ - recipe-bottom:number + recipe-bottom:num ] <span class="muRecipe">after</span> <span class="Constant"><render-recipe-components-end></span> [ @@ -734,22 +734,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-keypress></span> [ <span class="Delimiter">{</span> <span class="muControl">break-if</span> sandbox-in-focus? - down-arrow?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65516/down-arrow</span> + down-arrow?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65516/down-arrow</span> <span class="muControl">break-unless</span> down-arrow? - recipe-editor:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> - recipe-cursor-row:number<span class="Special"> <- </span>get *recipe-editor, <span class="Constant">cursor-row:offset</span> - recipe-editor-bottom:number<span class="Special"> <- </span>get *recipe-editor, <span class="Constant">bottom:offset</span> - at-bottom-of-editor?:boolean<span class="Special"> <- </span>greater-or-equal recipe-cursor-row, recipe-editor-bottom + recipe-editor:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> + recipe-cursor-row:num<span class="Special"> <- </span>get *recipe-editor, <span class="Constant">cursor-row:offset</span> + recipe-editor-bottom:num<span class="Special"> <- </span>get *recipe-editor, <span class="Constant">bottom:offset</span> + at-bottom-of-editor?:bool<span class="Special"> <- </span>greater-or-equal recipe-cursor-row, recipe-editor-bottom <span class="muControl">break-unless</span> at-bottom-of-editor? - more-to-scroll?:boolean<span class="Special"> <- </span>more-to-scroll? env, screen + more-to-scroll?:bool<span class="Special"> <- </span>more-to-scroll? env, screen <span class="muControl">break-if</span> more-to-scroll? <span class="muControl">loop</span> <span class="Constant">+next-event:label</span> <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> sandbox-in-focus? - page-down?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65518/page-down</span> + page-down?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65518/page-down</span> <span class="muControl">break-unless</span> page-down? - more-to-scroll?:boolean<span class="Special"> <- </span>more-to-scroll? env, screen + more-to-scroll?:bool<span class="Special"> <- </span>more-to-scroll? env, screen <span class="muControl">break-if</span> more-to-scroll? <span class="muControl">loop</span> <span class="Constant">+next-event:label</span> <span class="Delimiter">}</span> @@ -758,19 +758,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-type></span> [ <span class="Delimiter">{</span> <span class="muControl">break-if</span> sandbox-in-focus? - page-down?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">6/ctrl-f</span> + page-down?:bool<span class="Special"> <- </span>equal k, <span class="Constant">6/ctrl-f</span> <span class="muControl">break-unless</span> page-down? - more-to-scroll?:boolean<span class="Special"> <- </span>more-to-scroll? env, screen + more-to-scroll?:bool<span class="Special"> <- </span>more-to-scroll? env, screen <span class="muControl">break-if</span> more-to-scroll? <span class="muControl">loop</span> <span class="Constant">+next-event:label</span> <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> more-to-scroll? env:address:programming-environment-data, screen:address:screen<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> more-to-scroll? env:&:programming-environment-data, screen:&:screen<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - recipe-bottom:number<span class="Special"> <- </span>get *env, <span class="Constant">recipe-bottom:offset</span> - height:number<span class="Special"> <- </span>screen-height screen + recipe-bottom:num<span class="Special"> <- </span>get *env, <span class="Constant">recipe-bottom:offset</span> + height:num<span class="Special"> <- </span>screen-height screen result<span class="Special"> <- </span>greater-or-equal recipe-bottom, height ] @@ -778,7 +778,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> trace-until <span class="Constant">100/app</span> assume-screen <span class="Constant">100/width</span>, <span class="Constant">10/height</span> - env:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">[]</span>, <span class="Constant">[]</span> + env:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">[]</span>, <span class="Constant">[]</span> render-all screen, env, render assume-console [ <span class="Comment"># add a line</span> @@ -788,7 +788,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># try to scroll</span> press page-down <span class="Comment"># or ctrl-f</span> ] - event-loop screen, console:address:console, env + event-loop screen, console:&:console, env <span class="Comment"># no scroll, and cursor remains at top line</span> screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -803,7 +803,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> trace-until <span class="Constant">100/app</span> assume-screen <span class="Constant">100/width</span>, <span class="Constant">10/height</span> - env:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">[]</span>, <span class="Constant">[ab</span> + env:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">[]</span>, <span class="Constant">[ab</span> <span class="Constant">cd]</span> render-all screen, env, render assume-console [ @@ -814,9 +814,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># move cursor</span> press down-arrow ] - event-loop screen, console:address:console, env - cursor:character<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, cursor + event-loop screen, console:&:console, env + cursor:char<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, cursor <span class="Comment"># no scroll on recipe side, cursor moves on sandbox side</span> screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -835,13 +835,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize sandbox side</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[add 2, 2]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render assume-console [ <span class="Comment"># create a sandbox</span> press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -855,9 +855,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-down ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor ] <span class="Comment"># sandbox editor hidden; first sandbox displayed</span> <span class="Comment"># cursor moves to first sandbox</span> @@ -873,9 +873,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-up ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor ] <span class="Comment"># sandbox editor displays again, cursor is in editor</span> screen-should-contain [ @@ -891,16 +891,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-keypress></span> [ <span class="Delimiter">{</span> <span class="muControl">break-unless</span> sandbox-in-focus? - page-down?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65518/page-down</span> + page-down?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65518/page-down</span> <span class="muControl">break-unless</span> page-down? - sandbox:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + sandbox:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> <span class="muControl">break-unless</span> sandbox <span class="Comment"># slide down if possible</span> <span class="Delimiter">{</span> - render-from:number<span class="Special"> <- </span>get *env, <span class="Constant">render-from:offset</span> - number-of-sandboxes:number<span class="Special"> <- </span>get *env, <span class="Constant">number-of-sandboxes:offset</span> - max:number<span class="Special"> <- </span>subtract number-of-sandboxes, <span class="Constant">1</span> - at-end?:boolean<span class="Special"> <- </span>greater-or-equal render-from, max + render-from:num<span class="Special"> <- </span>get *env, <span class="Constant">render-from:offset</span> + number-of-sandboxes:num<span class="Special"> <- </span>get *env, <span class="Constant">number-of-sandboxes:offset</span> + max:num<span class="Special"> <- </span>subtract number-of-sandboxes, <span class="Constant">1</span> + at-end?:bool<span class="Special"> <- </span>greater-or-equal render-from, max <span class="muControl">jump-if</span> at-end?, <span class="Constant">+finish-event:label</span> <span class="Comment"># render nothing</span> render-from<span class="Special"> <- </span>add render-from, <span class="Constant">1</span> *env<span class="Special"> <- </span>put *env, <span class="Constant">render-from:offset</span>, render-from @@ -916,10 +916,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><update-cursor-special-cases></span> [ <span class="Delimiter">{</span> <span class="muControl">break-unless</span> sandbox-in-focus? - render-from:number<span class="Special"> <- </span>get *env, <span class="Constant">render-from:offset</span> - scrolling?:boolean<span class="Special"> <- </span>greater-or-equal render-from, <span class="Constant">0</span> + render-from:num<span class="Special"> <- </span>get *env, <span class="Constant">render-from:offset</span> + scrolling?:bool<span class="Special"> <- </span>greater-or-equal render-from, <span class="Constant">0</span> <span class="muControl">break-unless</span> scrolling? - cursor-column:number<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> + cursor-column:num<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> screen<span class="Special"> <- </span>move-cursor screen, <span class="Constant">2/row</span>, cursor-column <span class="Comment"># highlighted sandbox will always start at row 2</span> <span class="muControl">return</span> <span class="Delimiter">}</span> @@ -929,10 +929,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-keypress></span> [ <span class="Delimiter">{</span> <span class="muControl">break-unless</span> sandbox-in-focus? - page-up?:boolean<span class="Special"> <- </span>equal k, <span class="Constant">65519/page-up</span> + page-up?:bool<span class="Special"> <- </span>equal k, <span class="Constant">65519/page-up</span> <span class="muControl">break-unless</span> page-up? - render-from:number<span class="Special"> <- </span>get *env, <span class="Constant">render-from:offset</span> - at-beginning?:boolean<span class="Special"> <- </span>equal render-from, <span class="Constant">-1</span> + render-from:num<span class="Special"> <- </span>get *env, <span class="Constant">render-from:offset</span> + at-beginning?:bool<span class="Special"> <- </span>equal render-from, <span class="Constant">-1</span> <span class="muControl">break-if</span> at-beginning? render-from<span class="Special"> <- </span>subtract render-from, <span class="Constant">1</span> *env<span class="Special"> <- </span>put *env, <span class="Constant">render-from:offset</span>, render-from @@ -945,15 +945,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># sandbox belonging to 'env' whose next-sandbox is 'in'</span> <span class="Comment"># return 0 if there's no such sandbox, either because 'in' doesn't exist in 'env', or because it's the first sandbox</span> -<span class="muRecipe">def</span> previous-sandbox env:address:programming-environment-data, in:address:sandbox-data<span class="muRecipe"> -> </span>out:address:sandbox-data [ +<span class="muRecipe">def</span> previous-sandbox env:&:programming-environment-data, in:&:sandbox-data<span class="muRecipe"> -> </span>out:&:sandbox-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - curr:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + curr:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> <span class="muControl">return-unless</span> curr, <span class="Constant">0/nil</span> - next:address:sandbox-data<span class="Special"> <- </span>get *curr, <span class="Constant">next-sandbox:offset</span> + next:&:sandbox-data<span class="Special"> <- </span>get *curr, <span class="Constant">next-sandbox:offset</span> <span class="Delimiter">{</span> <span class="muControl">return-unless</span> next, <span class="Constant">0/nil</span> - found?:boolean<span class="Special"> <- </span>equal next, in + found?:bool<span class="Special"> <- </span>equal next, in <span class="muControl">break-if</span> found? curr<span class="Special"> <- </span>copy next next<span class="Special"> <- </span>get *curr, <span class="Constant">next-sandbox:offset</span> @@ -970,20 +970,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">]</span> <span class="Comment"># create a sandbox</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[add 2, 2]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render assume-console [ press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data <span class="Comment"># hit 'down' in recipe editor</span> assume-console [ press page-down ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor ] <span class="Comment"># cursor moves down on recipe side</span> screen-should-contain [ @@ -1001,8 +1001,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize environment</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render <span class="Comment"># create 2 sandboxes</span> assume-console [ press ctrl-n @@ -1011,9 +1011,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[add 1, 1]</span> press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊␣ .</span> @@ -1031,9 +1031,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-down ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor ] <span class="Comment"># sandbox editor hidden; first sandbox displayed</span> <span class="Comment"># cursor moves to first sandbox</span> @@ -1053,7 +1053,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-down ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># just second sandbox displayed</span> screen-should-contain [ @@ -1070,7 +1070,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-down ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># no change</span> screen-should-contain [ @@ -1087,7 +1087,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-up ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># back to displaying both sandboxes without editor</span> screen-should-contain [ @@ -1106,9 +1106,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-up ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor ] <span class="Comment"># back to displaying both sandboxes as well as editor</span> screen-should-contain [ @@ -1128,9 +1128,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-up ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor ] <span class="Comment"># no change</span> screen-should-contain [ @@ -1153,15 +1153,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize environment</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render <span class="Comment"># create a sandbox</span> assume-console [ press ctrl-n type <span class="Constant">[add 1, 1]</span> press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -1177,7 +1177,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-down ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># sandbox editor hidden; first sandbox displayed</span> <span class="Comment"># cursor moves to first sandbox</span> @@ -1195,7 +1195,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-up ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># back to displaying both sandboxes as well as editor</span> screen-should-contain [ @@ -1213,7 +1213,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-down ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># sandbox editor hidden; first sandbox displayed</span> <span class="Comment"># cursor moves to first sandbox</span> diff --git a/html/edit/006-sandbox-copy.mu.html b/html/edit/006-sandbox-copy.mu.html index fe86e811..987f38f9 100644 --- a/html/edit/006-sandbox-copy.mu.html +++ b/html/edit/006-sandbox-copy.mu.html @@ -48,8 +48,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-console [ press F4 ] - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -65,7 +65,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">3</span>, <span class="Constant">69</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># it copies into editor</span> screen-should-contain [ @@ -83,7 +83,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[0]</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -110,8 +110,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-console [ press F4 ] - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -127,7 +127,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">3</span>, <span class="Constant">84</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># it copies into editor</span> screen-should-contain [ @@ -145,7 +145,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[0]</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -162,7 +162,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-touch></span> [ <span class="Comment"># support 'copy' button</span> <span class="Delimiter">{</span> - copy?:boolean<span class="Special"> <- </span>should-attempt-copy? click-row, click-column, env + copy?:bool<span class="Special"> <- </span>should-attempt-copy? click-row, click-column, env <span class="muControl">break-unless</span> copy? copy?, env<span class="Special"> <- </span>try-copy-sandbox click-row, env <span class="muControl">break-unless</span> copy? @@ -175,34 +175,34 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># some preconditions for attempting to copy a sandbox</span> -<span class="muRecipe">def</span> should-attempt-copy? click-row:number, click-column:number, env:address:programming-environment-data<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> should-attempt-copy? click-row:num, click-column:num, env:&:programming-environment-data<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># are we below the sandbox editor?</span> - click-sandbox-area?:boolean<span class="Special"> <- </span>click-on-sandbox-area? click-row, click-column, env + click-sandbox-area?:bool<span class="Special"> <- </span>click-on-sandbox-area? click-row, click-column, env <span class="muControl">reply-unless</span> click-sandbox-area?, <span class="Constant">0/false</span> <span class="Comment"># narrower, is the click in the columns spanning the 'copy' button?</span> - first-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + first-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> assert first-sandbox, <span class="Constant">[!!]</span> - sandbox-left-margin:number<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">left:offset</span> - sandbox-right-margin:number<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">right:offset</span> - _, _, copy-button-left:number, copy-button-right:number, _<span class="Special"> <- </span>sandbox-menu-columns sandbox-left-margin, sandbox-right-margin - copy-button-vertical-area?:boolean<span class="Special"> <- </span>within-range? click-column, copy-button-left, copy-button-right + sandbox-left-margin:num<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">left:offset</span> + sandbox-right-margin:num<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">right:offset</span> + _, _, copy-button-left:num, copy-button-right:num, _<span class="Special"> <- </span>sandbox-menu-columns sandbox-left-margin, sandbox-right-margin + copy-button-vertical-area?:bool<span class="Special"> <- </span>within-range? click-column, copy-button-left, copy-button-right <span class="muControl">reply-unless</span> copy-button-vertical-area?, <span class="Constant">0/false</span> <span class="Comment"># finally, is sandbox editor empty?</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> result<span class="Special"> <- </span>empty-editor? current-sandbox ] -<span class="muRecipe">def</span> try-copy-sandbox click-row:number, env:address:programming-environment-data<span class="muRecipe"> -> </span>clicked-on-copy-button?:boolean, env:address:programming-environment-data [ +<span class="muRecipe">def</span> try-copy-sandbox click-row:num, env:&:programming-environment-data<span class="muRecipe"> -> </span>clicked-on-copy-button?:bool, env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># identify the sandbox to copy, if the click was actually on the 'copy' button</span> - sandbox:address:sandbox-data<span class="Special"> <- </span>find-sandbox env, click-row + sandbox:&:sandbox-data<span class="Special"> <- </span>find-sandbox env, click-row <span class="muControl">return-unless</span> sandbox, <span class="Constant">0/false</span> clicked-on-copy-button?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> text:text<span class="Special"> <- </span>get *sandbox, <span class="Constant">data:offset</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> current-sandbox<span class="Special"> <- </span>insert-text current-sandbox, text <span class="Comment"># reset scroll</span> *env<span class="Special"> <- </span>put *env, <span class="Constant">render-from:offset</span>, <span class="Constant">-1</span> @@ -210,14 +210,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *env<span class="Special"> <- </span>put *env, <span class="Constant">sandbox-in-focus?:offset</span>, <span class="Constant">1/true</span> ] -<span class="muRecipe">def</span> find-sandbox env:address:programming-environment-data, click-row:number<span class="muRecipe"> -> </span>result:address:sandbox-data [ +<span class="muRecipe">def</span> find-sandbox env:&:programming-environment-data, click-row:num<span class="muRecipe"> -> </span>result:&:sandbox-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - curr-sandbox:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + curr-sandbox:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> curr-sandbox - start:number<span class="Special"> <- </span>get *curr-sandbox, <span class="Constant">starting-row-on-screen:offset</span> - found?:boolean<span class="Special"> <- </span>equal click-row, start + start:num<span class="Special"> <- </span>get *curr-sandbox, <span class="Constant">starting-row-on-screen:offset</span> + found?:bool<span class="Special"> <- </span>equal click-row, start <span class="muControl">return-if</span> found?, curr-sandbox curr-sandbox<span class="Special"> <- </span>get *curr-sandbox, <span class="Constant">next-sandbox:offset</span> <span class="muControl">loop</span> @@ -225,32 +225,32 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> <span class="Constant">0/not-found</span> ] -<span class="muRecipe">def</span> click-on-sandbox-area? click-row:number, click-column:number, env:address:programming-environment-data<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> click-on-sandbox-area? click-row:num, click-column:num, env:&:programming-environment-data<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> - sandbox-left-margin:number<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> - on-sandbox-side?:boolean<span class="Special"> <- </span>greater-or-equal click-column, sandbox-left-margin + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + sandbox-left-margin:num<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> + on-sandbox-side?:bool<span class="Special"> <- </span>greater-or-equal click-column, sandbox-left-margin <span class="muControl">return-unless</span> on-sandbox-side?, <span class="Constant">0/false</span> - first-sandbox:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + first-sandbox:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> <span class="muControl">return-unless</span> first-sandbox, <span class="Constant">0/false</span> - first-sandbox-begins:number<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">starting-row-on-screen:offset</span> + first-sandbox-begins:num<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">starting-row-on-screen:offset</span> result<span class="Special"> <- </span>greater-or-equal click-row, first-sandbox-begins ] -<span class="muRecipe">def</span> empty-editor? editor:address:editor-data<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> empty-editor? editor:&:editor-data<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - head:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> - first:address:duplex-list:character<span class="Special"> <- </span>next head + head:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> + first:&:duplex-list:char<span class="Special"> <- </span>next head result<span class="Special"> <- </span>not first ] -<span class="muRecipe">def</span> within-range? x:number, low:number, high:number<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> within-range? x:num, low:num, high:num<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - not-too-far-left?:boolean<span class="Special"> <- </span>greater-or-equal x, low - not-too-far-right?:boolean<span class="Special"> <- </span>lesser-or-equal x, high + not-too-far-left?:bool<span class="Special"> <- </span>greater-or-equal x, low + not-too-far-right?:bool<span class="Special"> <- </span>lesser-or-equal x, high result<span class="Special"> <- </span>and not-too-far-left? not-too-far-right? ] @@ -267,8 +267,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-console [ press F4 ] - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -286,7 +286,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">3</span>, <span class="Constant">70</span> <span class="Comment"># click 'copy' button</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># copy doesn't happen</span> screen-should-contain [ @@ -304,7 +304,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . run (F4) .</span> diff --git a/html/edit/007-sandbox-delete.mu.html b/html/edit/007-sandbox-delete.mu.html index 94ca6a6c..668faca9 100644 --- a/html/edit/007-sandbox-delete.mu.html +++ b/html/edit/007-sandbox-delete.mu.html @@ -39,7 +39,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">100/width</span>, <span class="Constant">15/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text <span class="Comment"># run a few commands</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">80</span> @@ -48,7 +48,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[add 2, 2]</span> press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -69,7 +69,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">7</span>, <span class="Constant">85</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -87,7 +87,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">3</span>, <span class="Constant">99</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -101,7 +101,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-touch></span> [ <span class="Comment"># support 'delete' button</span> <span class="Delimiter">{</span> - delete?:boolean<span class="Special"> <- </span>should-attempt-delete? click-row, click-column, env + delete?:bool<span class="Special"> <- </span>should-attempt-delete? click-row, click-column, env <span class="muControl">break-unless</span> delete? delete?, env<span class="Special"> <- </span>try-delete-sandbox click-row, env <span class="muControl">break-unless</span> delete? @@ -114,68 +114,68 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># some preconditions for attempting to delete a sandbox</span> -<span class="muRecipe">def</span> should-attempt-delete? click-row:number, click-column:number, env:address:programming-environment-data<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> should-attempt-delete? click-row:num, click-column:num, env:&:programming-environment-data<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># are we below the sandbox editor?</span> - click-sandbox-area?:boolean<span class="Special"> <- </span>click-on-sandbox-area? click-row, click-column, env + click-sandbox-area?:bool<span class="Special"> <- </span>click-on-sandbox-area? click-row, click-column, env <span class="muControl">reply-unless</span> click-sandbox-area?, <span class="Constant">0/false</span> <span class="Comment"># narrower, is the click in the columns spanning the 'copy' button?</span> - first-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + first-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> assert first-sandbox, <span class="Constant">[!!]</span> - sandbox-left-margin:number<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">left:offset</span> - sandbox-right-margin:number<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">right:offset</span> - _, _, _, _, delete-button-left:number<span class="Special"> <- </span>sandbox-menu-columns sandbox-left-margin, sandbox-right-margin + sandbox-left-margin:num<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">left:offset</span> + sandbox-right-margin:num<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">right:offset</span> + _, _, _, _, delete-button-left:num<span class="Special"> <- </span>sandbox-menu-columns sandbox-left-margin, sandbox-right-margin result<span class="Special"> <- </span>within-range? click-column, delete-button-left, sandbox-right-margin ] -<span class="muRecipe">def</span> try-delete-sandbox click-row:number, env:address:programming-environment-data<span class="muRecipe"> -> </span>clicked-on-delete-button?:boolean, env:address:programming-environment-data [ +<span class="muRecipe">def</span> try-delete-sandbox click-row:num, env:&:programming-environment-data<span class="muRecipe"> -> </span>clicked-on-delete-button?:bool, env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># identify the sandbox to delete, if the click was actually on the 'delete' button</span> - sandbox:address:sandbox-data<span class="Special"> <- </span>find-sandbox env, click-row + sandbox:&:sandbox-data<span class="Special"> <- </span>find-sandbox env, click-row <span class="muControl">return-unless</span> sandbox, <span class="Constant">0/false</span> clicked-on-delete-button?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> env<span class="Special"> <- </span>delete-sandbox env, sandbox ] -<span class="muRecipe">def</span> delete-sandbox env:address:programming-environment-data, sandbox:address:sandbox-data<span class="muRecipe"> -> </span>env:address:programming-environment-data [ +<span class="muRecipe">def</span> delete-sandbox env:&:programming-environment-data, sandbox:&:sandbox-data<span class="muRecipe"> -> </span>env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - curr-sandbox:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> - first-sandbox?:boolean<span class="Special"> <- </span>equal curr-sandbox, sandbox + curr-sandbox:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + first-sandbox?:bool<span class="Special"> <- </span>equal curr-sandbox, sandbox <span class="Delimiter">{</span> <span class="Comment"># first sandbox? pop</span> <span class="muControl">break-unless</span> first-sandbox? - next-sandbox:address:sandbox-data<span class="Special"> <- </span>get *curr-sandbox, <span class="Constant">next-sandbox:offset</span> + next-sandbox:&:sandbox-data<span class="Special"> <- </span>get *curr-sandbox, <span class="Constant">next-sandbox:offset</span> *env<span class="Special"> <- </span>put *env, <span class="Constant">sandbox:offset</span>, next-sandbox <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="Comment"># not first sandbox?</span> <span class="muControl">break-if</span> first-sandbox? - prev-sandbox:address:sandbox-data<span class="Special"> <- </span>copy curr-sandbox + prev-sandbox:&:sandbox-data<span class="Special"> <- </span>copy curr-sandbox curr-sandbox<span class="Special"> <- </span>get *curr-sandbox, <span class="Constant">next-sandbox:offset</span> <span class="Delimiter">{</span> assert curr-sandbox, <span class="Constant">[sandbox not found! something is wrong.]</span> - found?:boolean<span class="Special"> <- </span>equal curr-sandbox, sandbox + found?:bool<span class="Special"> <- </span>equal curr-sandbox, sandbox <span class="muControl">break-if</span> found? prev-sandbox<span class="Special"> <- </span>copy curr-sandbox curr-sandbox<span class="Special"> <- </span>get *curr-sandbox, <span class="Constant">next-sandbox:offset</span> <span class="muControl">loop</span> <span class="Delimiter">}</span> <span class="Comment"># snip sandbox out of its list</span> - next-sandbox:address:sandbox-data<span class="Special"> <- </span>get *curr-sandbox, <span class="Constant">next-sandbox:offset</span> + next-sandbox:&:sandbox-data<span class="Special"> <- </span>get *curr-sandbox, <span class="Constant">next-sandbox:offset</span> *prev-sandbox<span class="Special"> <- </span>put *prev-sandbox, <span class="Constant">next-sandbox:offset</span>, next-sandbox <span class="Delimiter">}</span> <span class="Comment"># update sandbox count</span> - sandbox-count:number<span class="Special"> <- </span>get *env, <span class="Constant">number-of-sandboxes:offset</span> + sandbox-count:num<span class="Special"> <- </span>get *env, <span class="Constant">number-of-sandboxes:offset</span> sandbox-count<span class="Special"> <- </span>subtract sandbox-count, <span class="Constant">1</span> *env<span class="Special"> <- </span>put *env, <span class="Constant">number-of-sandboxes:offset</span>, sandbox-count <span class="Comment"># reset scroll if deleted sandbox was last</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> next-sandbox - render-from:number<span class="Special"> <- </span>get *env, <span class="Constant">render-from:offset</span> - reset-scroll?:boolean<span class="Special"> <- </span>equal render-from, sandbox-count + render-from:num<span class="Special"> <- </span>get *env, <span class="Constant">render-from:offset</span> + reset-scroll?:bool<span class="Special"> <- </span>equal render-from, sandbox-count <span class="muControl">break-unless</span> reset-scroll? *env<span class="Special"> <- </span>put *env, <span class="Constant">render-from:offset</span>, <span class="Constant">-1</span> <span class="Delimiter">}</span> @@ -187,8 +187,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize environment</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render <span class="Comment"># create 2 sandboxes and scroll to second</span> assume-console [ press ctrl-n @@ -198,7 +198,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 press page-down ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> @@ -213,7 +213,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">6</span>, <span class="Constant">99</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># second sandbox shows in editor; scroll resets to display first sandbox</span> screen-should-contain [ @@ -233,8 +233,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize environment</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render <span class="Comment"># create 2 sandboxes and scroll to second</span> assume-console [ press ctrl-n @@ -244,7 +244,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 press page-down ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> @@ -259,7 +259,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">2</span>, <span class="Constant">99</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># second sandbox shows in editor; scroll resets to display first sandbox</span> screen-should-contain [ @@ -279,8 +279,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize environment</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render <span class="Comment"># create 2 sandboxes and scroll to second</span> assume-console [ press ctrl-n @@ -291,7 +291,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-down press page-down ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> @@ -306,7 +306,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">2</span>, <span class="Constant">99</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># implicitly scroll up to first sandbox</span> screen-should-contain [ @@ -327,8 +327,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize environment</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render <span class="Comment"># create 2 sandboxes</span> assume-console [ press ctrl-n @@ -337,7 +337,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[add 1, 1]</span> press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -357,7 +357,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-down ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># shouldn't go past last sandbox</span> screen-should-contain [ diff --git a/html/edit/008-sandbox-edit.mu.html b/html/edit/008-sandbox-edit.mu.html index 18926f44..1fcf071f 100644 --- a/html/edit/008-sandbox-edit.mu.html +++ b/html/edit/008-sandbox-edit.mu.html @@ -47,8 +47,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-console [ press F4 ] - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -64,7 +64,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">3</span>, <span class="Constant">55</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># it pops back into editor</span> screen-should-contain [ @@ -81,7 +81,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[0]</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -107,8 +107,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-console [ press F4 ] - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -124,7 +124,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">3</span>, <span class="Constant">68</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># it pops back into editor</span> screen-should-contain [ @@ -141,7 +141,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[0]</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -157,7 +157,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-touch></span> [ <span class="Comment"># support 'edit' button</span> <span class="Delimiter">{</span> - edit?:boolean<span class="Special"> <- </span>should-attempt-edit? click-row, click-column, env + edit?:bool<span class="Special"> <- </span>should-attempt-edit? click-row, click-column, env <span class="muControl">break-unless</span> edit? edit?, env<span class="Special"> <- </span>try-edit-sandbox click-row, env <span class="muControl">break-unless</span> edit? @@ -170,35 +170,35 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># some preconditions for attempting to edit a sandbox</span> -<span class="muRecipe">def</span> should-attempt-edit? click-row:number, click-column:number, env:address:programming-environment-data<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> should-attempt-edit? click-row:num, click-column:num, env:&:programming-environment-data<span class="muRecipe"> -> </span>result:bool [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># are we below the sandbox editor?</span> - click-sandbox-area?:boolean<span class="Special"> <- </span>click-on-sandbox-area? click-row, click-column, env + click-sandbox-area?:bool<span class="Special"> <- </span>click-on-sandbox-area? click-row, click-column, env <span class="muControl">reply-unless</span> click-sandbox-area?, <span class="Constant">0/false</span> <span class="Comment"># narrower, is the click in the columns spanning the 'edit' button?</span> - first-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + first-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> assert first-sandbox, <span class="Constant">[!!]</span> - sandbox-left-margin:number<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">left:offset</span> - sandbox-right-margin:number<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">right:offset</span> - edit-button-left:number, edit-button-right:number, _<span class="Special"> <- </span>sandbox-menu-columns sandbox-left-margin, sandbox-right-margin - edit-button-vertical-area?:boolean<span class="Special"> <- </span>within-range? click-column, edit-button-left, edit-button-right + sandbox-left-margin:num<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">left:offset</span> + sandbox-right-margin:num<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">right:offset</span> + edit-button-left:num, edit-button-right:num, _<span class="Special"> <- </span>sandbox-menu-columns sandbox-left-margin, sandbox-right-margin + edit-button-vertical-area?:bool<span class="Special"> <- </span>within-range? click-column, edit-button-left, edit-button-right <span class="muControl">reply-unless</span> edit-button-vertical-area?, <span class="Constant">0/false</span> <span class="Comment"># finally, is sandbox editor empty?</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> result<span class="Special"> <- </span>empty-editor? current-sandbox ] -<span class="muRecipe">def</span> try-edit-sandbox click-row:number, env:address:programming-environment-data<span class="muRecipe"> -> </span>clicked-on-edit-button?:boolean, env:address:programming-environment-data [ +<span class="muRecipe">def</span> try-edit-sandbox click-row:num, env:&:programming-environment-data<span class="muRecipe"> -> </span>clicked-on-edit-button?:bool, env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># identify the sandbox to edit, if the click was actually on the 'edit' button</span> - sandbox:address:sandbox-data<span class="Special"> <- </span>find-sandbox env, click-row + sandbox:&:sandbox-data<span class="Special"> <- </span>find-sandbox env, click-row <span class="muControl">return-unless</span> sandbox, <span class="Constant">0/false</span> clicked-on-edit-button?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="Comment"># 'edit' button = 'copy' button + 'delete' button</span> text:text<span class="Special"> <- </span>get *sandbox, <span class="Constant">data:offset</span> - current-sandbox:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> + current-sandbox:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">current-sandbox:offset</span> current-sandbox<span class="Special"> <- </span>insert-text current-sandbox, text env<span class="Special"> <- </span>delete-sandbox env, sandbox <span class="Comment"># reset scroll</span> @@ -214,12 +214,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Comment"># right editor contains an instruction</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[print-integer screen, 4]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text <span class="Comment"># run the sandbox</span> assume-console [ press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -240,7 +240,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">3</span>, <span class="Constant">65</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -257,8 +257,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize environment</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render <span class="Comment"># create 2 sandboxes and scroll to second</span> assume-console [ press ctrl-n @@ -269,7 +269,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-down press page-down ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> @@ -284,7 +284,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">2</span>, <span class="Constant">55</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># second sandbox shows in editor; scroll resets to display first sandbox</span> screen-should-contain [ @@ -305,8 +305,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># initialize environment</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - render-all screen, <span class="Constant">3</span>:address:programming-environment-data, render + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + render-all screen, <span class="Constant">3</span>:&:programming-environment-data, render <span class="Comment"># create 2 sandboxes</span> assume-console [ press ctrl-n @@ -315,7 +315,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[add 1, 1]</span> press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -334,7 +334,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># no change in contents</span> screen-should-contain [ @@ -356,7 +356,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press page-down ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># screen should show just final sandbox with the right index (1)</span> screen-should-contain [ diff --git a/html/edit/009-sandbox-test.mu.html b/html/edit/009-sandbox-test.mu.html index 1772865b..1967fa7d 100644 --- a/html/edit/009-sandbox-test.mu.html +++ b/html/edit/009-sandbox-test.mu.html @@ -48,8 +48,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-console [ press F4 ] - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -65,7 +65,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">5</span>, <span class="Constant">51</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># color toggles to green</span> screen-should-contain-in-color <span class="Constant">2/green</span>, [ @@ -80,8 +80,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># cursor should remain unmoved</span> run [ - <span class="Constant">4</span>:character/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor + <span class="Constant">4</span>:char/cursor<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor ] screen-should-contain [ <span class="Constant"> . run (F4) .</span> @@ -104,7 +104,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># result turns red</span> screen-should-contain-in-color <span class="Constant">1/red</span>, [ @@ -121,7 +121,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># this requires tracking a couple more things</span> <span class="muData">container</span> sandbox-data [ - response-starting-row-on-screen:number + response-starting-row-on-screen:num expected-response:text ] @@ -148,18 +148,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-touch></span> [ <span class="Comment"># check if it's inside the output of any sandbox</span> <span class="Delimiter">{</span> - sandbox-left-margin:number<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> - click-column:number<span class="Special"> <- </span>get t, <span class="Constant">column:offset</span> - on-sandbox-side?:boolean<span class="Special"> <- </span>greater-or-equal click-column, sandbox-left-margin + sandbox-left-margin:num<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> + click-column:num<span class="Special"> <- </span>get t, <span class="Constant">column:offset</span> + on-sandbox-side?:bool<span class="Special"> <- </span>greater-or-equal click-column, sandbox-left-margin <span class="muControl">break-unless</span> on-sandbox-side? - first-sandbox:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + first-sandbox:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> <span class="muControl">break-unless</span> first-sandbox - first-sandbox-begins:number<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">starting-row-on-screen:offset</span> - click-row:number<span class="Special"> <- </span>get t, <span class="Constant">row:offset</span> - below-sandbox-editor?:boolean<span class="Special"> <- </span>greater-or-equal click-row, first-sandbox-begins + first-sandbox-begins:num<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">starting-row-on-screen:offset</span> + click-row:num<span class="Special"> <- </span>get t, <span class="Constant">row:offset</span> + below-sandbox-editor?:bool<span class="Special"> <- </span>greater-or-equal click-row, first-sandbox-begins <span class="muControl">break-unless</span> below-sandbox-editor? <span class="Comment"># identify the sandbox whose output is being clicked on</span> - sandbox:address:sandbox-data<span class="Special"> <- </span>find-click-in-sandbox-output env, click-row + sandbox:&:sandbox-data<span class="Special"> <- </span>find-click-in-sandbox-output env, click-row <span class="muControl">break-unless</span> sandbox <span class="Comment"># toggle its expected-response, and save session</span> sandbox<span class="Special"> <- </span>toggle-expected-response sandbox @@ -173,33 +173,33 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> find-click-in-sandbox-output env:address:programming-environment-data, click-row:number<span class="muRecipe"> -> </span>sandbox:address:sandbox-data [ +<span class="muRecipe">def</span> find-click-in-sandbox-output env:&:programming-environment-data, click-row:num<span class="muRecipe"> -> </span>sandbox:&:sandbox-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># assert click-row >= sandbox.starting-row-on-screen</span> - sandbox:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> - start:number<span class="Special"> <- </span>get *sandbox, <span class="Constant">starting-row-on-screen:offset</span> - clicked-on-sandboxes?:boolean<span class="Special"> <- </span>greater-or-equal click-row, start + sandbox:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + start:num<span class="Special"> <- </span>get *sandbox, <span class="Constant">starting-row-on-screen:offset</span> + clicked-on-sandboxes?:bool<span class="Special"> <- </span>greater-or-equal click-row, start assert clicked-on-sandboxes?, <span class="Constant">[extract-sandbox called on click to sandbox editor]</span> <span class="Comment"># while click-row < sandbox.next-sandbox.starting-row-on-screen</span> <span class="Delimiter">{</span> - next-sandbox:address:sandbox-data<span class="Special"> <- </span>get *sandbox, <span class="Constant">next-sandbox:offset</span> + next-sandbox:&:sandbox-data<span class="Special"> <- </span>get *sandbox, <span class="Constant">next-sandbox:offset</span> <span class="muControl">break-unless</span> next-sandbox - next-start:number<span class="Special"> <- </span>get *next-sandbox, <span class="Constant">starting-row-on-screen:offset</span> - found?:boolean<span class="Special"> <- </span>lesser-than click-row, next-start + next-start:num<span class="Special"> <- </span>get *next-sandbox, <span class="Constant">starting-row-on-screen:offset</span> + found?:bool<span class="Special"> <- </span>lesser-than click-row, next-start <span class="muControl">break-if</span> found? sandbox<span class="Special"> <- </span>copy next-sandbox <span class="muControl">loop</span> <span class="Delimiter">}</span> <span class="Comment"># return sandbox if click is in its output region</span> - response-starting-row:number<span class="Special"> <- </span>get *sandbox, <span class="Constant">response-starting-row-on-screen:offset</span> + response-starting-row:num<span class="Special"> <- </span>get *sandbox, <span class="Constant">response-starting-row-on-screen:offset</span> <span class="muControl">return-unless</span> response-starting-row, <span class="Constant">0/no-click-in-sandbox-output</span> - click-in-response?:boolean<span class="Special"> <- </span>greater-or-equal click-row, response-starting-row + click-in-response?:bool<span class="Special"> <- </span>greater-or-equal click-row, response-starting-row <span class="muControl">return-unless</span> click-in-response?, <span class="Constant">0/no-click-in-sandbox-output</span> <span class="muControl">return</span> sandbox ] -<span class="muRecipe">def</span> toggle-expected-response sandbox:address:sandbox-data<span class="muRecipe"> -> </span>sandbox:address:sandbox-data [ +<span class="muRecipe">def</span> toggle-expected-response sandbox:&:sandbox-data<span class="muRecipe"> -> </span>sandbox:&:sandbox-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> expected-response:text<span class="Special"> <- </span>get *sandbox, <span class="Constant">expected-response:offset</span> @@ -223,13 +223,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">response-starting-row-on-screen:offset</span>, row expected-response:text<span class="Special"> <- </span>get *sandbox, <span class="Constant">expected-response:offset</span> <span class="muControl">break-unless</span> expected-response <span class="Comment"># fall-through to print in grey</span> - response-is-expected?:boolean<span class="Special"> <- </span>equal expected-response, sandbox-response + response-is-expected?:bool<span class="Special"> <- </span>equal expected-response, sandbox-response <span class="Delimiter">{</span> - <span class="muControl">break-if</span> response-is-expected?:boolean + <span class="muControl">break-if</span> response-is-expected?:bool row, screen<span class="Special"> <- </span>render-text screen, sandbox-response, left, right, <span class="Constant">1/red</span>, row <span class="Delimiter">}</span> <span class="Delimiter">{</span> - <span class="muControl">break-unless</span> response-is-expected?:boolean + <span class="muControl">break-unless</span> response-is-expected?:bool row, screen<span class="Special"> <- </span>render-text screen, sandbox-response, left, right, <span class="Constant">2/green</span>, row <span class="Delimiter">}</span> <span class="muControl">jump</span> <span class="Constant">+render-sandbox-end:label</span> diff --git a/html/edit/010-sandbox-trace.mu.html b/html/edit/010-sandbox-trace.mu.html index 177fdee1..25c8ff32 100644 --- a/html/edit/010-sandbox-trace.mu.html +++ b/html/edit/010-sandbox-trace.mu.html @@ -48,8 +48,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-console [ press F4 ] - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -64,9 +64,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">4</span>, <span class="Constant">51</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - <span class="Constant">4</span>:character/cursor-icon<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> - print screen:address:screen, <span class="Constant">4</span>:character/cursor-icon + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + <span class="Constant">4</span>:char/cursor-icon<span class="Special"> <- </span>copy <span class="Constant">9251/␣</span> + print screen:&:screen, <span class="Constant">4</span>:char/cursor-icon ] <span class="Comment"># trace now printed and cursor shouldn't have budged</span> screen-should-contain [ @@ -90,8 +90,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">4</span>, <span class="Constant">55</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data - print screen:address:screen, <span class="Constant">4</span>:character/cursor-icon + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data + print screen:&:screen, <span class="Constant">4</span>:char/cursor-icon ] <span class="Comment"># trace hidden again</span> screen-should-contain [ @@ -119,8 +119,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-console [ press F4 ] - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -136,7 +136,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">4</span>, <span class="Constant">51</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># trace now printed above result</span> screen-should-contain [ @@ -163,8 +163,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 left-click <span class="Constant">4</span>, <span class="Constant">51</span> ] - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . run (F4) .</span> <span class="Constant"> . ┊ .</span> @@ -178,7 +178,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color left-click <span class="Constant">5</span>, <span class="Constant">57</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># no change; doesn't die</span> screen-should-contain [ @@ -193,15 +193,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muData">container</span> sandbox-data [ trace:text - display-trace?:boolean + display-trace?:bool ] <span class="Comment"># replaced in a later layer</span> -<span class="muRecipe">def!</span> update-sandbox sandbox:address:sandbox-data, env:address:programming-environment-data, idx:number<span class="muRecipe"> -> </span>sandbox:address:sandbox-data, env:address:programming-environment-data [ +<span class="muRecipe">def!</span> update-sandbox sandbox:&:sandbox-data, env:&:programming-environment-data, idx:num<span class="muRecipe"> -> </span>sandbox:&:sandbox-data, env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> data:text<span class="Special"> <- </span>get *sandbox, <span class="Constant">data:offset</span> - response:text, _, fake-screen:address:screen, trace:text<span class="Special"> <- </span>run-sandboxed data + response:text, _, fake-screen:&:screen, trace:text<span class="Special"> <- </span>run-sandboxed data *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">response:offset</span>, response *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">screen:offset</span>, fake-screen *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">trace:offset</span>, trace @@ -211,21 +211,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><global-touch></span> [ <span class="Comment"># check if it's inside the code of any sandbox</span> <span class="Delimiter">{</span> - sandbox-left-margin:number<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> - click-column:number<span class="Special"> <- </span>get t, <span class="Constant">column:offset</span> - on-sandbox-side?:boolean<span class="Special"> <- </span>greater-or-equal click-column, sandbox-left-margin + sandbox-left-margin:num<span class="Special"> <- </span>get *current-sandbox, <span class="Constant">left:offset</span> + click-column:num<span class="Special"> <- </span>get t, <span class="Constant">column:offset</span> + on-sandbox-side?:bool<span class="Special"> <- </span>greater-or-equal click-column, sandbox-left-margin <span class="muControl">break-unless</span> on-sandbox-side? - first-sandbox:address:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> + first-sandbox:&:sandbox-data<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> <span class="muControl">break-unless</span> first-sandbox - first-sandbox-begins:number<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">starting-row-on-screen:offset</span> - click-row:number<span class="Special"> <- </span>get t, <span class="Constant">row:offset</span> - below-sandbox-editor?:boolean<span class="Special"> <- </span>greater-or-equal click-row, first-sandbox-begins + first-sandbox-begins:num<span class="Special"> <- </span>get *first-sandbox, <span class="Constant">starting-row-on-screen:offset</span> + click-row:num<span class="Special"> <- </span>get t, <span class="Constant">row:offset</span> + below-sandbox-editor?:bool<span class="Special"> <- </span>greater-or-equal click-row, first-sandbox-begins <span class="muControl">break-unless</span> below-sandbox-editor? <span class="Comment"># identify the sandbox whose code is being clicked on</span> - sandbox:address:sandbox-data<span class="Special"> <- </span>find-click-in-sandbox-code env, click-row + sandbox:&:sandbox-data<span class="Special"> <- </span>find-click-in-sandbox-code env, click-row <span class="muControl">break-unless</span> sandbox <span class="Comment"># toggle its display-trace? property</span> - x:boolean<span class="Special"> <- </span>get *sandbox, <span class="Constant">display-trace?:offset</span> + x:bool<span class="Special"> <- </span>get *sandbox, <span class="Constant">display-trace?:offset</span> x<span class="Special"> <- </span>not x *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">display-trace?:offset</span>, x hide-screen screen @@ -237,30 +237,30 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> find-click-in-sandbox-code env:address:programming-environment-data, click-row:number<span class="muRecipe"> -> </span>sandbox:address:sandbox-data [ +<span class="muRecipe">def</span> find-click-in-sandbox-code env:&:programming-environment-data, click-row:num<span class="muRecipe"> -> </span>sandbox:&:sandbox-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># assert click-row >= sandbox.starting-row-on-screen</span> sandbox<span class="Special"> <- </span>get *env, <span class="Constant">sandbox:offset</span> - start:number<span class="Special"> <- </span>get *sandbox, <span class="Constant">starting-row-on-screen:offset</span> - clicked-on-sandboxes?:boolean<span class="Special"> <- </span>greater-or-equal click-row, start + start:num<span class="Special"> <- </span>get *sandbox, <span class="Constant">starting-row-on-screen:offset</span> + clicked-on-sandboxes?:bool<span class="Special"> <- </span>greater-or-equal click-row, start assert clicked-on-sandboxes?, <span class="Constant">[extract-sandbox called on click to sandbox editor]</span> <span class="Comment"># while click-row < sandbox.next-sandbox.starting-row-on-screen</span> <span class="Delimiter">{</span> - next-sandbox:address:sandbox-data<span class="Special"> <- </span>get *sandbox, <span class="Constant">next-sandbox:offset</span> + next-sandbox:&:sandbox-data<span class="Special"> <- </span>get *sandbox, <span class="Constant">next-sandbox:offset</span> <span class="muControl">break-unless</span> next-sandbox - next-start:number<span class="Special"> <- </span>get *next-sandbox, <span class="Constant">starting-row-on-screen:offset</span> - found?:boolean<span class="Special"> <- </span>lesser-than click-row, next-start + next-start:num<span class="Special"> <- </span>get *next-sandbox, <span class="Constant">starting-row-on-screen:offset</span> + found?:bool<span class="Special"> <- </span>lesser-than click-row, next-start <span class="muControl">break-if</span> found? sandbox<span class="Special"> <- </span>copy next-sandbox <span class="muControl">loop</span> <span class="Delimiter">}</span> <span class="Comment"># return sandbox if click is in its code region</span> - code-ending-row:number<span class="Special"> <- </span>get *sandbox, <span class="Constant">code-ending-row-on-screen:offset</span> - click-above-response?:boolean<span class="Special"> <- </span>lesser-than click-row, code-ending-row - start:number<span class="Special"> <- </span>get *sandbox, <span class="Constant">starting-row-on-screen:offset</span> - click-below-menu?:boolean<span class="Special"> <- </span>greater-than click-row, start - click-on-sandbox-code?:boolean<span class="Special"> <- </span>and click-above-response?, click-below-menu? + code-ending-row:num<span class="Special"> <- </span>get *sandbox, <span class="Constant">code-ending-row-on-screen:offset</span> + click-above-response?:bool<span class="Special"> <- </span>lesser-than click-row, code-ending-row + start:num<span class="Special"> <- </span>get *sandbox, <span class="Constant">starting-row-on-screen:offset</span> + click-below-menu?:bool<span class="Special"> <- </span>greater-than click-row, start + click-on-sandbox-code?:bool<span class="Special"> <- </span>and click-above-response?, click-below-menu? <span class="Delimiter">{</span> <span class="muControl">break-if</span> click-on-sandbox-code? <span class="muControl">return</span> <span class="Constant">0/no-click-in-sandbox-output</span> @@ -271,7 +271,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># when rendering a sandbox, dump its trace before response/warning if display-trace? property is set</span> <span class="muRecipe">after</span> <span class="Constant"><render-sandbox-results></span> [ <span class="Delimiter">{</span> - display-trace?:boolean<span class="Special"> <- </span>get *sandbox, <span class="Constant">display-trace?:offset</span> + display-trace?:bool<span class="Special"> <- </span>get *sandbox, <span class="Constant">display-trace?:offset</span> <span class="muControl">break-unless</span> display-trace? sandbox-trace:text<span class="Special"> <- </span>get *sandbox, <span class="Constant">trace:offset</span> <span class="muControl">break-unless</span> sandbox-trace <span class="Comment"># nothing to print; move on</span> diff --git a/html/edit/011-errors.mu.html b/html/edit/011-errors.mu.html index 6d0117bb..771be1b6 100644 --- a/html/edit/011-errors.mu.html +++ b/html/edit/011-errors.mu.html @@ -40,10 +40,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="Comment"># copy code from recipe editor, persist, load into mu, save any errors</span> -<span class="muRecipe">def!</span> update-recipes env:address:programming-environment-data, screen:address:screen<span class="muRecipe"> -> </span>errors-found?:boolean, env:address:programming-environment-data, screen:address:screen [ +<span class="muRecipe">def!</span> update-recipes env:&:programming-environment-data, screen:&:screen<span class="muRecipe"> -> </span>errors-found?:bool, env:&:programming-environment-data, screen:&:screen [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - recipes:address:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> + recipes:&:editor-data<span class="Special"> <- </span>get *env, <span class="Constant">recipes:offset</span> in:text<span class="Special"> <- </span>editor-contents recipes save <span class="Constant">[recipes.mu]</span>, in recipe-errors:text<span class="Special"> <- </span>reload in @@ -76,7 +76,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muData">container</span> programming-environment-data [ - error-index:number <span class="Comment"># index of first sandbox with an error (or -1 if none)</span> + error-index:num <span class="Comment"># index of first sandbox with an error (or -1 if none)</span> ] <span class="muRecipe">after</span> <span class="Constant"><programming-environment-initialization></span> [ @@ -89,8 +89,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">before</span> <span class="Constant"><run-sandboxes-end></span> [ <span class="Delimiter">{</span> - error-index:number<span class="Special"> <- </span>get *env, <span class="Constant">error-index:offset</span> - sandboxes-completed-successfully?:boolean<span class="Special"> <- </span>equal error-index, <span class="Constant">-1</span> + error-index:num<span class="Special"> <- </span>get *env, <span class="Constant">error-index:offset</span> + sandboxes-completed-successfully?:bool<span class="Special"> <- </span>equal error-index, <span class="Constant">-1</span> <span class="muControl">break-if</span> sandboxes-completed-successfully? errors-found?<span class="Special"> <- </span>copy <span class="Constant">1/true</span> <span class="Delimiter">}</span> @@ -99,8 +99,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">before</span> <span class="Constant"><render-components-end></span> [ <span class="Delimiter">{</span> <span class="muControl">break-if</span> recipe-errors - error-index:number<span class="Special"> <- </span>get *env, <span class="Constant">error-index:offset</span> - sandboxes-completed-successfully?:boolean<span class="Special"> <- </span>equal error-index, <span class="Constant">-1</span> + error-index:num<span class="Special"> <- </span>get *env, <span class="Constant">error-index:offset</span> + sandboxes-completed-successfully?:bool<span class="Special"> <- </span>equal error-index, <span class="Constant">-1</span> <span class="muControl">break-if</span> sandboxes-completed-successfully? error-index-text:text<span class="Special"> <- </span>to-text error-index status:text<span class="Special"> <- </span>interpolate <span class="Constant">[errors found (_) ]</span>, error-index-text @@ -112,26 +112,26 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color errors:text ] -<span class="muRecipe">def!</span> update-sandbox sandbox:address:sandbox-data, env:address:programming-environment-data, idx:number<span class="muRecipe"> -> </span>sandbox:address:sandbox-data, env:address:programming-environment-data [ +<span class="muRecipe">def!</span> update-sandbox sandbox:&:sandbox-data, env:&:programming-environment-data, idx:num<span class="muRecipe"> -> </span>sandbox:&:sandbox-data, env:&:programming-environment-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> data:text<span class="Special"> <- </span>get *sandbox, <span class="Constant">data:offset</span> - response:text, errors:text, fake-screen:address:screen, trace:text, completed?:boolean<span class="Special"> <- </span>run-sandboxed data + response:text, errors:text, fake-screen:&:screen, trace:text, completed?:bool<span class="Special"> <- </span>run-sandboxed data *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">response:offset</span>, response *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">errors:offset</span>, errors *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">screen:offset</span>, fake-screen *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">trace:offset</span>, trace <span class="Delimiter">{</span> <span class="muControl">break-if</span> errors - <span class="muControl">break-if</span> completed?:boolean + <span class="muControl">break-if</span> completed?:bool errors<span class="Special"> <- </span>new <span class="Constant">[took too long!</span> <span class="Constant">]</span> *sandbox<span class="Special"> <- </span>put *sandbox, <span class="Constant">errors:offset</span>, errors <span class="Delimiter">}</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> errors - error-index:number<span class="Special"> <- </span>get *env, <span class="Constant">error-index:offset</span> - error-not-set?:boolean<span class="Special"> <- </span>equal error-index, <span class="Constant">-1</span> + error-index:num<span class="Special"> <- </span>get *env, <span class="Constant">error-index:offset</span> + error-not-set?:bool<span class="Special"> <- </span>equal error-index, <span class="Constant">-1</span> <span class="muControl">break-unless</span> error-not-set? *env<span class="Special"> <- </span>put *env, <span class="Constant">error-index:offset</span>, idx <span class="Delimiter">}</span> @@ -154,25 +154,25 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">100/width</span>, <span class="Constant">15/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ </span> <span class="Constant">recipe foo [</span> -<span class="Constant"> get 123:number, foo:offset</span> +<span class="Constant"> get 123:num, foo:offset</span> <span class="Constant">]</span>] <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[foo]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text assume-console [ press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . errors found run (F4) .</span> <span class="Constant"> . ┊foo .</span> <span class="Constant"> .recipe foo [ ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> - <span class="Constant"> . get 123:number, foo:offset ┊ .</span> + <span class="Constant"> . get 123:num, foo:offset ┊ .</span> <span class="Constant"> .] ┊ .</span> <span class="Constant"> .foo: unknown element 'foo' in container 'number' ┊ .</span> <span class="Constant"> .foo: first ingredient of 'get' should be a contai↩┊ .</span> - <span class="Constant"> .ner, but got '123:number' ┊ .</span> + <span class="Constant"> .ner, but got '123:num' ┊ .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ .</span> <span class="Constant"> . ┊ .</span> ] @@ -184,7 +184,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> . .</span> <span class="Constant"> .foo: unknown element 'foo' in container 'number' .</span> <span class="Constant"> .foo: first ingredient of 'get' should be a contai .</span> - <span class="Constant"> .ner, but got '123:number' .</span> + <span class="Constant"> .ner, but got '123:num' .</span> <span class="Constant"> . .</span> ] ] @@ -194,7 +194,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">100/width</span>, <span class="Constant">15/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">80</span> <span class="Comment"># create invalid sandbox 1</span> @@ -205,7 +205,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># status line shows that error is in first sandbox</span> screen-should-contain [ @@ -218,7 +218,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">100/width</span>, <span class="Constant">15/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">80</span> <span class="Comment"># create invalid sandbox 2</span> @@ -232,7 +232,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># status line shows that error is in second sandbox</span> screen-should-contain [ @@ -245,12 +245,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">100/width</span>, <span class="Constant">15/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[get foo, x:offset]</span> <span class="Comment"># invalid</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text assume-console [ press F4 <span class="Comment"># generate error</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">58</span> @@ -259,7 +259,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 <span class="Comment"># update sandbox</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># error should disappear</span> screen-should-contain [ @@ -281,21 +281,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[recipe foo x:_elem -> z:_elem [</span> <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> -<span class="Constant">y:address:number <- copy 0</span> +<span class="Constant">y:&:num <- copy 0</span> <span class="Constant">z <- add x, y</span> <span class="Constant">]</span>] <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[foo 2]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text assume-console [ press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . errors found (0) run (F4) .</span> <span class="Constant"> .recipe foo x:_elem -> z:_elem [ ┊ .</span> <span class="Constant"> .local-scope ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> .load-ingredients ┊0 edit copy delete .</span> - <span class="Constant"> .y:address:number <- copy 0 ┊foo 2 .</span> + <span class="Constant"> .y:&:num <- copy 0 ┊foo 2 .</span> <span class="Constant"> .z <- add x, y ┊foo_2: 'add' requires number ingredients, but go↩.</span> <span class="Constant"> .] ┊t 'y' .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> @@ -306,7 +306,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># error should remain unchanged</span> screen-should-contain [ @@ -314,7 +314,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> .recipe foo x:_elem -> z:_elem [ ┊ .</span> <span class="Constant"> .local-scope ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> .load-ingredients ┊0 edit copy delete .</span> - <span class="Constant"> .y:address:number <- copy 0 ┊foo 2 .</span> + <span class="Constant"> .y:&:num <- copy 0 ┊foo 2 .</span> <span class="Constant"> .z <- add x, y ┊foo_3: 'add' requires number ingredients, but go↩.</span> <span class="Constant"> .] ┊t 'y' .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> @@ -326,24 +326,24 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color trace-until <span class="Constant">100/app</span> <span class="Comment"># trace too long</span> assume-screen <span class="Constant">100/width</span>, <span class="Constant">15/height</span> <span class="Comment"># overload a well-known shape-shifting recipe</span> - <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[recipe length l:address:list:_elem -> n:number [</span> + <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[recipe length l:&:list:_elem -> n:num [</span> <span class="Constant">]</span>] <span class="Comment"># call code that uses other variants of it, but not it itself</span> - <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[x:address:list:number <- copy 0</span> + <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[x:&:list:num <- copy 0</span> <span class="Constant">to-text x]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text <span class="Comment"># run it once</span> assume-console [ press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data <span class="Comment"># no errors anywhere on screen (can't check anything else, since to-text will return an address)</span> screen-should-contain-in-color <span class="Constant">1/red</span>, [ <span class="Constant"> . .</span> <span class="Constant"> . .</span> <span class="Constant"> . .</span> <span class="Constant"> . .</span> - <span class="Constant"> . <- .</span> + <span class="Constant"> . <- .</span> <span class="Constant"> . .</span> <span class="Constant"> . .</span> <span class="Constant"> . .</span> @@ -360,7 +360,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># still no errors</span> screen-should-contain-in-color <span class="Constant">1/red</span>, [ @@ -368,7 +368,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> . .</span> <span class="Constant"> . .</span> <span class="Constant"> . .</span> - <span class="Constant"> . <- .</span> + <span class="Constant"> . <- .</span> <span class="Constant"> . .</span> <span class="Constant"> . .</span> <span class="Constant"> . .</span> @@ -390,12 +390,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> x <- copy 0</span> <span class="Constant">]</span>] <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[foo]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text assume-console [ press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . errors found run (F4) .</span> @@ -416,12 +416,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> x <- copy 0</span> <span class="Constant">]</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[foo]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text assume-console [ press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . errors found run (F4) .</span> @@ -441,27 +441,27 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ </span> <span class="Constant">recipe foo [</span> <span class="Constant"> local-scope</span> -<span class="Constant"> x:address:point <- new point:type</span> -<span class="Constant"> get x:address:point, 1:offset</span> +<span class="Constant"> x:&:point <- new point:type</span> +<span class="Constant"> get x:&:point, 1:offset</span> <span class="Constant">]</span>] <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[foo]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text assume-console [ press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . errors found run (F4) .</span> <span class="Constant"> . ┊foo .</span> <span class="Constant"> .recipe foo [ ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> . local-scope ┊ .</span> - <span class="Constant"> . x:address:point <- new point:type ┊ .</span> - <span class="Constant"> . get x:address:point, 1:offset ┊ .</span> + <span class="Constant"> . x:&:point <- new point:type ┊ .</span> + <span class="Constant"> . get x:&:point, 1:offset ┊ .</span> <span class="Constant"> .] ┊ .</span> <span class="Constant"> .foo: first ingredient of 'get' should be a contai↩┊ .</span> - <span class="Constant"> .ner, but got 'x:address:point' ┊ .</span> + <span class="Constant"> .ner, but got 'x:&:point' ┊ .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ .</span> <span class="Constant"> . ┊ .</span> ] @@ -473,29 +473,29 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ </span> <span class="Constant">recipe foo [</span> <span class="Constant"> local-scope</span> -<span class="Constant"> x:number <- copy 0</span> -<span class="Constant"> y:address:point <- new point:type</span> -<span class="Constant"> get *y:address:point, x:number</span> +<span class="Constant"> x:num <- copy 0</span> +<span class="Constant"> y:&:point <- new point:type</span> +<span class="Constant"> get *y:&:point, x:num</span> <span class="Constant">]</span>] <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[foo]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text assume-console [ press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . errors found run (F4) .</span> <span class="Constant"> . ┊foo .</span> <span class="Constant"> .recipe foo [ ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> . local-scope ┊ .</span> - <span class="Constant"> . x:number <- copy 0 ┊ .</span> - <span class="Constant"> . y:address:point <- new point:type ┊ .</span> - <span class="Constant"> . get *y:address:point, x:number ┊ .</span> + <span class="Constant"> . x:num <- copy 0 ┊ .</span> + <span class="Constant"> . y:&:point <- new point:type ┊ .</span> + <span class="Constant"> . get *y:&:point, x:num ┊ .</span> <span class="Constant"> .] ┊ .</span> <span class="Constant"> .foo: second ingredient of 'get' should have type ↩┊ .</span> - <span class="Constant"> .'offset', but got 'x:number' ┊ .</span> + <span class="Constant"> .'offset', but got 'x:num' ┊ .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ .</span> <span class="Constant"> . ┊ .</span> ] @@ -508,20 +508,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ </span> <span class="Constant">recipe foo [</span> <span class="Constant"> local-scope</span> -<span class="Constant"> x:number <- copy y:number</span> +<span class="Constant"> x:num <- copy y:num</span> <span class="Constant">]</span>] <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[foo]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text assume-console [ press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data screen-should-contain [ <span class="Constant"> . errors found run (F4) .</span> <span class="Constant"> . ┊foo .</span> <span class="Constant"> .recipe foo [ ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> . local-scope ┊ .</span> - <span class="Constant"> . x:number <- copy y:number ┊ .</span> + <span class="Constant"> . x:num <- copy y:num ┊ .</span> <span class="Constant"> .] ┊ .</span> <span class="Constant"> .foo: use before set: 'y' ┊ .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ .</span> @@ -532,14 +532,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . errors found run (F4) .</span> <span class="Constant"> . ┊foo .</span> <span class="Constant"> .recipe foo [ ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> . local-scope ┊ .</span> - <span class="Constant"> . x:number <- copy y:number ┊ .</span> + <span class="Constant"> . x:num <- copy y:num ┊ .</span> <span class="Constant"> .] ┊ .</span> <span class="Constant"> .foo: use before set: 'y' ┊ .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ .</span> @@ -553,14 +553,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># left editor is empty</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Comment"># right editor contains an illegal instruction</span> - <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[get 1234:number, foo:offset]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[get 1234:num, foo:offset]</span> + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text <span class="Comment"># run the code in the editors</span> assume-console [ press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># check that screen prints error message in red</span> screen-should-contain [ @@ -568,10 +568,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> . ┊ .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> . ┊0 edit copy delete .</span> - <span class="Constant"> . ┊get 1234:number, foo:offset .</span> + <span class="Constant"> . ┊get 1234:num, foo:offset .</span> <span class="Constant"> . ┊unknown element 'foo' in container 'number' .</span> <span class="Constant"> . ┊first ingredient of 'get' should be a container,↩.</span> - <span class="Constant"> . ┊ but got '1234:number' .</span> + <span class="Constant"> . ┊ but got '1234:num' .</span> <span class="Constant"> . ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> . ┊ .</span> ] @@ -580,7 +580,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> . .</span> <span class="Constant"> . .</span> <span class="Constant"> . .</span> - <span class="Constant"> . get 1234:number, foo:offset .</span> + <span class="Constant"> . get 1234:num, foo:offset .</span> <span class="Constant"> . .</span> <span class="Constant"> . .</span> <span class="Constant"> . .</span> @@ -593,7 +593,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> . .</span> <span class="Constant"> . unknown element 'foo' in container 'number' .</span> <span class="Constant"> . first ingredient of 'get' should be a container, .</span> - <span class="Constant"> . but got '1234:number' .</span> + <span class="Constant"> . but got '1234:num' .</span> <span class="Constant"> . .</span> ] screen-should-contain-in-color <span class="Constant">245/grey</span>, [ @@ -616,15 +616,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># left editor is empty</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> <span class="Comment"># right editor contains an illegal instruction</span> - <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[get 1234:number, foo:offset]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[get 1234:num, foo:offset]</span> + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text <span class="Comment"># run the code in the editors multiple times</span> assume-console [ press F4 press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># check that screen prints error message just once</span> screen-should-contain [ @@ -632,10 +632,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> . ┊ .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> . ┊0 edit copy delete .</span> - <span class="Constant"> . ┊get 1234:number, foo:offset .</span> + <span class="Constant"> . ┊get 1234:num, foo:offset .</span> <span class="Constant"> . ┊unknown element 'foo' in container 'number' .</span> <span class="Constant"> . ┊first ingredient of 'get' should be a container,↩.</span> - <span class="Constant"> . ┊ but got '1234:number' .</span> + <span class="Constant"> . ┊ but got '1234:num' .</span> <span class="Constant"> . ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> . ┊ .</span> ] @@ -652,13 +652,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">]</span>] <span class="Comment"># right editor contains an instruction</span> <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[foo]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text <span class="Comment"># run the sandbox</span> assume-console [ press F4 ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] screen-should-contain [ <span class="Constant"> . errors found (0) run (F4) .</span> @@ -678,28 +678,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># generate a stash and a error</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[recipe foo [</span> <span class="Constant">local-scope</span> -<span class="Constant">a:number <- next-ingredient</span> -<span class="Constant">b:number <- next-ingredient</span> +<span class="Constant">a:num <- next-ingredient</span> +<span class="Constant">b:num <- next-ingredient</span> <span class="Constant">stash [dividing by]</span>, b -_, c:number<span class="Special"> <- </span>divide-with-remainder a, b +_, c:num<span class="Special"> <- </span>divide-with-remainder a, b <span class="muControl">reply</span> b ]] <span class="Constant">2</span>:text<span class="Special"> <- </span>new <span class="Constant">[foo 4, 0]</span> - <span class="Constant">3</span>:address:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:address:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text + <span class="Constant">3</span>:&:programming-environment-data<span class="Special"> <- </span>new-programming-environment screen:&:screen, <span class="Constant">1</span>:text, <span class="Constant">2</span>:text <span class="Comment"># run</span> assume-console [ press F4 ] - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data <span class="Comment"># screen prints error message</span> screen-should-contain [ <span class="Constant"> . errors found (0) run (F4) .</span> <span class="Constant"> .recipe foo [ ┊ .</span> <span class="Constant"> .local-scope ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> - <span class="Constant"> .a:number <- next-ingredient ┊0 edit copy delete .</span> - <span class="Constant"> .b:number <- next-ingredient ┊foo 4, 0 .</span> - <span class="Constant"> .stash [dividing by], b ┊foo: divide by zero in '_, c:number <- divide-wi↩.</span> - <span class="Constant"> ._, c:number <- divide-with-remainder a, b ┊th-remainder a, b' .</span> + <span class="Constant"> .a:num <- next-ingredient ┊0 edit copy delete .</span> + <span class="Constant"> .b:num <- next-ingredient ┊foo 4, 0 .</span> + <span class="Constant"> .stash [dividing by], b ┊foo: divide by zero in '_, c:num <- divide-with-↩.</span> + <span class="Constant"> ._, c:num <- divide-with-remainder a, b ┊remainder a, b' .</span> <span class="Constant"> .reply b ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> <span class="Constant"> .] ┊ .</span> ] @@ -708,19 +708,19 @@ _, c:number<span class="Special"> <- </span>divide-with-remainder a, b left-click <span class="Constant">4</span>, <span class="Constant">55</span> ] run [ - event-loop screen:address:screen, console:address:console, <span class="Constant">3</span>:address:programming-environment-data + event-loop screen:&:screen, console:&:console, <span class="Constant">3</span>:&:programming-environment-data ] <span class="Comment"># screen should expand trace</span> screen-should-contain [ <span class="Constant"> . errors found (0) run (F4) .</span> <span class="Constant"> .recipe foo [ ┊ .</span> <span class="Constant"> .local-scope ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> - <span class="Constant"> .a:number <- next-ingredient ┊0 edit copy delete .</span> - <span class="Constant"> .b:number <- next-ingredient ┊foo 4, 0 .</span> + <span class="Constant"> .a:num <- next-ingredient ┊0 edit copy delete .</span> + <span class="Constant"> .b:num <- next-ingredient ┊foo 4, 0 .</span> <span class="Constant"> .stash [dividing by], b ┊dividing by 0 .</span> - <span class="Constant"> ._, c:number <- divide-with-remainder a, b ┊14 instructions run .</span> - <span class="Constant"> .reply b ┊foo: divide by zero in '_, c:number <- divide-wi↩.</span> - <span class="Constant"> .] ┊th-remainder a, b' .</span> + <span class="Constant"> ._, c:num <- divide-with-remainder a, b ┊14 instructions run .</span> + <span class="Constant"> .reply b ┊foo: divide by zero in '_, c:num <- divide-with-↩.</span> + <span class="Constant"> .] ┊remainder a, b' .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.</span> ] ] diff --git a/html/edit/012-editor-undo.mu.html b/html/edit/012-editor-undo.mu.html index ff375027..0233a08a 100644 --- a/html/edit/012-editor-undo.mu.html +++ b/html/edit/012-editor-undo.mu.html @@ -44,28 +44,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muData">container</span> insert-operation [ - before-row:number - before-column:number - before-top-of-screen:address:duplex-list:character - after-row:number - after-column:number - after-top-of-screen:address:duplex-list:character + before-row:num + before-column:num + before-top-of-screen:&:duplex-list:char + after-row:num + after-column:num + after-top-of-screen:&:duplex-list:char <span class="Comment"># inserted text is from 'insert-from' until 'insert-until'; list doesn't have to terminate</span> - insert-from:address:duplex-list:character - insert-until:address:duplex-list:character - tag:number <span class="Comment"># event causing this operation; might be used to coalesce runs of similar events</span> + insert-from:&:duplex-list:char + insert-until:&:duplex-list:char + tag:num <span class="Comment"># event causing this operation; might be used to coalesce runs of similar events</span> <span class="Comment"># 0: no coalesce (enter+indent)</span> <span class="Comment"># 1: regular alphanumeric characters</span> ] <span class="muData">container</span> move-operation [ - before-row:number - before-column:number - before-top-of-screen:address:duplex-list:character - after-row:number - after-column:number - after-top-of-screen:address:duplex-list:character - tag:number <span class="Comment"># event causing this operation; might be used to coalesce runs of similar events</span> + before-row:num + before-column:num + before-top-of-screen:&:duplex-list:char + after-row:num + after-column:num + after-top-of-screen:&:duplex-list:char + tag:num <span class="Comment"># event causing this operation; might be used to coalesce runs of similar events</span> <span class="Comment"># 0: no coalesce (touch events, etc)</span> <span class="Comment"># 1: left arrow</span> <span class="Comment"># 2: right arrow</span> @@ -74,16 +74,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muData">container</span> delete-operation [ - before-row:number - before-column:number - before-top-of-screen:address:duplex-list:character - after-row:number - after-column:number - after-top-of-screen:address:duplex-list:character - deleted-text:address:duplex-list:character - delete-from:address:duplex-list:character - delete-until:address:duplex-list:character - tag:number <span class="Comment"># event causing this operation; might be used to coalesce runs of similar events</span> + before-row:num + before-column:num + before-top-of-screen:&:duplex-list:char + after-row:num + after-column:num + after-top-of-screen:&:duplex-list:char + deleted-text:&:duplex-list:char + delete-from:&:duplex-list:char + delete-until:&:duplex-list:char + tag:num <span class="Comment"># event causing this operation; might be used to coalesce runs of similar events</span> <span class="Comment"># 0: no coalesce (ctrl-k, ctrl-u)</span> <span class="Comment"># 1: backspace</span> <span class="Comment"># 2: delete</span> @@ -91,21 +91,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># every editor accumulates a list of operations to undo/redo</span> <span class="muData">container</span> editor-data [ - undo:address:list:address:operation - redo:address:list:address:operation + undo:&:list:&:operation + redo:&:list:&:operation ] <span class="Comment"># ctrl-z - undo operation</span> <span class="muRecipe">after</span> <span class="Constant"><handle-special-character></span> [ <span class="Delimiter">{</span> - undo?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">26/ctrl-z</span> + undo?:bool<span class="Special"> <- </span>equal c, <span class="Constant">26/ctrl-z</span> <span class="muControl">break-unless</span> undo? - undo:address:list:address:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> + undo:&:list:&:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> <span class="muControl">break-unless</span> undo - op:address:operation<span class="Special"> <- </span>first undo + op:&:operation<span class="Special"> <- </span>first undo undo<span class="Special"> <- </span>rest undo *editor<span class="Special"> <- </span>put *editor, <span class="Constant">undo:offset</span>, undo - redo:address:list:address:operation<span class="Special"> <- </span>get *editor, <span class="Constant">redo:offset</span> + redo:&:list:&:operation<span class="Special"> <- </span>get *editor, <span class="Constant">redo:offset</span> redo<span class="Special"> <- </span>push op, redo *editor<span class="Special"> <- </span>put *editor, <span class="Constant">redo:offset</span>, redo <span class="Constant"> <handle-undo></span> @@ -116,14 +116,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># ctrl-y - redo operation</span> <span class="muRecipe">after</span> <span class="Constant"><handle-special-character></span> [ <span class="Delimiter">{</span> - redo?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">25/ctrl-y</span> + redo?:bool<span class="Special"> <- </span>equal c, <span class="Constant">25/ctrl-y</span> <span class="muControl">break-unless</span> redo? - redo:address:list:address:operation<span class="Special"> <- </span>get *editor, <span class="Constant">redo:offset</span> + redo:&:list:&:operation<span class="Special"> <- </span>get *editor, <span class="Constant">redo:offset</span> <span class="muControl">break-unless</span> redo - op:address:operation<span class="Special"> <- </span>first redo + op:&:operation<span class="Special"> <- </span>first redo redo<span class="Special"> <- </span>rest redo *editor<span class="Special"> <- </span>put *editor, <span class="Constant">redo:offset</span>, redo - undo:address:list:address:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> + undo:&:list:&:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> undo<span class="Special"> <- </span>push op, undo *editor<span class="Special"> <- </span>put *editor, <span class="Constant">undo:offset</span>, undo <span class="Constant"> <handle-redo></span> @@ -137,18 +137,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor and type a character</span> assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data assume-console [ type <span class="Constant">[0]</span> ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># character should be gone</span> screen-should-contain [ @@ -162,7 +162,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -174,24 +174,24 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># save operation to undo</span> <span class="muRecipe">after</span> <span class="Constant"><insert-character-begin></span> [ - top-before:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - cursor-before:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + top-before:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + cursor-before:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> ] <span class="muRecipe">before</span> <span class="Constant"><insert-character-end></span> [ - top-after:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - undo:address:list:address:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> + top-after:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + undo:&:list:&:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> <span class="Delimiter">{</span> <span class="Comment"># if previous operation was an insert, coalesce this operation with it</span> <span class="muControl">break-unless</span> undo - op:address:operation<span class="Special"> <- </span>first undo - typing:insert-operation, is-insert?:boolean<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">typing:variant</span> + op:&:operation<span class="Special"> <- </span>first undo + typing:insert-operation, is-insert?:bool<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">typing:variant</span> <span class="muControl">break-unless</span> is-insert? - previous-coalesce-tag:number<span class="Special"> <- </span>get typing, <span class="Constant">tag:offset</span> + previous-coalesce-tag:num<span class="Special"> <- </span>get typing, <span class="Constant">tag:offset</span> <span class="muControl">break-unless</span> previous-coalesce-tag - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - insert-until:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + insert-until:&:duplex-list:char<span class="Special"> <- </span>next before-cursor typing<span class="Special"> <- </span>put typing, <span class="Constant">insert-until:offset</span>, insert-until typing<span class="Special"> <- </span>put typing, <span class="Constant">after-row:offset</span>, cursor-row typing<span class="Special"> <- </span>put typing, <span class="Constant">after-column:offset</span>, cursor-column @@ -200,9 +200,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">break</span> <span class="Constant">+done-adding-insert-operation:label</span> <span class="Delimiter">}</span> <span class="Comment"># if not, create a new operation</span> - insert-from:address:duplex-list:character<span class="Special"> <- </span>next cursor-before - insert-to:address:duplex-list:character<span class="Special"> <- </span>next insert-from - op:address:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> + insert-from:&:duplex-list:char<span class="Special"> <- </span>next cursor-before + insert-to:&:duplex-list:char<span class="Special"> <- </span>next insert-from + op:&:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> *op<span class="Special"> <- </span>merge <span class="Constant">0/insert-operation</span>, save-row/<span class="muRecipe">before</span>, save-column/<span class="muRecipe">before</span>, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, insert-from, insert-to, <span class="Constant">1/coalesce</span> editor<span class="Special"> <- </span>add-operation editor, op <span class="Constant"> +done-adding-insert-operation</span> @@ -210,20 +210,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># enter operations never coalesce with typing before or after</span> <span class="muRecipe">after</span> <span class="Constant"><insert-enter-begin></span> [ - cursor-row-before:number<span class="Special"> <- </span>copy cursor-row - cursor-column-before:number<span class="Special"> <- </span>copy cursor-column - top-before:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - cursor-before:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + cursor-row-before:num<span class="Special"> <- </span>copy cursor-row + cursor-column-before:num<span class="Special"> <- </span>copy cursor-column + top-before:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + cursor-before:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> ] <span class="muRecipe">before</span> <span class="Constant"><insert-enter-end></span> [ - top-after:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + top-after:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> <span class="Comment"># never coalesce</span> - insert-from:address:duplex-list:character<span class="Special"> <- </span>next cursor-before - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - insert-to:address:duplex-list:character<span class="Special"> <- </span>next before-cursor - op:address:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> + insert-from:&:duplex-list:char<span class="Special"> <- </span>next cursor-before + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + insert-to:&:duplex-list:char<span class="Special"> <- </span>next before-cursor + op:&:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> *op<span class="Special"> <- </span>merge <span class="Constant">0/insert-operation</span>, cursor-row-before, cursor-column-before, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, insert-from, insert-to, <span class="Constant">0/never-coalesce</span> editor<span class="Special"> <- </span>add-operation editor, op ] @@ -232,13 +232,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># redo stack, because it's now obsolete.</span> <span class="Comment"># Beware: since we're counting cursor moves as operations, this means just</span> <span class="Comment"># moving the cursor can lose work on the undo stack.</span> -<span class="muRecipe">def</span> add-operation editor:address:editor-data, op:address:operation<span class="muRecipe"> -> </span>editor:address:editor-data [ +<span class="muRecipe">def</span> add-operation editor:&:editor-data, op:&:operation<span class="muRecipe"> -> </span>editor:&:editor-data [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - undo:address:list:address:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> + undo:&:list:&:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> undo<span class="Special"> <- </span>push op undo *editor<span class="Special"> <- </span>put *editor, <span class="Constant">undo:offset</span>, undo - redo:address:list:address:operation<span class="Special"> <- </span>get *editor, <span class="Constant">redo:offset</span> + redo:&:list:&:operation<span class="Special"> <- </span>get *editor, <span class="Constant">redo:offset</span> redo<span class="Special"> <- </span>copy <span class="Constant">0</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">redo:offset</span>, redo <span class="muControl">return</span> editor/same-as-ingredient:<span class="Constant">0</span> @@ -246,19 +246,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-undo></span> [ <span class="Delimiter">{</span> - typing:insert-operation, is-insert?:boolean<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">typing:variant</span> + typing:insert-operation, is-insert?:bool<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">typing:variant</span> <span class="muControl">break-unless</span> is-insert? - start:address:duplex-list:character<span class="Special"> <- </span>get typing, <span class="Constant">insert-from:offset</span> - end:address:duplex-list:character<span class="Special"> <- </span>get typing, <span class="Constant">insert-until:offset</span> + start:&:duplex-list:char<span class="Special"> <- </span>get typing, <span class="Constant">insert-from:offset</span> + end:&:duplex-list:char<span class="Special"> <- </span>get typing, <span class="Constant">insert-until:offset</span> <span class="Comment"># assert cursor-row/cursor-column/top-of-screen match after-row/after-column/after-top-of-screen</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>prev start + before-cursor:&:duplex-list:char<span class="Special"> <- </span>prev start *editor<span class="Special"> <- </span>put *editor, <span class="Constant">before-cursor:offset</span>, before-cursor remove-between before-cursor, end cursor-row<span class="Special"> <- </span>get typing, <span class="Constant">before-row:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row cursor-column<span class="Special"> <- </span>get typing, <span class="Constant">before-column:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column - top:address:duplex-list:character<span class="Special"> <- </span>get typing, <span class="Constant">before-top-of-screen:offset</span> + top:&:duplex-list:char<span class="Special"> <- </span>get typing, <span class="Constant">before-top-of-screen:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">top-of-screen:offset</span>, top <span class="Delimiter">}</span> ] @@ -267,18 +267,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor and type multiple characters</span> assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data assume-console [ type <span class="Constant">[012]</span> ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># all characters must be gone</span> screen-should-contain [ @@ -293,13 +293,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor with some text</span> assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[a]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># type some characters</span> assume-console [ type <span class="Constant">[012]</span> ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .012a .</span> @@ -311,7 +311,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># back to original text</span> screen-should-contain [ @@ -325,7 +325,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[3]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -339,14 +339,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor with some text</span> assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[ abc]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># new line</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">8</span> press enter ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> . abc .</span> @@ -355,8 +355,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> . .</span> ] <span class="Comment"># line is indented</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -366,10 +366,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">5</span> @@ -386,7 +386,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -402,13 +402,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor, type something, undo</span> assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[a]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data assume-console [ type <span class="Constant">[012]</span> press ctrl-z ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .a .</span> @@ -420,7 +420,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># all characters must be back</span> screen-should-contain [ @@ -434,7 +434,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[3]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -446,10 +446,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-redo></span> [ <span class="Delimiter">{</span> - typing:insert-operation, is-insert?:boolean<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">typing:variant</span> + typing:insert-operation, is-insert?:bool<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">typing:variant</span> <span class="muControl">break-unless</span> is-insert? before-cursor<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - insert-from:address:duplex-list:character<span class="Special"> <- </span>get typing, <span class="Constant">insert-from:offset</span> <span class="Comment"># ignore insert-to because it's already been spliced away</span> + insert-from:&:duplex-list:char<span class="Special"> <- </span>get typing, <span class="Constant">insert-from:offset</span> <span class="Comment"># ignore insert-to because it's already been spliced away</span> <span class="Comment"># assert insert-to matches next(before-cursor)</span> insert-range before-cursor, insert-from <span class="Comment"># assert cursor-row/cursor-column/top-of-screen match after-row/after-column/after-top-of-screen</span> @@ -457,7 +457,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row cursor-column<span class="Special"> <- </span>get typing, <span class="Constant">after-column:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column - top:address:duplex-list:character<span class="Special"> <- </span>get typing, <span class="Constant">after-top-of-screen:offset</span> + top:&:duplex-list:char<span class="Special"> <- </span>get typing, <span class="Constant">after-top-of-screen:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">top-of-screen:offset</span>, top <span class="Delimiter">}</span> ] @@ -466,13 +466,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor, type something, undo</span> assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data assume-console [ type <span class="Constant">[012]</span> press ctrl-z ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> . .</span> @@ -484,7 +484,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># all characters must be back</span> screen-should-contain [ @@ -498,7 +498,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[3]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -514,18 +514,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data assume-console [ type <span class="Constant">[1]</span> press ctrl-z ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># do some more work</span> assume-console [ type <span class="Constant">[0]</span> ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .0abc .</span> @@ -538,7 +538,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># nothing should happen</span> screen-should-contain [ @@ -554,8 +554,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor</span> assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># insert some text and tabs, hit enter, some more text and tabs</span> assume-console [ press tab @@ -566,7 +566,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press tab type <span class="Constant">[efg]</span> ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> . ab cd .</span> @@ -574,8 +574,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈.</span> <span class="Constant"> . .</span> ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">7</span> @@ -585,11 +585,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># typing in second line deleted, but not indent</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -606,11 +606,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># indent and newline deleted</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">8</span> @@ -626,11 +626,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># empty screen</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">0</span> @@ -646,11 +646,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># first line inserted</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">8</span> @@ -666,11 +666,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># newline and indent inserted</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -687,11 +687,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># indent and newline deleted</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">7</span> @@ -713,21 +713,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># move the cursor</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">1</span> ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># click undone</span> memory-should-contain [ @@ -739,7 +739,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -751,25 +751,25 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muRecipe">after</span> <span class="Constant"><move-cursor-begin></span> [ - cursor-row-before:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column-before:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - top-before:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + cursor-row-before:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column-before:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + top-before:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> ] <span class="muRecipe">before</span> <span class="Constant"><move-cursor-end></span> [ - top-after:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + top-after:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> undo-coalesce-tag <span class="Comment"># if previous operation was also a move, and also had the same coalesce</span> <span class="Comment"># tag, coalesce with it</span> - undo:address:list:address:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> + undo:&:list:&:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> <span class="muControl">break-unless</span> undo - op:address:operation<span class="Special"> <- </span>first undo - move:move-operation, is-move?:boolean<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">move:variant</span> + op:&:operation<span class="Special"> <- </span>first undo + move:move-operation, is-move?:bool<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">move:variant</span> <span class="muControl">break-unless</span> is-move? - previous-coalesce-tag:number<span class="Special"> <- </span>get move, <span class="Constant">tag:offset</span> - coalesce?:boolean<span class="Special"> <- </span>equal undo-coalesce-tag, previous-coalesce-tag + previous-coalesce-tag:num<span class="Special"> <- </span>get move, <span class="Constant">tag:offset</span> + coalesce?:bool<span class="Special"> <- </span>equal undo-coalesce-tag, previous-coalesce-tag <span class="muControl">break-unless</span> coalesce? move<span class="Special"> <- </span>put move, <span class="Constant">after-row:offset</span>, cursor-row move<span class="Special"> <- </span>put move, <span class="Constant">after-column:offset</span>, cursor-column @@ -777,7 +777,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *op<span class="Special"> <- </span>merge <span class="Constant">1/move-operation</span>, move <span class="muControl">break</span> <span class="Constant">+done-adding-move-operation:label</span> <span class="Delimiter">}</span> - op:address:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> + op:&:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> *op<span class="Special"> <- </span>merge <span class="Constant">1/move-operation</span>, cursor-row-before, cursor-column-before, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, undo-coalesce-tag editor<span class="Special"> <- </span>add-operation editor, op <span class="Constant"> +done-adding-move-operation</span> @@ -785,14 +785,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-undo></span> [ <span class="Delimiter">{</span> - move:move-operation, is-move?:boolean<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">move:variant</span> + move:move-operation, is-move?:bool<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">move:variant</span> <span class="muControl">break-unless</span> is-move? <span class="Comment"># assert cursor-row/cursor-column/top-of-screen match after-row/after-column/after-top-of-screen</span> cursor-row<span class="Special"> <- </span>get move, <span class="Constant">before-row:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row cursor-column<span class="Special"> <- </span>get move, <span class="Constant">before-column:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column - top:address:duplex-list:character<span class="Special"> <- </span>get move, <span class="Constant">before-top-of-screen:offset</span> + top:&:duplex-list:char<span class="Special"> <- </span>get move, <span class="Constant">before-top-of-screen:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">top-of-screen:offset</span>, top <span class="Delimiter">}</span> ] @@ -804,15 +804,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[a</span> <span class="Constant">b</span> <span class="Constant">cdefgh]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">5/right</span> <span class="Comment"># position cursor at end of screen and try to move right</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">3</span> press right-arrow ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> <span class="Comment"># screen scrolls</span> screen-should-contain [ <span class="Constant"> . .</span> @@ -829,9 +829,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moved back</span> memory-should-contain [ @@ -850,7 +850,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -866,22 +866,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># move the cursor</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">1</span> press left-arrow ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves back</span> memory-should-contain [ @@ -893,7 +893,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -910,16 +910,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># move the cursor</span> assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">1</span> press up-arrow ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">2</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -929,9 +929,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves back</span> memory-should-contain [ @@ -943,7 +943,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -960,22 +960,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># move the cursor</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">1</span> press down-arrow ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves back</span> memory-should-contain [ @@ -987,7 +987,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1007,21 +1007,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">d</span> <span class="Constant">e</span> <span class="Constant">f]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># scroll the page</span> assume-console [ press ctrl-f ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen should again show page 1</span> screen-should-contain [ @@ -1042,21 +1042,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">d</span> <span class="Constant">e</span> <span class="Constant">f]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># scroll the page</span> assume-console [ press page-down ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen should again show page 1</span> screen-should-contain [ @@ -1077,22 +1077,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">d</span> <span class="Constant">e</span> <span class="Constant">f]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># scroll the page down and up</span> assume-console [ press page-down press ctrl-b ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen should again show page 2</span> screen-should-contain [ @@ -1113,22 +1113,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">d</span> <span class="Constant">e</span> <span class="Constant">f]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># scroll the page down and up</span> assume-console [ press page-down press page-up ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen should again show page 2</span> screen-should-contain [ @@ -1146,22 +1146,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># move the cursor, then to start of line</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">1</span> press ctrl-a ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves back</span> memory-should-contain [ @@ -1173,7 +1173,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1190,22 +1190,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># move the cursor, then to start of line</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">1</span> press home ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves back</span> memory-should-contain [ @@ -1217,7 +1217,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1234,22 +1234,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># move the cursor, then to start of line</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">1</span> press ctrl-e ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves back</span> memory-should-contain [ @@ -1261,7 +1261,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1278,22 +1278,22 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># move the cursor, then to start of line</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">1</span> press end ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># undo</span> assume-console [ press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves back</span> memory-should-contain [ @@ -1305,7 +1305,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1322,8 +1322,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># move the cursor</span> assume-console [ left-click <span class="Constant">2</span>, <span class="Constant">1</span> @@ -1331,9 +1331,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press right-arrow press up-arrow ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">3</span> @@ -1343,9 +1343,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># up-arrow is undone</span> memory-should-contain [ @@ -1357,9 +1357,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># both right-arrows are undone</span> memory-should-contain [ @@ -1376,21 +1376,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def</span> <span class="Constant">ghi]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data assume-console [ left-click <span class="Constant">3</span>, <span class="Constant">1</span> press ctrl-z ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data <span class="Comment"># redo</span> assume-console [ press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves to left-click</span> memory-should-contain [ @@ -1402,7 +1402,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1415,14 +1415,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-redo></span> [ <span class="Delimiter">{</span> - move:move-operation, is-move?:boolean<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">move:variant</span> + move:move-operation, is-move?:bool<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">move:variant</span> <span class="muControl">break-unless</span> is-move? <span class="Comment"># assert cursor-row/cursor-column/top-of-screen match after-row/after-column/after-top-of-screen</span> cursor-row<span class="Special"> <- </span>get move, <span class="Constant">after-row:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row cursor-column<span class="Special"> <- </span>get move, <span class="Constant">after-column:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column - top:address:duplex-list:character<span class="Special"> <- </span>get move, <span class="Constant">after-top-of-screen:offset</span> + top:&:duplex-list:char<span class="Special"> <- </span>get move, <span class="Constant">after-top-of-screen:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">top-of-screen:offset</span>, top <span class="Delimiter">}</span> ] @@ -1431,16 +1431,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor, type some text, move the cursor, type some more text</span> assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data assume-console [ type <span class="Constant">[abc]</span> left-click <span class="Constant">1</span>, <span class="Constant">1</span> type <span class="Constant">[d]</span> ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .adbc .</span> @@ -1456,9 +1456,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># last letter typed is deleted</span> screen-should-contain [ @@ -1476,9 +1476,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># no change to screen; cursor moves</span> screen-should-contain [ @@ -1496,9 +1496,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># screen empty</span> screen-should-contain [ @@ -1516,9 +1516,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># first insert</span> screen-should-contain [ @@ -1536,9 +1536,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># cursor moves</span> screen-should-contain [ @@ -1557,9 +1557,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> ] <span class="Comment"># second insert</span> screen-should-contain [ @@ -1580,23 +1580,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor</span> assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># insert some text and hit backspace</span> assume-console [ type <span class="Constant">[abc]</span> press backspace press backspace ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .a .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈.</span> <span class="Constant"> . .</span> ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1606,10 +1606,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">3</span> @@ -1625,10 +1625,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1643,27 +1643,27 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># save operation to undo</span> <span class="muRecipe">after</span> <span class="Constant"><backspace-character-begin></span> [ - top-before:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + top-before:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> ] <span class="muRecipe">before</span> <span class="Constant"><backspace-character-end></span> [ <span class="Delimiter">{</span> <span class="muControl">break-unless</span> backspaced-cell <span class="Comment"># backspace failed; don't add an undo operation</span> - top-after:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - undo:address:list:address:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> + top-after:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + undo:&:list:&:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> <span class="Delimiter">{</span> <span class="Comment"># if previous operation was an insert, coalesce this operation with it</span> <span class="muControl">break-unless</span> undo - op:address:operation<span class="Special"> <- </span>first undo - deletion:delete-operation, is-delete?:boolean<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">delete:variant</span> + op:&:operation<span class="Special"> <- </span>first undo + deletion:delete-operation, is-delete?:bool<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">delete:variant</span> <span class="muControl">break-unless</span> is-delete? - previous-coalesce-tag:number<span class="Special"> <- </span>get deletion, <span class="Constant">tag:offset</span> - coalesce?:boolean<span class="Special"> <- </span>equal previous-coalesce-tag, <span class="Constant">1/coalesce-backspace</span> + previous-coalesce-tag:num<span class="Special"> <- </span>get deletion, <span class="Constant">tag:offset</span> + coalesce?:bool<span class="Special"> <- </span>equal previous-coalesce-tag, <span class="Constant">1/coalesce-backspace</span> <span class="muControl">break-unless</span> coalesce? deletion<span class="Special"> <- </span>put deletion, <span class="Constant">delete-from:offset</span>, before-cursor - backspaced-so-far:address:duplex-list:character<span class="Special"> <- </span>get deletion, <span class="Constant">deleted-text:offset</span> + backspaced-so-far:&:duplex-list:char<span class="Special"> <- </span>get deletion, <span class="Constant">deleted-text:offset</span> insert-range backspaced-cell, backspaced-so-far deletion<span class="Special"> <- </span>put deletion, <span class="Constant">deleted-text:offset</span>, backspaced-cell deletion<span class="Special"> <- </span>put deletion, <span class="Constant">after-row:offset</span>, cursor-row @@ -1673,8 +1673,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">break</span> <span class="Constant">+done-adding-backspace-operation:label</span> <span class="Delimiter">}</span> <span class="Comment"># if not, create a new operation</span> - op:address:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> - deleted-until:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + op:&:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> + deleted-until:&:duplex-list:char<span class="Special"> <- </span>next before-cursor *op<span class="Special"> <- </span>merge <span class="Constant">2/delete-operation</span>, save-row/<span class="muRecipe">before</span>, save-column/<span class="muRecipe">before</span>, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, backspaced-cell/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">1/coalesce-backspace</span> editor<span class="Special"> <- </span>add-operation editor, op <span class="Constant"> +done-adding-backspace-operation</span> @@ -1683,12 +1683,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><handle-undo></span> [ <span class="Delimiter">{</span> - deletion:delete-operation, is-delete?:boolean<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">delete:variant</span> + deletion:delete-operation, is-delete?:bool<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">delete:variant</span> <span class="muControl">break-unless</span> is-delete? - anchor:address:duplex-list:character<span class="Special"> <- </span>get deletion, <span class="Constant">delete-from:offset</span> + anchor:&:duplex-list:char<span class="Special"> <- </span>get deletion, <span class="Constant">delete-from:offset</span> <span class="muControl">break-unless</span> anchor - deleted:address:duplex-list:character<span class="Special"> <- </span>get deletion, <span class="Constant">deleted-text:offset</span> - old-cursor:address:duplex-list:character<span class="Special"> <- </span>last deleted + deleted:&:duplex-list:char<span class="Special"> <- </span>get deletion, <span class="Constant">deleted-text:offset</span> + old-cursor:&:duplex-list:char<span class="Special"> <- </span>last deleted insert-range anchor, deleted <span class="Comment"># assert cursor-row/cursor-column/top-of-screen match after-row/after-column/after-top-of-screen</span> before-cursor<span class="Special"> <- </span>copy old-cursor @@ -1696,25 +1696,25 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row cursor-column<span class="Special"> <- </span>get deletion, <span class="Constant">before-column:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column - top:address:duplex-list:character<span class="Special"> <- </span>get deletion, <span class="Constant">before-top-of-screen:offset</span> + top:&:duplex-list:char<span class="Special"> <- </span>get deletion, <span class="Constant">before-top-of-screen:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">top-of-screen:offset</span>, top <span class="Delimiter">}</span> ] <span class="muRecipe">after</span> <span class="Constant"><handle-redo></span> [ <span class="Delimiter">{</span> - deletion:delete-operation, is-delete?:boolean<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">delete:variant</span> + deletion:delete-operation, is-delete?:bool<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">delete:variant</span> <span class="muControl">break-unless</span> is-delete? - start:address:duplex-list:character<span class="Special"> <- </span>get deletion, <span class="Constant">delete-from:offset</span> - end:address:duplex-list:character<span class="Special"> <- </span>get deletion, <span class="Constant">delete-until:offset</span> - data:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> + start:&:duplex-list:char<span class="Special"> <- </span>get deletion, <span class="Constant">delete-from:offset</span> + end:&:duplex-list:char<span class="Special"> <- </span>get deletion, <span class="Constant">delete-until:offset</span> + data:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">data:offset</span> remove-between start, end <span class="Comment"># assert cursor-row/cursor-column/top-of-screen match after-row/after-column/after-top-of-screen</span> cursor-row<span class="Special"> <- </span>get deletion, <span class="Constant">after-row:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-row:offset</span>, cursor-row cursor-column<span class="Special"> <- </span>get deletion, <span class="Constant">after-column:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">cursor-column:offset</span>, cursor-column - top:address:duplex-list:character<span class="Special"> <- </span>get deletion, <span class="Constant">before-top-of-screen:offset</span> + top:&:duplex-list:char<span class="Special"> <- </span>get deletion, <span class="Constant">before-top-of-screen:offset</span> *editor<span class="Special"> <- </span>put *editor, <span class="Constant">top-of-screen:offset</span>, top <span class="Delimiter">}</span> ] @@ -1725,8 +1725,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor</span> assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># insert some text and hit delete and backspace a few times</span> assume-console [ type <span class="Constant">[abcdef]</span> @@ -1736,15 +1736,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press delete press delete ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .af .</span> <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈.</span> <span class="Constant"> . .</span> ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1754,10 +1754,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1773,10 +1773,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -1792,10 +1792,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -1811,11 +1811,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># first line inserted</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -1831,11 +1831,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># first line inserted</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1851,11 +1851,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># first line inserted</span> - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1869,28 +1869,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muRecipe">after</span> <span class="Constant"><delete-character-begin></span> [ - top-before:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + top-before:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> ] <span class="muRecipe">before</span> <span class="Constant"><delete-character-end></span> [ <span class="Delimiter">{</span> <span class="muControl">break-unless</span> deleted-cell <span class="Comment"># delete failed; don't add an undo operation</span> - top-after:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - undo:address:list:address:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> + top-after:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + undo:&:list:&:operation<span class="Special"> <- </span>get *editor, <span class="Constant">undo:offset</span> <span class="Delimiter">{</span> <span class="Comment"># if previous operation was an insert, coalesce this operation with it</span> <span class="muControl">break-unless</span> undo - op:address:operation<span class="Special"> <- </span>first undo - deletion:delete-operation, is-delete?:boolean<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">delete:variant</span> + op:&:operation<span class="Special"> <- </span>first undo + deletion:delete-operation, is-delete?:bool<span class="Special"> <- </span>maybe-convert *op, <span class="Constant">delete:variant</span> <span class="muControl">break-unless</span> is-delete? - previous-coalesce-tag:number<span class="Special"> <- </span>get deletion, <span class="Constant">tag:offset</span> - coalesce?:boolean<span class="Special"> <- </span>equal previous-coalesce-tag, <span class="Constant">2/coalesce-delete</span> + previous-coalesce-tag:num<span class="Special"> <- </span>get deletion, <span class="Constant">tag:offset</span> + coalesce?:bool<span class="Special"> <- </span>equal previous-coalesce-tag, <span class="Constant">2/coalesce-delete</span> <span class="muControl">break-unless</span> coalesce? - delete-until:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + delete-until:&:duplex-list:char<span class="Special"> <- </span>next before-cursor deletion<span class="Special"> <- </span>put deletion, <span class="Constant">delete-until:offset</span>, delete-until - deleted-so-far:address:duplex-list:character<span class="Special"> <- </span>get deletion, <span class="Constant">deleted-text:offset</span> + deleted-so-far:&:duplex-list:char<span class="Special"> <- </span>get deletion, <span class="Constant">deleted-text:offset</span> deleted-so-far<span class="Special"> <- </span>append deleted-so-far, deleted-cell deletion<span class="Special"> <- </span>put deletion, <span class="Constant">deleted-text:offset</span>, deleted-so-far deletion<span class="Special"> <- </span>put deletion, <span class="Constant">after-row:offset</span>, cursor-row @@ -1900,8 +1900,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">break</span> <span class="Constant">+done-adding-delete-operation:label</span> <span class="Delimiter">}</span> <span class="Comment"># if not, create a new operation</span> - op:address:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> - deleted-until:address:duplex-list:character<span class="Special"> <- </span>next before-cursor + op:&:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> + deleted-until:&:duplex-list:char<span class="Special"> <- </span>next before-cursor *op<span class="Special"> <- </span>merge <span class="Constant">2/delete-operation</span>, save-row/<span class="muRecipe">before</span>, save-column/<span class="muRecipe">before</span>, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, deleted-cell/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">2/coalesce-delete</span> editor<span class="Special"> <- </span>add-operation editor, op <span class="Constant"> +done-adding-delete-operation</span> @@ -1915,14 +1915,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># insert some text and hit delete and backspace a few times</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">1</span> press ctrl-k ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .a .</span> @@ -1930,8 +1930,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈.</span> <span class="Constant"> . .</span> ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1941,7 +1941,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1950,8 +1950,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈.</span> <span class="Constant"> . .</span> ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1961,7 +1961,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># first line inserted</span> screen-should-contain [ @@ -1971,8 +1971,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈.</span> <span class="Constant"> . .</span> ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">1</span> @@ -1982,7 +1982,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -1994,16 +1994,16 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muRecipe">after</span> <span class="Constant"><delete-to-end-of-line-begin></span> [ - top-before:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + top-before:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> ] <span class="muRecipe">before</span> <span class="Constant"><delete-to-end-of-line-end></span> [ <span class="Delimiter">{</span> <span class="muControl">break-unless</span> deleted-cells <span class="Comment"># delete failed; don't add an undo operation</span> - top-after:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> - deleted-until:address:duplex-list:character<span class="Special"> <- </span>next before-cursor - op:address:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> + top-after:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + deleted-until:&:duplex-list:char<span class="Special"> <- </span>next before-cursor + op:&:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> *op<span class="Special"> <- </span>merge <span class="Constant">2/delete-operation</span>, save-row/<span class="muRecipe">before</span>, save-column/<span class="muRecipe">before</span>, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, deleted-cells/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">0/never-coalesce</span> editor<span class="Special"> <- </span>add-operation editor, op <span class="Constant"> +done-adding-delete-operation</span> @@ -2017,14 +2017,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[abc</span> <span class="Constant">def]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># insert some text and hit delete and backspace a few times</span> assume-console [ left-click <span class="Constant">1</span>, <span class="Constant">2</span> press ctrl-u ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .c .</span> @@ -2032,8 +2032,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈.</span> <span class="Constant"> . .</span> ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">0</span> @@ -2043,7 +2043,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-z ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -2052,8 +2052,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈.</span> <span class="Constant"> . .</span> ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">2</span> @@ -2063,7 +2063,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color press ctrl-y ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] <span class="Comment"># first line inserted</span> screen-should-contain [ @@ -2073,8 +2073,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant"> .┈┈┈┈┈┈┈┈┈┈.</span> <span class="Constant"> . .</span> ] - <span class="Constant">3</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-row:offset</span> - <span class="Constant">4</span>:number<span class="Special"> <- </span>get *<span class="Constant">2</span>:address:editor-data, <span class="Constant">cursor-column:offset</span> + <span class="Constant">3</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-row:offset</span> + <span class="Constant">4</span>:num<span class="Special"> <- </span>get *<span class="Constant">2</span>:&:editor-data, <span class="Constant">cursor-column:offset</span> memory-should-contain [ <span class="Constant">3</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Constant">4</span><span class="Special"> <- </span><span class="Constant">0</span> @@ -2084,7 +2084,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color type <span class="Constant">[1]</span> ] run [ - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data ] screen-should-contain [ <span class="Constant"> . .</span> @@ -2096,17 +2096,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] <span class="muRecipe">after</span> <span class="Constant"><delete-to-start-of-line-begin></span> [ - top-before:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + top-before:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> ] <span class="muRecipe">before</span> <span class="Constant"><delete-to-start-of-line-end></span> [ <span class="Delimiter">{</span> <span class="muControl">break-unless</span> deleted-cells <span class="Comment"># delete failed; don't add an undo operation</span> - top-after:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> - op:address:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> - before-cursor:address:duplex-list:character<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> - deleted-until:address:duplex-list:character<span class="Special"> <- </span>next before-cursor - cursor-row:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> - cursor-column:number<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> + top-after:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">top-of-screen:offset</span> + op:&:operation<span class="Special"> <- </span>new <span class="Constant">operation:type</span> + before-cursor:&:duplex-list:char<span class="Special"> <- </span>get *editor, <span class="Constant">before-cursor:offset</span> + deleted-until:&:duplex-list:char<span class="Special"> <- </span>next before-cursor + cursor-row:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-row:offset</span> + cursor-column:num<span class="Special"> <- </span>get *editor, <span class="Constant">cursor-column:offset</span> *op<span class="Special"> <- </span>merge <span class="Constant">2/delete-operation</span>, save-row/<span class="muRecipe">before</span>, save-column/<span class="muRecipe">before</span>, top-before, cursor-row/<span class="muRecipe">after</span>, cursor-column/<span class="muRecipe">after</span>, top-after, deleted-cells/deleted, before-cursor/delete-from, deleted-until, <span class="Constant">0/never-coalesce</span> editor<span class="Special"> <- </span>add-operation editor, op <span class="Constant"> +done-adding-delete-operation</span> @@ -2117,15 +2117,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># create an editor</span> assume-screen <span class="Constant">10/width</span>, <span class="Constant">5/height</span> <span class="Constant">1</span>:text<span class="Special"> <- </span>new <span class="Constant">[]</span> - <span class="Constant">2</span>:address:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:address:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> - editor-render screen, <span class="Constant">2</span>:address:editor-data + <span class="Constant">2</span>:&:editor-data<span class="Special"> <- </span>new-editor <span class="Constant">1</span>:text, screen:&:screen, <span class="Constant">0/left</span>, <span class="Constant">10/right</span> + editor-render screen, <span class="Constant">2</span>:&:editor-data <span class="Comment"># insert some text and hit delete and backspace a few times</span> assume-console [ type <span class="Constant">[abc]</span> press ctrl-u press ctrl-z ] - editor-event-loop screen:address:screen, console:address:console, <span class="Constant">2</span>:address:editor-data + editor-event-loop screen:&:screen, console:&:console, <span class="Constant">2</span>:&:editor-data screen-should-contain [ <span class="Constant"> . .</span> <span class="Constant"> .abc .</span> diff --git a/html/example1.mu.html b/html/example1.mu.html index 9e4c8948..66a965cd 100644 --- a/html/example1.mu.html +++ b/html/example1.mu.html @@ -29,7 +29,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <pre id='vimCodeElement'> <span class="muRecipe">def</span> example1 [ <span class="Constant">local-scope</span> - a:number<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> + a:num<span class="Special"> <- </span>add <span class="Constant">2</span>, <span class="Constant">2</span> a<span class="Special"> <- </span>multiply a, <span class="Constant">3</span> ] </pre> diff --git a/html/factorial.mu.html b/html/factorial.mu.html index 370fa8e0..ccd47c99 100644 --- a/html/factorial.mu.html +++ b/html/factorial.mu.html @@ -35,12 +35,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">def</span> main [ <span class="Constant">local-scope</span> - x:number<span class="Special"> <- </span>factorial <span class="Constant">5</span> + x:num<span class="Special"> <- </span>factorial <span class="Constant">5</span> $print <span class="Constant">[result: ]</span>, x, <span class="Constant">[ </span> <span class="Constant">]</span> ] -<span class="muRecipe">def</span> factorial n:number<span class="muRecipe"> -> </span>result:number [ +<span class="muRecipe">def</span> factorial n:num<span class="muRecipe"> -> </span>result:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> @@ -50,15 +50,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> <span class="Constant">1</span> <span class="Delimiter">}</span> <span class="Comment"># return n * factorial(n-1)</span> - x:number<span class="Special"> <- </span>subtract n, <span class="Constant">1</span> - subresult:number<span class="Special"> <- </span>factorial x + x:num<span class="Special"> <- </span>subtract n, <span class="Constant">1</span> + subresult:num<span class="Special"> <- </span>factorial x result<span class="Special"> <- </span>multiply subresult, n ] <span class="Comment"># unit test</span> <span class="muScenario">scenario</span> factorial-test [ run [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>factorial <span class="Constant">5</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>factorial <span class="Constant">5</span> ] memory-should-contain [ <span class="Constant">1</span><span class="Special"> <- </span><span class="Constant">120</span> diff --git a/html/filesystem.mu.html b/html/filesystem.mu.html index d29130e8..fbc5cd20 100644 --- a/html/filesystem.mu.html +++ b/html/filesystem.mu.html @@ -37,10 +37,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">def</span> main [ <span class="Constant">local-scope</span> - source-file:address:source:character<span class="Special"> <- </span>start-reading <span class="Constant">0/real-filesystem</span>, <span class="Constant">[/tmp/mu-x]</span> - sink-file:address:sink:character, write-routine:number<span class="Special"> <- </span>start-writing <span class="Constant">0/real-filesystem</span>, <span class="Constant">[/tmp/mu-y]</span> + source-file:&:source:char<span class="Special"> <- </span>start-reading <span class="Constant">0/real-filesystem</span>, <span class="Constant">[/tmp/mu-x]</span> + sink-file:&:sink:char, write-routine:num<span class="Special"> <- </span>start-writing <span class="Constant">0/real-filesystem</span>, <span class="Constant">[/tmp/mu-y]</span> <span class="Delimiter">{</span> - c:character, done?:boolean, source-file<span class="Special"> <- </span>read source-file + c:char, done?:boolean, source-file<span class="Special"> <- </span>read source-file <span class="muControl">break-if</span> done? sink-file<span class="Special"> <- </span>write sink-file, c <span class="muControl">loop</span> diff --git a/html/global.mu.html b/html/global.mu.html index 3c0b8e86..e70038c7 100644 --- a/html/global.mu.html +++ b/html/global.mu.html @@ -32,15 +32,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">def</span> main [ <span class="Comment"># allocate 5 locations for globals</span> - <span class="Constant">global-space</span>:address:array:location<span class="Special"> <- </span>new <span class="Constant">location:type</span>, <span class="Constant">5</span> + <span class="Constant">global-space</span>:space<span class="Special"> <- </span>new <span class="Constant">location:type</span>, <span class="Constant">5</span> <span class="Comment"># read to globals by using /space:global</span> - <span class="Special">1:number/space:global</span><span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Special">1:num/space:global</span><span class="Special"> <- </span>copy <span class="Constant">3</span> foo ] <span class="muRecipe">def</span> foo [ <span class="Comment"># ditto for writing to globals</span> - $print <span class="Special">1:number/space:global</span>, <span class="Constant">10/newline</span> + $print <span class="Special">1:num/space:global</span>, <span class="Constant">10/newline</span> ] </pre> </body> diff --git a/html/immutable_error.mu.html b/html/immutable_error.mu.html index 2d1fcae6..0e2a141a 100644 --- a/html/immutable_error.mu.html +++ b/html/immutable_error.mu.html @@ -32,11 +32,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">def</span> main [ <span class="Constant">local-scope</span> - x:address:number<span class="Special"> <- </span>new <span class="Constant">number:type</span> + x:&:num<span class="Special"> <- </span>new <span class="Constant">number:type</span> foo x ] -<span class="muRecipe">def</span> foo x:address:number [ +<span class="muRecipe">def</span> foo x:&:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> *x<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># will cause an error because x is immutable in this function</span> diff --git a/html/lambda_to_mu.mu.html b/html/lambda_to_mu.mu.html index a615b34f..0bfee036 100644 --- a/html/lambda_to_mu.mu.html +++ b/html/lambda_to_mu.mu.html @@ -41,19 +41,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ <span class="Constant">local-scope</span> <span class="Constant">1</span>:text/<span class="Special">raw <- </span>lambda-to-mu <span class="Constant">[(add a (multiply b c))]</span> - <span class="Constant">2</span>:array:character/<span class="Special">raw <- </span>copy *<span class="Constant">1</span>:text/<span class="Special">raw</span> + <span class="Constant">2</span>:@:char/<span class="Special">raw <- </span>copy *<span class="Constant">1</span>:text/<span class="Special">raw</span> ] memory-should-contain [ - <span class="Constant">2</span>:array:character<span class="Special"> <- </span><span class="Constant">[t1 <- multiply b c</span> + <span class="Constant">2</span>:@:char<span class="Special"> <- </span><span class="Constant">[t1 <- multiply b c</span> <span class="Constant">result <- add a t1]</span> ] ] -<span class="muRecipe">def</span> lambda-to-mu in:address:array:character<span class="muRecipe"> -> </span>out:address:array:character [ +<span class="muRecipe">def</span> lambda-to-mu in:text<span class="muRecipe"> -> </span>out:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> out<span class="Special"> <- </span>copy <span class="Constant">0</span> - cells:address:cell<span class="Special"> <- </span>parse in + cells:&:cell<span class="Special"> <- </span>parse in out<span class="Special"> <- </span>to-mu cells ] @@ -65,32 +65,32 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># printed below as < first | rest ></span> <span class="muData">container</span> pair [ - first:address:cell - rest:address:cell + first:&:cell + rest:&:cell ] -<span class="muRecipe">def</span> new-atom name:address:array:character<span class="muRecipe"> -> </span>result:address:cell [ +<span class="muRecipe">def</span> new-atom name:text<span class="muRecipe"> -> </span>result:&:cell [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> result<span class="Special"> <- </span>new <span class="Constant">cell:type</span> *result<span class="Special"> <- </span>merge <span class="Constant">0/tag:atom</span>, name ] -<span class="muRecipe">def</span> new-pair a:address:cell, b:address:cell<span class="muRecipe"> -> </span>result:address:cell [ +<span class="muRecipe">def</span> new-pair a:&:cell, b:&:cell<span class="muRecipe"> -> </span>result:&:cell [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> result<span class="Special"> <- </span>new <span class="Constant">cell:type</span> *result<span class="Special"> <- </span>merge <span class="Constant">1/tag:pair</span>, a/first, b/rest ] -<span class="muRecipe">def</span> is-atom? x:address:cell<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> is-atom? x:&:cell<span class="muRecipe"> -> </span>result:boolean [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">reply-unless</span> x, <span class="Constant">0/false</span> _, result<span class="Special"> <- </span>maybe-convert *x, <span class="Constant">atom:variant</span> ] -<span class="muRecipe">def</span> is-pair? x:address:cell<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> is-pair? x:&:cell<span class="muRecipe"> -> </span>result:boolean [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="muControl">reply-unless</span> x, <span class="Constant">0/false</span> @@ -100,7 +100,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> atom-is-not-pair [ <span class="Constant">local-scope</span> s:text<span class="Special"> <- </span>new <span class="Constant">[a]</span> - x:address:cell<span class="Special"> <- </span>new-atom s + x:&:cell<span class="Special"> <- </span>new-atom s <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>is-atom? x <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>is-pair? x memory-should-contain [ @@ -113,8 +113,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> <span class="Comment"># construct (a . nil)</span> s:text<span class="Special"> <- </span>new <span class="Constant">[a]</span> - x:address:cell<span class="Special"> <- </span>new-atom s - y:address:cell<span class="Special"> <- </span>new-pair x, <span class="Constant">0/nil</span> + x:&:cell<span class="Special"> <- </span>new-atom s + y:&:cell<span class="Special"> <- </span>new-pair x, <span class="Constant">0/nil</span> <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>is-atom? y <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>is-pair? y memory-should-contain [ @@ -123,7 +123,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -<span class="muRecipe">def</span> atom-match? x:address:cell, pat:address:array:character<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> atom-match? x:&:cell, pat:text<span class="muRecipe"> -> </span>result:boolean [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> s:text, is-atom?:boolean<span class="Special"> <- </span>maybe-convert *x, <span class="Constant">atom:variant</span> @@ -133,14 +133,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> atom-match [ <span class="Constant">local-scope</span> - x:address:cell<span class="Special"> <- </span>new-atom <span class="Constant">[abc]</span> + x:&:cell<span class="Special"> <- </span>new-atom <span class="Constant">[abc]</span> <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>atom-match? x, <span class="Constant">[abc]</span> memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> ] ] -<span class="muRecipe">def</span> first x:address:cell<span class="muRecipe"> -> </span>result:address:cell [ +<span class="muRecipe">def</span> first x:&:cell<span class="muRecipe"> -> </span>result:&:cell [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> pair:pair, pair?:boolean<span class="Special"> <- </span>maybe-convert *x, <span class="Constant">pair:variant</span> @@ -148,7 +148,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color result<span class="Special"> <- </span>get pair, <span class="Constant">first:offset</span> ] -<span class="muRecipe">def</span> rest x:address:cell<span class="muRecipe"> -> </span>result:address:cell [ +<span class="muRecipe">def</span> rest x:&:cell<span class="muRecipe"> -> </span>result:&:cell [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> pair:pair, pair?:boolean<span class="Special"> <- </span>maybe-convert *x, <span class="Constant">pair:variant</span> @@ -156,7 +156,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color result<span class="Special"> <- </span>get pair, <span class="Constant">rest:offset</span> ] -<span class="muRecipe">def</span> set-first base:address:cell, new-first:address:cell<span class="muRecipe"> -> </span>base:address:cell [ +<span class="muRecipe">def</span> set-first base:&:cell, new-first:&:cell<span class="muRecipe"> -> </span>base:&:cell [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> pair:pair, is-pair?:boolean<span class="Special"> <- </span>maybe-convert *base, <span class="Constant">pair:variant</span> @@ -165,7 +165,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *base<span class="Special"> <- </span>merge <span class="Constant">1/pair</span>, pair ] -<span class="muRecipe">def</span> set-rest base:address:cell, new-rest:address:cell<span class="muRecipe"> -> </span>base:address:cell [ +<span class="muRecipe">def</span> set-rest base:&:cell, new-rest:&:cell<span class="muRecipe"> -> </span>base:&:cell [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> pair:pair, is-pair?:boolean<span class="Special"> <- </span>maybe-convert *base, <span class="Constant">pair:variant</span> @@ -177,9 +177,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> cell-operations-on-atom [ <span class="Constant">local-scope</span> s:text<span class="Special"> <- </span>new <span class="Constant">[a]</span> - x:address:cell<span class="Special"> <- </span>new-atom s - <span class="Constant">10</span>:address:cell/<span class="Special">raw <- </span>first x - <span class="Constant">11</span>:address:cell/<span class="Special">raw <- </span>rest x + x:&:cell<span class="Special"> <- </span>new-atom s + <span class="Constant">10</span>:&:cell/<span class="Special">raw <- </span>first x + <span class="Constant">11</span>:&:cell/<span class="Special">raw <- </span>rest x memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># first is nil</span> <span class="Constant">11</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># rest is nil</span> @@ -190,11 +190,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">local-scope</span> <span class="Comment"># construct (a . nil)</span> s:text<span class="Special"> <- </span>new <span class="Constant">[a]</span> - x:address:cell<span class="Special"> <- </span>new-atom s - y:address:cell<span class="Special"> <- </span>new-pair x, <span class="Constant">0/nil</span> - x2:address:cell<span class="Special"> <- </span>first y + x:&:cell<span class="Special"> <- </span>new-atom s + y:&:cell<span class="Special"> <- </span>new-pair x, <span class="Constant">0/nil</span> + x2:&:cell<span class="Special"> <- </span>first y <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>equal x, x2 - <span class="Constant">11</span>:address:cell/<span class="Special">raw <- </span>rest y + <span class="Constant">11</span>:&:cell/<span class="Special">raw <- </span>rest y memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># first is correct</span> <span class="Constant">11</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># rest is nil</span> @@ -203,31 +203,31 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="SalientComment">## convert lambda text to a tree of cells</span> -<span class="muRecipe">def</span> parse in:address:array:character<span class="muRecipe"> -> </span>out:address:cell [ +<span class="muRecipe">def</span> parse in:text<span class="muRecipe"> -> </span>out:&:cell [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - s:address:stream:character<span class="Special"> <- </span>new-stream in + s:&:stream:char<span class="Special"> <- </span>new-stream in out, s<span class="Special"> <- </span>parse s trace <span class="Constant">2</span>, <span class="Constant">[app/parse]</span>, out ] -<span class="muRecipe">def</span> parse in:address:stream:character<span class="muRecipe"> -> </span>out:address:cell, in:address:stream:character [ +<span class="muRecipe">def</span> parse in:&:stream:char<span class="muRecipe"> -> </span>out:&:cell, in:&:stream:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># skip whitespace</span> in<span class="Special"> <- </span>skip-whitespace in - c:character, eof?:boolean<span class="Special"> <- </span>peek in + c:char, eof?:boolean<span class="Special"> <- </span>peek in <span class="muControl">reply-if</span> eof?, <span class="Constant">0/nil</span> pair?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">40/open-paren</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> pair? <span class="Comment"># atom</span> - b:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> + b:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> <span class="Delimiter">{</span> done?:boolean<span class="Special"> <- </span>end-of-stream? in <span class="muControl">break-if</span> done? <span class="Comment"># stop before close paren or space</span> - c:character<span class="Special"> <- </span>peek in + c:char<span class="Special"> <- </span>peek in done?<span class="Special"> <- </span>equal c, <span class="Constant">41/close-paren</span> <span class="muControl">break-if</span> done? done?<span class="Special"> <- </span>space? c @@ -252,11 +252,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color c<span class="Special"> <- </span>peek in close-paren?:boolean<span class="Special"> <- </span>equal c, <span class="Constant">41/close-paren</span> <span class="muControl">break-if</span> close-paren? - first:address:cell, in<span class="Special"> <- </span>parse in + first:&:cell, in<span class="Special"> <- </span>parse in *out<span class="Special"> <- </span>merge <span class="Constant">1/pair</span>, first, <span class="Constant">0/nil</span> <span class="Delimiter">}</span> <span class="Comment"># read in any remaining elements</span> - curr:address:cell<span class="Special"> <- </span>copy out + curr:&:cell<span class="Special"> <- </span>copy out <span class="Delimiter">{</span> in<span class="Special"> <- </span>skip-whitespace in end?:boolean<span class="Special"> <- </span>end-of-stream? in @@ -271,11 +271,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">break</span> <span class="Constant">+end-pair:label</span> <span class="Delimiter">}</span> <span class="Comment"># still here? read next element of pair</span> - next:address:cell, in<span class="Special"> <- </span>parse in + next:&:cell, in<span class="Special"> <- </span>parse in is-dot?:boolean<span class="Special"> <- </span>atom-match? next, <span class="Constant">[.]</span> <span class="Delimiter">{</span> <span class="muControl">break-if</span> is-dot? - next-curr:address:cell<span class="Special"> <- </span>new-pair next, <span class="Constant">0/nil</span> + next-curr:&:cell<span class="Special"> <- </span>new-pair next, <span class="Constant">0/nil</span> curr<span class="Special"> <- </span>set-rest curr, next-curr curr<span class="Special"> <- </span>rest curr <span class="Delimiter">}</span> @@ -286,7 +286,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color c<span class="Special"> <- </span>peek in not-close-paren?:boolean<span class="Special"> <- </span>not-equal c, <span class="Constant">41/close-paren</span> assert not-close-paren?, <span class="Constant">[')' cannot immediately follow '.']</span> - final:address:cell<span class="Special"> <- </span>parse in + final:&:cell<span class="Special"> <- </span>parse in curr<span class="Special"> <- </span>set-rest curr, final <span class="Comment"># we're not gonna update curr, so better make sure the next iteration</span> <span class="Comment"># is going to end the pair</span> @@ -301,13 +301,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> skip-whitespace in:address:stream:character<span class="muRecipe"> -> </span>in:address:stream:character [ +<span class="muRecipe">def</span> skip-whitespace in:&:stream:char<span class="muRecipe"> -> </span>in:&:stream:char [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> done?:boolean<span class="Special"> <- </span>end-of-stream? in <span class="muControl">reply-if</span> done?, <span class="Constant">0/null</span> - c:character<span class="Special"> <- </span>peek in + c:char<span class="Special"> <- </span>peek in space?:boolean<span class="Special"> <- </span>space? c <span class="muControl">break-unless</span> space? read in <span class="Comment"># skip</span> @@ -315,15 +315,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> to-text x:address:cell<span class="muRecipe"> -> </span>out:address:array:character [ +<span class="muRecipe">def</span> to-text x:&:cell<span class="muRecipe"> -> </span>out:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - buf:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> + buf:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> buf<span class="Special"> <- </span>to-buffer x, buf out<span class="Special"> <- </span>buffer-to-array buf ] -<span class="muRecipe">def</span> to-buffer x:address:cell, buf:address:buffer<span class="muRecipe"> -> </span>buf:address:buffer [ +<span class="muRecipe">def</span> to-buffer x:&:cell, buf:&:buffer<span class="muRecipe"> -> </span>buf:&:buffer [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># base case: empty cell</span> @@ -341,10 +341,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="Comment"># recursive case: pair</span> buf<span class="Special"> <- </span>append buf, <span class="Constant">[< ]</span> - first:address:cell<span class="Special"> <- </span>first x + first:&:cell<span class="Special"> <- </span>first x buf<span class="Special"> <- </span>to-buffer first, buf buf<span class="Special"> <- </span>append buf, <span class="Constant">[ | ]</span> - rest:address:cell<span class="Special"> <- </span>rest x + rest:&:cell<span class="Special"> <- </span>rest x buf<span class="Special"> <- </span>to-buffer rest, buf buf<span class="Special"> <- </span>append buf, <span class="Constant">[ >]</span> ] @@ -352,105 +352,105 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> parse-single-letter-atom [ <span class="Constant">local-scope</span> s:text<span class="Special"> <- </span>new <span class="Constant">[a]</span> - x:address:cell<span class="Special"> <- </span>parse s + x:&:cell<span class="Special"> <- </span>parse s s2:text, <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x, <span class="Constant">atom:variant</span> - <span class="Constant">11</span>:array:character/<span class="Special">raw <- </span>copy *s2 + <span class="Constant">11</span>:@:char/<span class="Special">raw <- </span>copy *s2 memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># parse result is an atom</span> - <span class="Constant">11</span>:array:character<span class="Special"> <- </span><span class="Constant">[a]</span> + <span class="Constant">11</span>:@:char<span class="Special"> <- </span><span class="Constant">[a]</span> ] ] <span class="muScenario">scenario</span> parse-atom [ <span class="Constant">local-scope</span> s:text<span class="Special"> <- </span>new <span class="Constant">[abc]</span> - x:address:cell<span class="Special"> <- </span>parse s + x:&:cell<span class="Special"> <- </span>parse s s2:text, <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x, <span class="Constant">atom:variant</span> - <span class="Constant">11</span>:array:character/<span class="Special">raw <- </span>copy *s2 + <span class="Constant">11</span>:@:char/<span class="Special">raw <- </span>copy *s2 memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># parse result is an atom</span> - <span class="Constant">11</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> + <span class="Constant">11</span>:@:char<span class="Special"> <- </span><span class="Constant">[abc]</span> ] ] <span class="muScenario">scenario</span> parse-list-of-two-atoms [ <span class="Constant">local-scope</span> s:text<span class="Special"> <- </span>new <span class="Constant">[(abc def)]</span> - x:address:cell<span class="Special"> <- </span>parse s + x:&:cell<span class="Special"> <- </span>parse s trace-should-contain [ app/parse: < abc | < <span class="muRecipe">def</span> | <span class="Constant"><></span> > > ] <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>is-pair? x - x1:address:cell<span class="Special"> <- </span>first x - x2:address:cell<span class="Special"> <- </span>rest x + x1:&:cell<span class="Special"> <- </span>first x + x2:&:cell<span class="Special"> <- </span>rest x s1:text, <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x1, <span class="Constant">atom:variant</span> <span class="Constant">12</span>:boolean/<span class="Special">raw <- </span>is-pair? x2 - x3:address:cell<span class="Special"> <- </span>first x2 + x3:&:cell<span class="Special"> <- </span>first x2 s2:text, <span class="Constant">13</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x3, <span class="Constant">atom:variant</span> - <span class="Constant">14</span>:address:cell/<span class="Special">raw <- </span>rest x2 - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *s1 - <span class="Constant">30</span>:array:character/<span class="Special">raw <- </span>copy *s2 + <span class="Constant">14</span>:&:cell/<span class="Special">raw <- </span>rest x2 + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *s1 + <span class="Constant">30</span>:@:char/<span class="Special">raw <- </span>copy *s2 memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># parse result is a pair</span> <span class="Constant">11</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.first is an atom</span> <span class="Constant">12</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.rest is a pair</span> <span class="Constant">13</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.rest.first is an atom</span> <span class="Constant">14</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># result.rest.rest is nil</span> - <span class="Constant">20</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first</span> - <span class="Constant">30</span>:array:character<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest.first</span> + <span class="Constant">20</span>:@:char<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first</span> + <span class="Constant">30</span>:@:char<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest.first</span> ] ] <span class="muScenario">scenario</span> parse-list-with-extra-spaces [ <span class="Constant">local-scope</span> s:text<span class="Special"> <- </span>new <span class="Constant">[ ( abc def ) ]</span> <span class="Comment"># extra spaces</span> - x:address:cell<span class="Special"> <- </span>parse s + x:&:cell<span class="Special"> <- </span>parse s trace-should-contain [ app/parse: < abc | < <span class="muRecipe">def</span> | <span class="Constant"><></span> > > ] <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>is-pair? x - x1:address:cell<span class="Special"> <- </span>first x - x2:address:cell<span class="Special"> <- </span>rest x + x1:&:cell<span class="Special"> <- </span>first x + x2:&:cell<span class="Special"> <- </span>rest x s1:text, <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x1, <span class="Constant">atom:variant</span> <span class="Constant">12</span>:boolean/<span class="Special">raw <- </span>is-pair? x2 - x3:address:cell<span class="Special"> <- </span>first x2 + x3:&:cell<span class="Special"> <- </span>first x2 s2:text, <span class="Constant">13</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x3, <span class="Constant">atom:variant</span> - <span class="Constant">14</span>:address:cell/<span class="Special">raw <- </span>rest x2 - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *s1 - <span class="Constant">30</span>:array:character/<span class="Special">raw <- </span>copy *s2 + <span class="Constant">14</span>:&:cell/<span class="Special">raw <- </span>rest x2 + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *s1 + <span class="Constant">30</span>:@:char/<span class="Special">raw <- </span>copy *s2 memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># parse result is a pair</span> <span class="Constant">11</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.first is an atom</span> <span class="Constant">12</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.rest is a pair</span> <span class="Constant">13</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.rest.first is an atom</span> <span class="Constant">14</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># result.rest.rest is nil</span> - <span class="Constant">20</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first</span> - <span class="Constant">30</span>:array:character<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest.first</span> + <span class="Constant">20</span>:@:char<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first</span> + <span class="Constant">30</span>:@:char<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest.first</span> ] ] <span class="muScenario">scenario</span> parse-list-of-more-than-two-atoms [ <span class="Constant">local-scope</span> s:text<span class="Special"> <- </span>new <span class="Constant">[(abc def ghi)]</span> - x:address:cell<span class="Special"> <- </span>parse s + x:&:cell<span class="Special"> <- </span>parse s trace-should-contain [ app/parse: < abc | < <span class="muRecipe">def</span> | < ghi | <span class="Constant"><></span> > > > ] <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>is-pair? x - x1:address:cell<span class="Special"> <- </span>first x - x2:address:cell<span class="Special"> <- </span>rest x + x1:&:cell<span class="Special"> <- </span>first x + x2:&:cell<span class="Special"> <- </span>rest x s1:text, <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x1, <span class="Constant">atom:variant</span> <span class="Constant">12</span>:boolean/<span class="Special">raw <- </span>is-pair? x2 - x3:address:cell<span class="Special"> <- </span>first x2 + x3:&:cell<span class="Special"> <- </span>first x2 s2:text, <span class="Constant">13</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x3, <span class="Constant">atom:variant</span> - x4:address:cell<span class="Special"> <- </span>rest x2 + x4:&:cell<span class="Special"> <- </span>rest x2 <span class="Constant">14</span>:boolean/<span class="Special">raw <- </span>is-pair? x4 - x5:address:cell<span class="Special"> <- </span>first x4 + x5:&:cell<span class="Special"> <- </span>first x4 s3:text, <span class="Constant">15</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x5, <span class="Constant">atom:variant</span> - <span class="Constant">16</span>:address:cell/<span class="Special">raw <- </span>rest x4 - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *s1 - <span class="Constant">30</span>:array:character/<span class="Special">raw <- </span>copy *s2 - <span class="Constant">40</span>:array:character/<span class="Special">raw <- </span>copy *s3 + <span class="Constant">16</span>:&:cell/<span class="Special">raw <- </span>rest x4 + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *s1 + <span class="Constant">30</span>:@:char/<span class="Special">raw <- </span>copy *s2 + <span class="Constant">40</span>:@:char/<span class="Special">raw <- </span>copy *s3 memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># parse result is a pair</span> <span class="Constant">11</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.first is an atom</span> @@ -459,56 +459,56 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">14</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.rest.rest is a pair</span> <span class="Constant">15</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.rest.rest.first is an atom</span> <span class="Constant">16</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># result.rest.rest.rest is nil</span> - <span class="Constant">20</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first</span> - <span class="Constant">30</span>:array:character<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest.first</span> - <span class="Constant">40</span>:array:character<span class="Special"> <- </span><span class="Constant">[ghi]</span> <span class="Comment"># result.rest.rest</span> + <span class="Constant">20</span>:@:char<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first</span> + <span class="Constant">30</span>:@:char<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest.first</span> + <span class="Constant">40</span>:@:char<span class="Special"> <- </span><span class="Constant">[ghi]</span> <span class="Comment"># result.rest.rest</span> ] ] <span class="muScenario">scenario</span> parse-nested-list [ <span class="Constant">local-scope</span> s:text<span class="Special"> <- </span>new <span class="Constant">[((abc))]</span> - x:address:cell<span class="Special"> <- </span>parse s + x:&:cell<span class="Special"> <- </span>parse s trace-should-contain [ app/parse: < < abc | <span class="Constant"><></span> > | <span class="Constant"><></span> > ] <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>is-pair? x - x1:address:cell<span class="Special"> <- </span>first x + x1:&:cell<span class="Special"> <- </span>first x <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>is-pair? x - x2:address:cell<span class="Special"> <- </span>first x1 + x2:&:cell<span class="Special"> <- </span>first x1 s1:text, <span class="Constant">12</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x2, <span class="Constant">atom:variant</span> - <span class="Constant">13</span>:address:cell/<span class="Special">raw <- </span>rest x1 - <span class="Constant">14</span>:address:cell/<span class="Special">raw <- </span>rest x - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *s1 + <span class="Constant">13</span>:&:cell/<span class="Special">raw <- </span>rest x1 + <span class="Constant">14</span>:&:cell/<span class="Special">raw <- </span>rest x + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *s1 memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># parse result is a pair</span> <span class="Constant">11</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.first is a pair</span> <span class="Constant">12</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.first.first is an atom</span> <span class="Constant">13</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># result.first.rest is nil</span> <span class="Constant">14</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># result.rest is nil</span> - <span class="Constant">20</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first.first</span> + <span class="Constant">20</span>:@:char<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first.first</span> ] ] <span class="muScenario">scenario</span> parse-nested-list-2 [ <span class="Constant">local-scope</span> s:text<span class="Special"> <- </span>new <span class="Constant">[((abc) def)]</span> - x:address:cell<span class="Special"> <- </span>parse s + x:&:cell<span class="Special"> <- </span>parse s trace-should-contain [ app/parse: < < abc | <span class="Constant"><></span> > | < <span class="muRecipe">def</span> | <span class="Constant"><></span> > > ] <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>is-pair? x - x1:address:cell<span class="Special"> <- </span>first x + x1:&:cell<span class="Special"> <- </span>first x <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>is-pair? x - x2:address:cell<span class="Special"> <- </span>first x1 + x2:&:cell<span class="Special"> <- </span>first x1 s1:text, <span class="Constant">12</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x2, <span class="Constant">atom:variant</span> - <span class="Constant">13</span>:address:cell/<span class="Special">raw <- </span>rest x1 - x3:address:cell<span class="Special"> <- </span>rest x - x4:address:cell<span class="Special"> <- </span>first x3 + <span class="Constant">13</span>:&:cell/<span class="Special">raw <- </span>rest x1 + x3:&:cell<span class="Special"> <- </span>rest x + x4:&:cell<span class="Special"> <- </span>first x3 s2:text, <span class="Constant">14</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x4, <span class="Constant">atom:variant</span> - <span class="Constant">15</span>:address:cell/<span class="Special">raw <- </span>rest x3 - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *s1 - <span class="Constant">30</span>:array:character/<span class="Special">raw <- </span>copy *s2 + <span class="Constant">15</span>:&:cell/<span class="Special">raw <- </span>rest x3 + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *s1 + <span class="Constant">30</span>:@:char/<span class="Special">raw <- </span>copy *s2 memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># parse result is a pair</span> <span class="Constant">11</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.first is a pair</span> @@ -516,8 +516,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Constant">13</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># result.first.rest is nil</span> <span class="Constant">14</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.rest.first is an atom</span> <span class="Constant">15</span><span class="Special"> <- </span><span class="Constant">0</span> <span class="Comment"># result.rest.rest is nil</span> - <span class="Constant">20</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first.first</span> - <span class="Constant">30</span>:array:character<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest.first</span> + <span class="Constant">20</span>:@:char<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first.first</span> + <span class="Constant">30</span>:@:char<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest.first</span> ] ] @@ -527,7 +527,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="CommentedCode">#? local-scope</span> <span class="CommentedCode">#? s:text <- new [(]</span> <span class="CommentedCode">#? #? hide-errors</span> -<span class="CommentedCode">#? x:address:cell <- parse s</span> +<span class="CommentedCode">#? x:&:cell <- parse s</span> <span class="CommentedCode">#? #? show-errors</span> <span class="CommentedCode">#? trace-should-contain [</span> <span class="CommentedCode">#? error: unbalanced '(' in expression</span> @@ -538,7 +538,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="CommentedCode">#? local-scope</span> <span class="CommentedCode">#? s:text <- new [(abc]</span> <span class="CommentedCode">#? #? hide-errors</span> -<span class="CommentedCode">#? x:address:cell <- parse s</span> +<span class="CommentedCode">#? x:&:cell <- parse s</span> <span class="CommentedCode">#? #? show-errors</span> <span class="CommentedCode">#? trace-should-contain [</span> <span class="CommentedCode">#? error: unbalanced '(' in expression</span> @@ -548,69 +548,69 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muScenario">scenario</span> parse-dotted-list-of-two-atoms [ <span class="Constant">local-scope</span> s:text<span class="Special"> <- </span>new <span class="Constant">[(abc . def)]</span> - x:address:cell<span class="Special"> <- </span>parse s + x:&:cell<span class="Special"> <- </span>parse s trace-should-contain [ app/parse: < abc | <span class="muRecipe">def</span> > ] <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>is-pair? x - x1:address:cell<span class="Special"> <- </span>first x - x2:address:cell<span class="Special"> <- </span>rest x + x1:&:cell<span class="Special"> <- </span>first x + x2:&:cell<span class="Special"> <- </span>rest x s1:text, <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x1, <span class="Constant">atom:variant</span> s2:text, <span class="Constant">12</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x2, <span class="Constant">atom:variant</span> - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *s1 - <span class="Constant">30</span>:array:character/<span class="Special">raw <- </span>copy *s2 + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *s1 + <span class="Constant">30</span>:@:char/<span class="Special">raw <- </span>copy *s2 memory-should-contain [ <span class="Comment"># parses to < abc | def ></span> <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># parse result is a pair</span> <span class="Constant">11</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.first is an atom</span> <span class="Constant">12</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.rest is an atom</span> - <span class="Constant">20</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first</span> - <span class="Constant">30</span>:array:character<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest</span> + <span class="Constant">20</span>:@:char<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first</span> + <span class="Constant">30</span>:@:char<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest</span> ] ] <span class="muScenario">scenario</span> parse-dotted-list-of-more-than-two-atoms [ <span class="Constant">local-scope</span> s:text<span class="Special"> <- </span>new <span class="Constant">[(abc def . ghi)]</span> - x:address:cell<span class="Special"> <- </span>parse s + x:&:cell<span class="Special"> <- </span>parse s trace-should-contain [ app/parse: < abc | < <span class="muRecipe">def</span> | ghi > > ] <span class="Constant">10</span>:boolean/<span class="Special">raw <- </span>is-pair? x - x1:address:cell<span class="Special"> <- </span>first x - x2:address:cell<span class="Special"> <- </span>rest x + x1:&:cell<span class="Special"> <- </span>first x + x2:&:cell<span class="Special"> <- </span>rest x s1:text, <span class="Constant">11</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x1, <span class="Constant">atom:variant</span> <span class="Constant">12</span>:boolean/<span class="Special">raw <- </span>is-pair? x2 - x3:address:cell<span class="Special"> <- </span>first x2 + x3:&:cell<span class="Special"> <- </span>first x2 s2:text, <span class="Constant">13</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x3, <span class="Constant">atom:variant</span> - x4:address:cell<span class="Special"> <- </span>rest x2 + x4:&:cell<span class="Special"> <- </span>rest x2 s3:text, <span class="Constant">14</span>:boolean/<span class="Special">raw <- </span>maybe-convert *x4, <span class="Constant">atom:variant</span> - <span class="Constant">20</span>:array:character/<span class="Special">raw <- </span>copy *s1 - <span class="Constant">30</span>:array:character/<span class="Special">raw <- </span>copy *s2 - <span class="Constant">40</span>:array:character/<span class="Special">raw <- </span>copy *s3 + <span class="Constant">20</span>:@:char/<span class="Special">raw <- </span>copy *s1 + <span class="Constant">30</span>:@:char/<span class="Special">raw <- </span>copy *s2 + <span class="Constant">40</span>:@:char/<span class="Special">raw <- </span>copy *s3 memory-should-contain [ <span class="Constant">10</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># parse result is a pair</span> <span class="Constant">11</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.first is an atom</span> <span class="Constant">12</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.rest is a pair</span> <span class="Constant">13</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.rest.first is an atom</span> <span class="Constant">14</span><span class="Special"> <- </span><span class="Constant">1</span> <span class="Comment"># result.rest.rest is an atom</span> - <span class="Constant">20</span>:array:character<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first</span> - <span class="Constant">30</span>:array:character<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest.first</span> - <span class="Constant">40</span>:array:character<span class="Special"> <- </span><span class="Constant">[ghi]</span> <span class="Comment"># result.rest.rest</span> + <span class="Constant">20</span>:@:char<span class="Special"> <- </span><span class="Constant">[abc]</span> <span class="Comment"># result.first</span> + <span class="Constant">30</span>:@:char<span class="Special"> <- </span><span class="Constant">[def]</span> <span class="Comment"># result.rest.first</span> + <span class="Constant">40</span>:@:char<span class="Special"> <- </span><span class="Constant">[ghi]</span> <span class="Comment"># result.rest.rest</span> ] ] <span class="SalientComment">## convert tree of cells to mu text</span> -<span class="muRecipe">def</span> to-mu in:address:cell<span class="muRecipe"> -> </span>out:address:array:character [ +<span class="muRecipe">def</span> to-mu in:&:cell<span class="muRecipe"> -> </span>out:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - buf:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> + buf:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">30</span> buf<span class="Special"> <- </span>to-mu in, buf out<span class="Special"> <- </span>buffer-to-array buf ] -<span class="muRecipe">def</span> to-mu in:address:cell, buf:address:buffer<span class="muRecipe"> -> </span>buf:address:buffer, result-name:address:array:character [ +<span class="muRecipe">def</span> to-mu in:&:cell, buf:&:buffer<span class="muRecipe"> -> </span>buf:&:buffer, result-name:text [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># null cell? no change.</span> diff --git a/html/mutable.mu.html b/html/mutable.mu.html index f4cb97b6..f8557ee0 100644 --- a/html/mutable.mu.html +++ b/html/mutable.mu.html @@ -32,11 +32,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">def</span> main [ <span class="Constant">local-scope</span> - x:address:number<span class="Special"> <- </span>new <span class="Constant">number:type</span> + x:&:num<span class="Special"> <- </span>new <span class="Constant">number:type</span> foo x ] -<span class="muRecipe">def</span> foo x:address:number<span class="muRecipe"> -> </span>x:address:number [ +<span class="muRecipe">def</span> foo x:&:num<span class="muRecipe"> -> </span>x:&:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> *x<span class="Special"> <- </span>copy <span class="Constant">34</span> diff --git a/html/nqueens.mu.html b/html/nqueens.mu.html index fcc9c791..b05a8618 100644 --- a/html/nqueens.mu.html +++ b/html/nqueens.mu.html @@ -33,17 +33,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <pre id='vimCodeElement'> <span class="Comment"># <a href="http://rosettacode.org/wiki/N-queens_problem">http://rosettacode.org/wiki/N-queens_problem</a></span> <span class="Comment"># port of the Arc solution at <a href="http://arclanguage.org/item?id=19743">http://arclanguage.org/item?id=19743</a></span> +<span class="Comment"># run with tracing turned on:</span> +<span class="Comment"># ./mu --trace nqueens.mu</span> <span class="muData">container</span> square [ - rank:number - file:number + rank:num + file:num ] -<span class="muRecipe">def</span> nqueens n:number, queens:address:list:square<span class="muRecipe"> -> </span>result:number [ +<span class="muRecipe">def</span> nqueens n:num, queens:&:list:square<span class="muRecipe"> -> </span>result:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Comment"># if 'queens' is already long enough, print it and return</span> - added-so-far:number<span class="Special"> <- </span>length queens + added-so-far:num<span class="Special"> <- </span>length queens <span class="Delimiter">{</span> done?:boolean<span class="Special"> <- </span>greater-or-equal added-so-far, n <span class="muControl">break-unless</span> done? @@ -51,15 +53,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">return</span> <span class="Constant">1</span> <span class="Delimiter">}</span> <span class="Comment"># still work to do</span> - next-rank:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + next-rank:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> queens first:square<span class="Special"> <- </span>first queens - existing-rank:number<span class="Special"> <- </span>get first, <span class="Constant">rank:offset</span> + existing-rank:num<span class="Special"> <- </span>get first, <span class="Constant">rank:offset</span> next-rank<span class="Special"> <- </span>add existing-rank, <span class="Constant">1</span> <span class="Delimiter">}</span> result<span class="Special"> <- </span>copy <span class="Constant">0</span> - next-file:number<span class="Special"> <- </span>copy <span class="Constant">0</span> + next-file:num<span class="Special"> <- </span>copy <span class="Constant">0</span> <span class="Delimiter">{</span> done?:boolean<span class="Special"> <- </span>greater-or-equal next-file, n <span class="muControl">break-if</span> done? @@ -67,8 +69,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">{</span> curr-conflicts?:boolean<span class="Special"> <- </span>conflict? curr, queens <span class="muControl">break-if</span> curr-conflicts? - new-queens:address:list:square<span class="Special"> <- </span>push curr, queens - sub-result:number<span class="Special"> <- </span>nqueens n, new-queens + new-queens:&:list:square<span class="Special"> <- </span>push curr, queens + sub-result:num<span class="Special"> <- </span>nqueens n, new-queens result<span class="Special"> <- </span>add result, sub-result <span class="Delimiter">}</span> next-file<span class="Special"> <- </span>add next-file, <span class="Constant">1</span> @@ -76,7 +78,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> ] -<span class="muRecipe">def</span> conflict? curr:square, queens:address:list:square<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> conflict? curr:square, queens:&:list:square<span class="muRecipe"> -> </span>result:boolean [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> result1:boolean<span class="Special"> <- </span>conflicting-file? curr, queens @@ -85,14 +87,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">reply</span> result2 ] -<span class="muRecipe">def</span> conflicting-file? curr:square, queens:address:list:square<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> conflicting-file? curr:square, queens:&:list:square<span class="muRecipe"> -> </span>result:boolean [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - curr-file:number<span class="Special"> <- </span>get curr, <span class="Constant">file:offset</span> + curr-file:num<span class="Special"> <- </span>get curr, <span class="Constant">file:offset</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> queens q:square<span class="Special"> <- </span>first queens - qfile:number<span class="Special"> <- </span>get q, <span class="Constant">file:offset</span> + qfile:num<span class="Special"> <- </span>get q, <span class="Constant">file:offset</span> file-match?:boolean<span class="Special"> <- </span>equal curr-file, qfile <span class="muControl">reply-if</span> file-match?, <span class="Constant">1/conflict-found</span> queens<span class="Special"> <- </span>rest queens @@ -101,18 +103,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muControl">reply</span> <span class="Constant">0/no-conflict-found</span> ] -<span class="muRecipe">def</span> conflicting-diagonal? curr:square, queens:address:list:square<span class="muRecipe"> -> </span>result:boolean [ +<span class="muRecipe">def</span> conflicting-diagonal? curr:square, queens:&:list:square<span class="muRecipe"> -> </span>result:boolean [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> - curr-rank:number<span class="Special"> <- </span>get curr, <span class="Constant">rank:offset</span> - curr-file:number<span class="Special"> <- </span>get curr, <span class="Constant">file:offset</span> + curr-rank:num<span class="Special"> <- </span>get curr, <span class="Constant">rank:offset</span> + curr-file:num<span class="Special"> <- </span>get curr, <span class="Constant">file:offset</span> <span class="Delimiter">{</span> <span class="muControl">break-unless</span> queens q:square<span class="Special"> <- </span>first queens - qrank:number<span class="Special"> <- </span>get q, <span class="Constant">rank:offset</span> - qfile:number<span class="Special"> <- </span>get q, <span class="Constant">file:offset</span> - rank-delta:number<span class="Special"> <- </span>subtract qrank, curr-rank - file-delta:number<span class="Special"> <- </span>subtract qfile, curr-file + qrank:num<span class="Special"> <- </span>get q, <span class="Constant">rank:offset</span> + qfile:num<span class="Special"> <- </span>get q, <span class="Constant">file:offset</span> + rank-delta:num<span class="Special"> <- </span>subtract qrank, curr-rank + file-delta:num<span class="Special"> <- </span>subtract qfile, curr-file rank-delta<span class="Special"> <- </span>abs rank-delta file-delta<span class="Special"> <- </span>abs file-delta diagonal-match?:boolean<span class="Special"> <- </span>equal rank-delta, file-delta @@ -122,6 +124,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Delimiter">}</span> <span class="muControl">reply</span> <span class="Constant">0/no-conflict-found</span> ] + +<span class="muRecipe">def</span> main [ + nqueens <span class="Constant">4</span> + $dump-trace <span class="Constant">[app]</span> +] </pre> </body> </html> diff --git a/html/real_files.mu.html b/html/real_files.mu.html index 7046a633..90700144 100644 --- a/html/real_files.mu.html +++ b/html/real_files.mu.html @@ -35,9 +35,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">def</span> main [ <span class="Constant">local-scope</span> - f:number/file<span class="Special"> <- </span>$open-file-for-reading <span class="Constant">[/tmp/mu-x]</span> + f:num/file<span class="Special"> <- </span>$open-file-for-reading <span class="Constant">[/tmp/mu-x]</span> $print <span class="Constant">[file to read from: ]</span>, f, <span class="Constant">10/newline</span> - c:character, eof?:boolean<span class="Special"> <- </span>$read-from-file f + c:char, eof?:boolean<span class="Special"> <- </span>$read-from-file f $print <span class="Constant">[copying ]</span>, c, <span class="Constant">10/newline</span> f<span class="Special"> <- </span>$close-file f $print <span class="Constant">[file after closing: ]</span>, f, <span class="Constant">10/newline</span> diff --git a/html/screen.mu.html b/html/screen.mu.html index b178a778..8ad9d732 100644 --- a/html/screen.mu.html +++ b/html/screen.mu.html @@ -34,14 +34,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># screens.</span> <span class="muRecipe">def</span> main [ open-console - <span class="Constant">10</span>:character<span class="Special"> <- </span>copy <span class="Constant">97/a</span> - print <span class="Constant">0/screen</span>, <span class="Constant">10</span>:character/a, <span class="Constant">2/red</span> - <span class="Constant">1</span>:number/<span class="Special">raw</span>, <span class="Constant">2</span>:number/<span class="Special">raw <- </span>cursor-position <span class="Constant">0/screen</span> + <span class="Constant">10</span>:char<span class="Special"> <- </span>copy <span class="Constant">97/a</span> + print <span class="Constant">0/screen</span>, <span class="Constant">10</span>:char/a, <span class="Constant">2/red</span> + <span class="Constant">1</span>:num/<span class="Special">raw</span>, <span class="Constant">2</span>:num/<span class="Special">raw <- </span>cursor-position <span class="Constant">0/screen</span> wait-for-event <span class="Constant">0/console</span> clear-screen <span class="Constant">0/screen</span> move-cursor <span class="Constant">0/screen</span>, <span class="Constant">0/row</span>, <span class="Constant">4/column</span> - <span class="Constant">10</span>:character<span class="Special"> <- </span>copy <span class="Constant">98/b</span> - print <span class="Constant">0/screen</span>, <span class="Constant">10</span>:character + <span class="Constant">10</span>:char<span class="Special"> <- </span>copy <span class="Constant">98/b</span> + print <span class="Constant">0/screen</span>, <span class="Constant">10</span>:char wait-for-event <span class="Constant">0/console</span> move-cursor <span class="Constant">0/screen</span>, <span class="Constant">0/row</span>, <span class="Constant">0/column</span> clear-line <span class="Constant">0/screen</span> diff --git a/html/server-socket.mu.html b/html/server-socket.mu.html index 32782b5a..5c11d638 100644 --- a/html/server-socket.mu.html +++ b/html/server-socket.mu.html @@ -31,12 +31,12 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <pre id='vimCodeElement'> <span class="muRecipe">def</span> main [ <span class="Constant">local-scope</span> - socket:number<span class="Special"> <- </span>$socket <span class="Constant">8080/port</span> + socket:num<span class="Special"> <- </span>$socket <span class="Constant">8080/port</span> $print <span class="Constant">[Mu socket creation returned ]</span>, socket, <span class="Constant">10/newline</span> - session:number<span class="Special"> <- </span>$accept socket + session:num<span class="Special"> <- </span>$accept socket <span class="Delimiter">{</span> - client-message:address:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">1024</span> - c:character<span class="Special"> <- </span>$read-from-socket session + client-message:&:buffer<span class="Special"> <- </span>new-buffer <span class="Constant">1024</span> + c:char<span class="Special"> <- </span>$read-from-socket session <span class="muControl">break-unless</span> c $print c <span class="muControl">loop</span> diff --git a/html/static_dispatch.mu.html b/html/static_dispatch.mu.html index 3e03b537..22097281 100644 --- a/html/static_dispatch.mu.html +++ b/html/static_dispatch.mu.html @@ -28,13 +28,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color </head> <body> <pre id='vimCodeElement'> -<span class="muRecipe">def</span> test a:number<span class="muRecipe"> -> </span>b:number [ +<span class="muRecipe">def</span> test a:num<span class="muRecipe"> -> </span>b:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> b<span class="Special"> <- </span>add a, <span class="Constant">1</span> ] -<span class="muRecipe">def</span> test a:number, b:number<span class="muRecipe"> -> </span>c:number [ +<span class="muRecipe">def</span> test a:num, b:num<span class="muRecipe"> -> </span>c:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> c<span class="Special"> <- </span>add a, b @@ -42,11 +42,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">def</span> main [ <span class="Constant">local-scope</span> - a:number<span class="Special"> <- </span>test <span class="Constant">3</span> <span class="Comment"># selects single-ingredient version</span> + a:num<span class="Special"> <- </span>test <span class="Constant">3</span> <span class="Comment"># selects single-ingredient version</span> $print a, <span class="Constant">10/newline</span> - b:number<span class="Special"> <- </span>test <span class="Constant">3</span>, <span class="Constant">4</span> <span class="Comment"># selects double-ingredient version</span> + b:num<span class="Special"> <- </span>test <span class="Constant">3</span>, <span class="Constant">4</span> <span class="Comment"># selects double-ingredient version</span> $print b, <span class="Constant">10/newline</span> - c:number<span class="Special"> <- </span>test <span class="Constant">3</span>, <span class="Constant">4</span>, <span class="Constant">5</span> <span class="Comment"># prefers double- to single-ingredient version</span> + c:num<span class="Special"> <- </span>test <span class="Constant">3</span>, <span class="Constant">4</span>, <span class="Constant">5</span> <span class="Comment"># prefers double- to single-ingredient version</span> $print c, <span class="Constant">10/newline</span> ] </pre> diff --git a/html/tangle.mu.html b/html/tangle.mu.html index da54e95f..fb077e0b 100644 --- a/html/tangle.mu.html +++ b/html/tangle.mu.html @@ -38,7 +38,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># This isn't a very tasteful example, just a simple demonstration of</span> <span class="Comment"># possibilities.</span> -<span class="muRecipe">def</span> factorial n:number<span class="muRecipe"> -> </span>result:number [ +<span class="muRecipe">def</span> factorial n:num<span class="muRecipe"> -> </span>result:num [ <span class="Constant">local-scope</span> <span class="Constant">load-ingredients</span> <span class="Delimiter">{</span> @@ -56,15 +56,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="muRecipe">after</span> <span class="Constant"><recursive-case></span> [ <span class="Comment"># return n * factorial(n - 1)</span> - x:number<span class="Special"> <- </span>subtract n, <span class="Constant">1</span> - subresult:number<span class="Special"> <- </span>factorial x + x:num<span class="Special"> <- </span>subtract n, <span class="Constant">1</span> + subresult:num<span class="Special"> <- </span>factorial x result<span class="Special"> <- </span>multiply subresult, n ] <span class="muRecipe">def</span> main [ - <span class="Constant">1</span>:number<span class="Special"> <- </span>factorial <span class="Constant">5</span> + <span class="Constant">1</span>:num<span class="Special"> <- </span>factorial <span class="Constant">5</span> <span class="Comment"># trailing space in next line is to help with syntax highlighting</span> - $print <span class="Constant">[result: ]</span>, <span class="Constant">1</span>:number, <span class="Constant">[ </span> + $print <span class="Constant">[result: ]</span>, <span class="Constant">1</span>:num, <span class="Constant">[ </span> <span class="Constant">]</span> ] </pre> diff --git a/html/x.mu.html b/html/x.mu.html index eb124c22..c424087b 100644 --- a/html/x.mu.html +++ b/html/x.mu.html @@ -31,9 +31,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color <span class="Comment"># example program: add two numbers</span> <span class="muRecipe">def</span> main [ - <span class="Constant">11</span>:number<span class="Special"> <- </span>copy <span class="Constant">1</span> - <span class="Constant">12</span>:number<span class="Special"> <- </span>copy <span class="Constant">3</span> - <span class="Constant">13</span>:number<span class="Special"> <- </span>add <span class="Constant">11</span>:number, <span class="Constant">12</span>:number + <span class="Constant">11</span>:num<span class="Special"> <- </span>copy <span class="Constant">1</span> + <span class="Constant">12</span>:num<span class="Special"> <- </span>copy <span class="Constant">3</span> + <span class="Constant">13</span>:num<span class="Special"> <- </span>add <span class="Constant">11</span>:num, <span class="Constant">12</span>:num <span class="Constant"> $dump-memory</span> ] </pre> |