4166

2 files changed, 20 insertions, 20 deletions

diff --git a/chessboard.mu b/chessboard.mu
index c8ca6ba5..946708e1 100644
--- a/chessboard.mu
+++ b/chessboard.mu
@@ -31,7 +31,7 @@ scenario print-board-and-read-move [
 ]
   ]
   run [
-    screen:&:screen, console:&:console <- chessboard screen:&:screen, console:&:console
+    screen, console <- chessboard screen, console
     # icon for the cursor
     cursor-icon:char <- copy 9251/␣
     screen <- print screen, cursor-icon
@@ -80,7 +80,7 @@ def chessboard screen:&:screen, console:&:console -> screen:&:screen, console:&:
     print screen, [Stupid text-mode chessboard. White pieces in uppercase; black pieces in lowercase. No checking for legal moves.
 ]
     cursor-to-next-line screen
-    print-board screen, board
+    print screen, board
     cursor-to-next-line screen
     print screen, [Type in your move as <from square>-<to square>. For example: 'a2-a4'. Then press <enter>.
 ]
@@ -141,7 +141,7 @@ def new-file position:&:@:char, index:num -> result:&:@:char [
   }
 ]
 
-def print-board screen:&:screen, board:board -> screen:&:screen [
+def print screen:&:screen, board:board -> screen:&:screen [
   local-scope
   load-inputs
   row:num <- copy 7  # start printing from the top of the board
@@ -205,7 +205,7 @@ scenario printing-the-board [
   board:board <- initial-position
   assume-screen 30/width, 12/height
   run [
-    screen:&:screen <- print-board screen:&:screen, board
+    screen <- print screen, board
   ]
   screen-should-contain [
   #  012345678901234567890123456789
@@ -356,7 +356,7 @@ scenario read-move-blocking [
   local-scope
   assume-screen 20/width, 2/height
   source:&:source:char, sink:&:sink:char <- new-channel 2/capacity
-  read-move-routine:num/routine <- start-running read-move, source, screen:&:screen
+  read-move-routine:num/routine <- start-running read-move, source, screen
   run [
     # 'read-move' is waiting for keypress
     wait-for-routine-to-block read-move-routine
@@ -429,7 +429,7 @@ scenario read-move-quit [
   local-scope
   assume-screen 20/width, 2/height
   source:&:source:char, sink:&:sink:char <- new-channel 2/capacity
-  read-move-routine:num <- start-running read-move, source, screen:&:screen
+  read-move-routine:num <- start-running read-move, source, screen
   run [
     # 'read-move' is waiting for keypress
     wait-for-routine-to-block read-move-routine
@@ -457,7 +457,7 @@ scenario read-move-illegal-file [
   local-scope
   assume-screen 20/width, 2/height
   source:&:source:char, sink:&:sink:char <- new-channel 2/capacity
-  read-move-routine:num <- start-running read-move, source, screen:&:screen
+  read-move-routine:num <- start-running read-move, source, screen
   run [
     # 'read-move' is waiting for keypress
     wait-for-routine-to-block read-move-routine
@@ -479,7 +479,7 @@ scenario read-move-illegal-rank [
   local-scope
   assume-screen 20/width, 2/height
   source:&:source:char, sink:&:sink:char <- new-channel 2/capacity
-  read-move-routine:num <- start-running read-move, source, screen:&:screen
+  read-move-routine:num <- start-running read-move, source, screen
   run [
     # 'read-move' is waiting for keypress
     wait-for-routine-to-block read-move-routine
@@ -502,7 +502,7 @@ scenario read-move-empty [
   local-scope
   assume-screen 20/width, 2/height
   source:&:source:char, sink:&:sink:char <- new-channel 2/capacity
-  read-move-routine:num <- start-running read-move, source, screen:&:screen
+  read-move-routine:num <- start-running read-move, source, screen
   run [
     # 'read-move' is waiting for keypress
     wait-for-routine-to-block read-move-routine
@@ -543,7 +543,7 @@ scenario making-a-move [
   *move <- merge 6/g, 1/'2', 6/g, 3/'4'
   run [
     board <- make-move board, move
-    screen:&:screen <- print-board screen:&:screen, board
+    screen <- print screen, board
   ]
   screen-should-contain [
   #  012345678901234567890123456789
diff --git a/html/chessboard.mu.html b/html/chessboard.mu.html
index 34e6d9ee..f7ed3205 100644
--- a/html/chessboard.mu.html
+++ b/html/chessboard.mu.html
@@ -95,7 +95,7 @@ if ('onhashchange' in window) {
 <span id="L31" class="LineNr"> 31 </span><span class="Constant">]</span>
 <span id="L32" class="LineNr"> 32 </span>  ]
 <span id="L33" class="LineNr"> 33 </span>  run [
-<span id="L34" class="LineNr"> 34 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>, <a href='084console.mu.html#L23'>console</a>:&amp;:<a href='084console.mu.html#L23'>console</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L69'>chessboard</a> <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>, <a href='084console.mu.html#L23'>console</a>:&amp;:<a href='084console.mu.html#L23'>console</a>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L16'>screen</a>, <a href='084console.mu.html#L23'>console</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L69'>chessboard</a> <a href='081print.mu.html#L16'>screen</a>, <a href='084console.mu.html#L23'>console</a>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Conceal">¦</span> <span class="Comment"># icon for the cursor</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Conceal">¦</span> cursor-icon:char <span class="Special">&lt;-</span> copy <span class="Constant">9251/␣</span>
 <span id="L37" class="LineNr"> 37 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L16'>screen</a> <span class="Special">&lt;-</span> print <a href='081print.mu.html#L16'>screen</a>, cursor-icon
@@ -144,7 +144,7 @@ if ('onhashchange' in window) {
 <span id="L80" class="LineNr"> 80 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[Stupid text-mode chessboard. White pieces in uppercase; black pieces in lowercase. No checking for legal moves.</span>
 <span id="L81" class="LineNr"> 81 </span><span class="Constant">]</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L752'>cursor-to-next-line</a> <a href='081print.mu.html#L16'>screen</a>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Conceal">¦</span> <a href='chessboard.mu.html#L144'>print-board</a> <a href='081print.mu.html#L16'>screen</a>, <a href='chessboard.mu.html#L67'>board</a>
+<span id="L83" class="LineNr"> 83 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <a href='chessboard.mu.html#L67'>board</a>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L752'>cursor-to-next-line</a> <a href='081print.mu.html#L16'>screen</a>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Conceal">¦</span> print <a href='081print.mu.html#L16'>screen</a>, <span class="Constant">[Type in your <a href='chessboard.mu.html#L229'>move</a> as &lt;from square&gt;-&lt;to square&gt;. For example: 'a2-a4'. Then press &lt;enter&gt;.</span>
 <span id="L86" class="LineNr"> 86 </span><span class="Constant">]</span>
@@ -205,7 +205,7 @@ if ('onhashchange' in window) {
 <span id="L141" class="LineNr">141 </span>  <span class="Delimiter">}</span>
 <span id="L142" class="LineNr">142 </span>]
 <span id="L143" class="LineNr">143 </span>
-<span id="L144" class="LineNr">144 </span><span class="muRecipe">def</span> <a href='chessboard.mu.html#L144'>print-board</a> <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>, <a href='chessboard.mu.html#L67'>board</a>:<a href='chessboard.mu.html#L67'>board</a><span class="muRecipe"> -&gt; </span><a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a> [
+<span id="L144" class="LineNr">144 </span><span class="muRecipe">def</span> print <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>, <a href='chessboard.mu.html#L67'>board</a>:<a href='chessboard.mu.html#L67'>board</a><span class="muRecipe"> -&gt; </span><a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a> [
 <span id="L145" class="LineNr">145 </span>  <span class="Constant">local-scope</span>
 <span id="L146" class="LineNr">146 </span>  <span class="Constant">load-inputs</span>
 <span id="L147" class="LineNr">147 </span>  row:num <span class="Special">&lt;-</span> copy<span class="Constant"> 7</span>  <span class="Comment"># start printing from the top of the board</span>
@@ -269,7 +269,7 @@ if ('onhashchange' in window) {
 <span id="L205" class="LineNr">205 </span>  <a href='chessboard.mu.html#L67'>board</a>:<a href='chessboard.mu.html#L67'>board</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L180'>initial-position</a>
 <span id="L206" class="LineNr">206 </span>  assume-screen <span class="Constant">30/width</span>, <span class="Constant">12/height</span>
 <span id="L207" class="LineNr">207 </span>  run [
-<span id="L208" class="LineNr">208 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L144'>print-board</a> <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>, <a href='chessboard.mu.html#L67'>board</a>
+<span id="L208" class="LineNr">208 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L16'>screen</a> <span class="Special">&lt;-</span> print <a href='081print.mu.html#L16'>screen</a>, <a href='chessboard.mu.html#L67'>board</a>
 <span id="L209" class="LineNr">209 </span>  ]
 <span id="L210" class="LineNr">210 </span>  screen-should-contain [
 <span id="L211" class="LineNr">211 </span>  <span class="Comment">#  012345678901234567890123456789</span>
@@ -420,7 +420,7 @@ if ('onhashchange' in window) {
 <span id="L356" class="LineNr">356 </span>  <span class="Constant">local-scope</span>
 <span id="L357" class="LineNr">357 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
 <span id="L358" class="LineNr">358 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
-<span id="L359" class="LineNr">359 </span>  read-move-routine:num/routine <span class="Special">&lt;-</span> <span class="muControl">start-running</span> <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
+<span id="L359" class="LineNr">359 </span>  read-move-routine:num/routine <span class="Special">&lt;-</span> <span class="muControl">start-running</span> <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>
 <span id="L360" class="LineNr">360 </span>  run [
 <span id="L361" class="LineNr">361 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for keypress</span>
 <span id="L362" class="LineNr">362 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
@@ -493,7 +493,7 @@ if ('onhashchange' in window) {
 <span id="L429" class="LineNr">429 </span>  <span class="Constant">local-scope</span>
 <span id="L430" class="LineNr">430 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
 <span id="L431" class="LineNr">431 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
-<span id="L432" class="LineNr">432 </span>  read-move-routine:num <span class="Special">&lt;-</span> <span class="muControl">start-running</span> <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
+<span id="L432" class="LineNr">432 </span>  read-move-routine:num <span class="Special">&lt;-</span> <span class="muControl">start-running</span> <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>
 <span id="L433" class="LineNr">433 </span>  run [
 <span id="L434" class="LineNr">434 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for keypress</span>
 <span id="L435" class="LineNr">435 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
@@ -521,7 +521,7 @@ if ('onhashchange' in window) {
 <span id="L457" class="LineNr">457 </span>  <span class="Constant">local-scope</span>
 <span id="L458" class="LineNr">458 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
 <span id="L459" class="LineNr">459 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
-<span id="L460" class="LineNr">460 </span>  read-move-routine:num <span class="Special">&lt;-</span> <span class="muControl">start-running</span> <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
+<span id="L460" class="LineNr">460 </span>  read-move-routine:num <span class="Special">&lt;-</span> <span class="muControl">start-running</span> <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>
 <span id="L461" class="LineNr">461 </span>  run [
 <span id="L462" class="LineNr">462 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for keypress</span>
 <span id="L463" class="LineNr">463 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
@@ -543,7 +543,7 @@ if ('onhashchange' in window) {
 <span id="L479" class="LineNr">479 </span>  <span class="Constant">local-scope</span>
 <span id="L480" class="LineNr">480 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
 <span id="L481" class="LineNr">481 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
-<span id="L482" class="LineNr">482 </span>  read-move-routine:num <span class="Special">&lt;-</span> <span class="muControl">start-running</span> <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
+<span id="L482" class="LineNr">482 </span>  read-move-routine:num <span class="Special">&lt;-</span> <span class="muControl">start-running</span> <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>
 <span id="L483" class="LineNr">483 </span>  run [
 <span id="L484" class="LineNr">484 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for keypress</span>
 <span id="L485" class="LineNr">485 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
@@ -566,7 +566,7 @@ if ('onhashchange' in window) {
 <span id="L502" class="LineNr">502 </span>  <span class="Constant">local-scope</span>
 <span id="L503" class="LineNr">503 </span>  assume-screen <span class="Constant">20/width</span>, <span class="Constant">2/height</span>
 <span id="L504" class="LineNr">504 </span>  <a href='075channel.mu.html#L43'>source</a>:&amp;:<a href='075channel.mu.html#L43'>source</a>:char, <a href='075channel.mu.html#L47'>sink</a>:&amp;:<a href='075channel.mu.html#L47'>sink</a>:char <span class="Special">&lt;-</span> <a href='075channel.mu.html#L51'>new-channel</a> <span class="Constant">2/capacity</span>
-<span id="L505" class="LineNr">505 </span>  read-move-routine:num <span class="Special">&lt;-</span> <span class="muControl">start-running</span> <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>
+<span id="L505" class="LineNr">505 </span>  read-move-routine:num <span class="Special">&lt;-</span> <span class="muControl">start-running</span> <a href='chessboard.mu.html#L238'>read-move</a>, <a href='075channel.mu.html#L43'>source</a>, <a href='081print.mu.html#L16'>screen</a>
 <span id="L506" class="LineNr">506 </span>  run [
 <span id="L507" class="LineNr">507 </span>  <span class="Conceal">¦</span> <span class="Comment"># 'read-move' is waiting for keypress</span>
 <span id="L508" class="LineNr">508 </span>  <span class="Conceal">¦</span> wait-for-routine-to-block read-move-routine
@@ -607,7 +607,7 @@ if ('onhashchange' in window) {
 <span id="L543" class="LineNr">543 </span>  *move <span class="Special">&lt;-</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>
 <span id="L544" class="LineNr">544 </span>  run [
 <span id="L545" class="LineNr">545 </span>  <span class="Conceal">¦</span> <a href='chessboard.mu.html#L67'>board</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L524'>make-move</a> <a href='chessboard.mu.html#L67'>board</a>, <a href='chessboard.mu.html#L229'>move</a>
-<span id="L546" class="LineNr">546 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a> <span class="Special">&lt;-</span> <a href='chessboard.mu.html#L144'>print-board</a> <a href='081print.mu.html#L16'>screen</a>:&amp;:<a href='081print.mu.html#L16'>screen</a>, <a href='chessboard.mu.html#L67'>board</a>
+<span id="L546" class="LineNr">546 </span>  <span class="Conceal">¦</span> <a href='081print.mu.html#L16'>screen</a> <span class="Special">&lt;-</span> print <a href='081print.mu.html#L16'>screen</a>, <a href='chessboard.mu.html#L67'>board</a>
 <span id="L547" class="LineNr">547 </span>  ]
 <span id="L548" class="LineNr">548 </span>  screen-should-contain [
 <span id="L549" class="LineNr">549 </span>  <span class="Comment">#  012345678901234567890123456789</span>