1296 - roll back 1295

1 files changed, 0 insertions, 251 deletions

diff --git a/chessboard.mu b/chessboard.mu
index a252242f..d4b00b6f 100644
--- a/chessboard.mu
+++ b/chessboard.mu
@@ -1,7 +1,3 @@
-# chessboard program: takes moves in algebraic notation and displays the
-# position after each
-
-## a board is an array of files, a file is an array of characters (squares)
 recipe init-board [
   default-space:address:array:location <- new location:type, 30:literal
   initial-position:address:array:integer <- next-ingredient
@@ -144,250 +140,3 @@ scenario printing-the-board [
     .                              .
   ]
 ]
-
-## data structure: move
-container move [
-  # valid range: 0-7
-  from-file:integer
-  from-rank:integer
-  to-file:integer
-  to-rank:integer
-]
-
-recipe read-move [
-  default-space:address:array:location <- new location:type, 30:literal
-  stdin:address:channel <- next-ingredient
-  from-file:integer <- read-file stdin:address:channel
-  {
-    q-pressed?:boolean <- lesser-than from-file:integer, 0:literal
-    break-unless q-pressed?:boolean
-    reply 0:literal
-  }
-  # construct the move object
-  result:address:move <- new move:literal
-  x:address:integer <- get-address result:address:move/deref, from-file:offset
-  x:address:integer/deref <- copy from-file:integer
-  x:address:integer <- get-address result:address:move/deref, from-rank:offset
-  x:address:integer/deref <- read-rank stdin:address:channel
-  expect-from-channel stdin:address:channel, 45:literal  # '-'
-  x:address:integer <- get-address result:address:move/deref, to-file:offset
-  x:address:integer/deref <- read-file stdin:address:channel
-  x:address:integer <- get-address result:address:move/deref, to-rank:offset
-  x:address:integer/deref <- read-rank stdin:address:channel
-  expect-from-channel stdin:address:channel, 10:literal  # newline
-  reply result:address:move
-]
-
-recipe read-file [
-  default-space:address:array:location <- new location:type, 30:literal
-  stdin:address:channel <- next-ingredient
-  c:character, stdin:address:channel <- read stdin:address:channel
-  {
-    q-pressed?:boolean <- equal c:character, 81:literal  # 'q'
-    break-unless q-pressed?:boolean
-    reply -1:literal
-  }
-  file:integer <- subtract c:character, 97:literal  # 'a'
-  # 'a' <= file <= 'h'
-  above-min:boolean <- greater-or-equal file:integer, 0:literal
-  assert above-min:boolean [file too low]
-  below-max:boolean <- lesser-than file:integer, 8:literal
-  assert below-max:boolean [file too high]
-  reply file:integer
-]
-
-recipe read-rank [
-  default-space:address:array:location <- new location:type, 30:literal
-  stdin:address:channel <- next-ingredient
-  c:character, stdin:address:channel <- read stdin:address:channel
-  {
-    q-pressed?:boolean <- equal c:character, 81:literal  # 'q'
-    break-unless q-pressed?:boolean
-    reply -1:literal
-  }
-  rank:integer <- subtract c:character, 49:literal  # '1'
-  # assert'1' <= rank <= '8'
-  above-min:boolean <- greater-or-equal rank:integer 0:literal
-  assert above-min:boolean [rank too low]
-  below-max:boolean <- lesser-or-equal rank:integer 7:literal
-  assert below-max:boolean [rank too high]
-  reply rank:integer
-]
-
-# read a character from the given channel and check that it's what we expect
-recipe expect-from-channel [
-  default-space:address:array:location <- new location:type, 30:literal
-  stdin:address:channel <- next-ingredient
-  expected:character <- next-ingredient
-  c:character, stdin:address:channel <- read stdin:address:channel
-  match?:boolean <- equal c:character, expected:character
-  assert match?:boolean [expected character not found]
-]
-
-scenario read-move-blocking [
-  run [
-#?     $start-tracing #? 2
-    1:address:channel <- init-channel 1:literal
-    2:integer/routine <- start-running read-move:recipe, 1:address:channel
-    # 'read-move' is waiting for input
-    wait-for-routine 2:integer
-    3:integer <- routine-state 2:integer/id
-    $print [routine ]
-    $print 2:integer/routine
-    $print [ state ]
-    $print 3:integer
-    $print [
-]
-    waiting?:integer <- equal 3:integer/routine-state, 2:literal/waiting
-    assert waiting?:integer/routine-state, [
-F read-move-blocking: routine failed to pause after coming up (before any keys were pressed)]
-    # press 'a'
-    1:address:channel <- write 1:address:channel, 97:literal  # 'a'
-    restart 2:integer/routine
-    # 'read-move' still waiting for input
-    wait-for-routine 2:integer
-    3:integer <- routine-state 2:integer/id
-    $print [routine ]
-    $print 2:integer/routine
-    $print [ state ]
-    $print 3:integer
-    $print [
-]
-    waiting?:integer <- equal 3:integer/routine-state, 2:literal/waiting
-    $print [=======
-]
-    assert waiting?:integer/routine-state, [
-F read-move-blocking: routine failed to pause after rank 'a']
-    # press '2'
-    1:address:channel <- write 1:address:channel, 50:literal  # '2'
-    restart 2:integer/routine
-    # 'read-move' still waiting for input
-    wait-for-routine 2:integer
-    3:integer <- routine-state 2:integer/id
-    $print [aaa: ]
-    $print [routine ]
-    $print 2:integer/routine
-    $print [ state ]
-    $print 3:integer
-    $print [
-]
-    waiting?:integer <- equal 3:integer/routine-state, 2:literal/waiting
-    assert waiting?:integer/routine-state, [
-F read-move-blocking: routine failed to pause after file 'a2']
-    # press '-'
-    1:address:channel <- write 1:address:channel, 45:literal  # '-'
-    restart 2:integer/routine
-    # 'read-move' still waiting for input
-    wait-for-routine 2:integer
-    3:integer <- routine-state 2:integer
-    $print 3:integer
-    $print [
-]
-    waiting?:integer <- equal 3:integer/routine-state, 2:literal/waiting
-    assert waiting?:integer/routine-state, [
-F read-move-blocking: routine failed to pause after hyphen 'a2-']
-    # press 'a'
-    1:address:channel <- write 1:address:channel, 97:literal  # 'a'
-    restart 2:integer/routine
-    # 'read-move' still waiting for input
-    wait-for-routine 2:integer
-    3:integer <- routine-state 2:integer
-    $print 3:integer
-    $print [
-]
-    waiting?:integer <- equal 3:integer/routine-state, 2:literal/waiting
-    assert waiting?:integer/routine-state, [
-F read-move-blocking: routine failed to pause after rank 'a2-a']
-    # press '4'
-    1:address:channel <- write 1:address:channel, 52:literal  # '4'
-    restart 2:integer/routine
-    # 'read-move' still waiting for input
-    wait-for-routine 2:integer
-    3:integer <- routine-state 2:integer
-    $print 3:integer
-    $print [
-]
-    waiting?:integer <- equal 3:integer/routine-state, 2:literal/waiting
-    assert waiting?:integer/routine-state, [
-F read-move-blocking: routine failed to pause after file 'a2-a4']
-    # press 'newline'
-    1:address:channel <- write 1:address:channel, 10:literal  # newline
-    restart 2:integer/routine
-    # 'read-move' now completes
-    wait-for-routine 2:integer
-    3:integer <- routine-state 2:integer
-    $print 3:integer
-    $print [
-]
-    completed?:integer <- equal 3:integer/routine-state, 1:literal/completed
-    assert completed?:integer/routine-state, [
-F read-move-blocking: routine failed to terminate on newline]
-  ]
-]
-
-#? recipe make-move [
-#?   default-space:space-address <- new space:literal 30:literal
-#?   b:board-address <- next-input
-#?   m:address:move <- next-input
-#?   x:integer-integer-pair <- get m:address:move/deref from:offset
-#?   from-file:integer <- get x:integer-integer-pair 0:offset
-#?   from-rank:integer <- get x:integer-integer-pair 1:offset
-#?   f:file-address <- index b:board-address/deref from-file:integer
-#?   src:square-address <- index-address f:file-address/deref from-rank:integer
-#?   x:integer-integer-pair <- get m:address:move/deref to:offset
-#?   to-file:integer <- get x:integer-integer-pair 0:offset
-#?   to-rank:integer <- get x:integer-integer-pair 1:offset
-#?   f:file-address <- index b:board-address/deref to-file:integer
-#?   dest:square-address <- index-address f:file-address/deref to-rank:integer
-#?   dest:square-address/deref <- copy src:square-address/deref
-#?   src:square-address/deref <- copy #\_ literal
-#?   reply b:board-address
-#? ]
-#? 
-#? recipe chessboard [
-#?   default-space:space-address <- new space:literal 30:literal
-#?   initial-position:integer-array-address <- init-array #\R literal #\P literal #\_ literal #\_ literal #\_ literal #\_ literal #\p literal #\r literal
-#?                                                         #\N literal #\P literal #\_ literal #\_ literal #\_ literal #\_ literal #\p literal #\n literal
-#?                                                         #\B literal #\P literal #\_ literal #\_ literal #\_ literal #\_ literal #\p literal #\b literal
-#?                                                         #\Q literal #\P literal #\_ literal #\_ literal #\_ literal #\_ literal #\p literal #\q literal
-#?                                                         #\K literal #\P literal #\_ literal #\_ literal #\_ literal #\_ literal #\p literal #\k literal
-#?                                                         #\B literal #\P literal #\_ literal #\_ literal #\_ literal #\_ literal #\p literal #\b literal
-#?                                                         #\N literal #\P literal #\_ literal #\_ literal #\_ literal #\_ literal #\p literal #\n literal
-#?                                                         #\R literal #\P literal #\_ literal #\_ literal #\_ literal #\_ literal #\p literal #\r literal
-#?   b:board-address <- init-board initial-position:integer-array-address
-#?   cursor-mode
-#?   # hook up stdin
-#?   stdin:address:channel <- init-channel 1:literal
-#?   fork-helper send-keys-to-stdin:fn nil:literal/globals nil:literal/limit nil:literal/keyboard stdin:address:channel
-#?   # buffer stdin
-#?   buffered-stdin:address:channel <- init-channel 1:literal
-#?   fork-helper buffer-lines:fn nil:literal/globals nil:literal/limit stdin:address:channel buffered-stdin:address:channel
-#?   $print "Stupid text-mode chessboard. White pieces in uppercase# black pieces in lowercase. No checking for legal moves." literal
-#?   cursor-to-next-line nil:literal/terminal
-#?   { begin
-#?     cursor-to-next-line nil:literal/terminal
-#?     print-board nil:literal/terminal b:board-address
-#?     cursor-to-next-line nil:literal/terminal
-#?     $print "Type in your move as <from square>-<to square>. For example: 'a2-a4'. Then press <enter>." literal
-#?     cursor-to-next-line nil:literal/terminal
-#?     $print "Hit 'q' to exit." literal
-#?     cursor-to-next-line nil:literal/terminal
-#?     $print "move: " literal
-#?     m:address:move <- read-move buffered-stdin:address:channel
-#? #?     retro-mode #? 1
-#? #?     $print stdin:address:channel #? 1
-#? #?     $print "\n" literal #? 1
-#? #?     $print buffered-stdin:address:channel #? 1
-#? #?     $print "\n" literal #? 1
-#? #?     $dump-memory #? 1
-#? #?     cursor-mode #? 1
-#?     break-unless m:address:move
-#?     b:board-address <- make-move b:board-address m:address:move
-#?     loop
-#?   }
-#?   retro-mode
-#? ]
-#? 
-#? recipe main [
-#?   chessboard
-#? ]