summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Merge branch 'master' into newkeyhut2010-03-24126-7333/+2156
| |\ \ \ \ \ \ \ \
| * | | | | | | | | keyparser: test for collisions with directories of a lenght > 1hut2010-03-092-21/+42
| * | | | | | | | | keyparser: added copying info to testcasehut2010-03-091-0/+15
| * | | | | | | | | keyparser: updaded copying notice in new fileshut2010-03-093-33/+36
| * | | | | | | | | keyparser: stuffhut2010-03-096-28/+307
| * | | | | | | | | keyparser: lots of stuffhut2010-03-095-42/+77
| * | | | | | | | | keyparser: fixeshut2010-03-093-8/+7
| * | | | | | | | | keyparser: renamed KeyMap.add to KeyMap.maphut2010-03-095-102/+74
| * | | | | | | | | keyparser: swapped argument order in KeyMap.add()hut2010-03-092-23/+23
| * | | | | | | | | keyparser: allow passive actions (for hints, show bookmarks)hut2010-03-092-1/+39
| * | | | | | | | | integrating keyparser...hut2010-03-093-9/+78
| * | | | | | | | | deleted old testcasehut2010-03-091-100/+0
| * | | | | | | | | working on the implementation of the new key parserhut2010-03-099-39/+61
| * | | | | | | | | keyparser: moved classes from test/ to ranger/hut2010-03-096-695/+475
| * | | | | | | | | keyparser: implemented aliaseshut2010-03-091-11/+87
| * | | | | | | | | keyparser: minor updateshut2010-03-091-2/+8
| * | | | | | | | | keyparse: implemented Tree.mergehut2010-03-091-31/+92
| * | | | | | | | | keyparser: Remove the restriction that a root can't be a leafhut2010-03-091-1/+0
| * | | | | | | | | keyparser: updated test_tree_deep_copyhut2010-03-091-5/+4
| * | | | | | | | | keyparser: added test case for tree emrgehut2010-03-091-0/+36
| * | | | | | | | | keyparser: added tree.copy() for deep copieshut2010-03-091-0/+25
| * | | | | | | | | keyparser: minor changeshut2010-03-091-3/+5
| * | | | | | | | | keyparser: turned KeyMap into a treehut2010-03-091-76/+59
| * | | | | | | | | keyparser: added seperate Tree classhut2010-03-091-0/+53
| * | | | | | | | | keyparser: proper parsing of <xyz> in keybindingshut2010-03-091-51/+118
| * | | | | | | | | keyparser: added test for directions as functions, cleanupshut2010-03-091-27/+66
| * | | | | | | | | keyparser: cleanupshut2010-03-091-7/+4
| * | | | | | | | | keyparser: some additionshut2010-03-091-16/+60
| * | | | | | | | | keyparser: allow arbitrary number/order of directionshut2010-03-091-34/+66
| * | | | | | | | | keyparser: reworkedhut2010-03-091-51/+61
| * | | | | | | | | keyparser: "." matches any characterhut2010-03-091-23/+71
| * | | | | | | | | keyparser: some improvementshut2010-03-091-51/+52
| * | | | | | | | | started new key parserhut2010-03-091-0/+331
| * | | | | | | | | custom: "enter" = shortcut for "1l"hut2010-03-091-0/+3
| * | | | | | | | | custom: added info about this branchhut2010-03-091-0/+14
| * | | | | | | | | custom: keys: added aliases (J => ^D, K => ^U) for quick movementhut2010-03-091-0/+4
| * | | | | | | | | custom: added ] key: tag next and runhut2010-03-091-0/+12
* | | | | | | | | | Merge branch 'master' into develhut2010-04-149-62/+99
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | widget.browsercolumn: display "?" in info in a different colorhut2010-04-143-1/+13
| * | | | | | | | | | widgets.browsercolumn: added sanity check when clicking on previewhut2010-04-141-14/+15
| * | | | | | | | | | fsobject: use a "?" if no infostring is availablehut2010-04-142-2/+4
| * | | | | | | | | | fixed rarely occuring permission issuehut2010-04-142-5/+5
| * | | | | | | | | | fsobject.fsobject: display more informationhut2010-04-141-5/+16
| * | | | | | | | | | fsobject.fsobject: get the stat() of link destinationshut2010-04-141-1/+6
| * | | | | | | | | | widgets.statusbar: better error detectionhut2010-04-141-5/+8
| * | | | | | | | | | fsobject.fsobject: cleanuphut2010-04-141-19/+14
| * | | | | | | | | | renamed fsobject.islink to fsobject.is_linkhut2010-04-145-9/+9
| * | | | | | | | | | identify devices and handle them properlyhut2010-04-144-3/+11
| * | | | | | | | | | colorscheme.default: make sockets boldhut2010-04-141-0/+1
| * | | | | | | | | | removed bad importhut2010-04-141-1/+0
lass="nv">out a long line assume-screen 120/width, 20/height # initialize keyboard to type in a move assume-console [ type [a2-a4 ] ] run [ screen:&:screen, console:&:console <- chessboard screen:&:screen, console:&:console # icon for the cursor cursor-icon:char <- copy 9251/ screen <- print screen, cursor-icon ] screen-should-contain [ # 1 2 3 4 5 6 7 8 9 10 11 # 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 .Stupid text-mode chessboard. White pieces in uppercase; black pieces in lowercase. No checking for legal moves. . . . .8 | r n b q k b n r . .7 | p p p p p p p p . .6 | . .5 | . .4 | P . .3 | . .2 | P P P P P P P . .1 | R N B Q K B N R . . +---------------- . . a b c d e f g h . . . .Type in your move as <from square>-<to square>. For example: 'a2-a4'. Then press <enter>. . . . .Hit 'q' to exit. . . . .move: . . . . . ] ] ## Here's how 'chessboard' is implemented. type board = &:@:&:@:char # a 2-D array of arrays of characters def chessboard screen:&:screen, console:&:console -> screen:&:screen, console:&:console [ local-scope load-ingredients board:board <- initial-position # hook up stdin stdin-in:&:source:char, stdin-out:&:sink:char <- new-channel 10/capacity start-running send-keys-to-channel, console, stdin-out, screen # buffer lines in stdin buffered-stdin-in:&:source:char, buffered-stdin-out:&:sink:char <- new-channel 10/capacity start-running buffer-lines, stdin-in, buffered-stdin-out { 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 cursor-to-next-line screen print screen, [Type in your move as <from square>-<to square>. For example: 'a2-a4'. Then press <enter>. ] cursor-to-next-line screen print screen [Hit 'q' to exit. ] { cursor-to-next-line screen screen <- print screen, [move: ] m:&:move, quit:bool, error:bool <- read-move buffered-stdin-in, screen break-if quit, +quit buffered-stdin-in <- clear buffered-stdin-in # cleanup after error. todo: test this? loop-if error } board <- make-move board, m screen <- clear-screen screen loop } +quit ] ## a board is an array of files, a file is an array of characters (squares) def new-board initial-position:&:@:char -> board:board [ local-scope load-ingredients # assert(length(initial-position) == 64) len:num <- length *initial-position correct-length?:bool <- equal len, 64 assert correct-length?, [chessboard had incorrect size] # board is an array of pointers to files; file is an array of characters board <- new {(address array character): type}, 8 col:num <- copy 0 { done?:bool <- equal col, 8 break-if done? file:&:@:char <- new-file initial-position, col *board <- put-index *board, col, file col <- add col, 1 loop } ] def new-file position:&:@:char, index:num -> result:&:@:char [ local-scope load-ingredients index <- multiply index, 8 result <- new character:type, 8 row:num <- copy 0 { done?:bool <- equal row, 8 break-if done? square:char <- index *position, index *result <- put-index *result, row, square row <- add row, 1 index <- add index, 1 loop } ] def print-board screen:&:screen, board:board -> screen:&:screen [ local-scope load-ingredients row:num <- copy 7 # start printing from the top of the board space:char <- copy 32/space # print each row { done?:bool <- lesser-than row, 0 break-if done? # print rank number as a legend rank:num <- add row, 1 print screen, rank print screen, [ | ] # print each square in the row col:num <- copy 0 { done?:bool <- equal col:num, 8 break-if done? f:&:@:char <- index *board, col c:char <- index *f, row print screen, c print screen, space col <- add col, 1 loop } row <- subtract row, 1 cursor-to-next-line screen loop } # print file letters as legend print screen, [ +----------------] cursor-to-next-line screen print screen, [ a b c d e f g h] cursor-to-next-line screen ] def initial-position -> board:board [ local-scope # layout in memory (in raster order): # R P _ _ _ _ p r # N P _ _ _ _ p n # B P _ _ _ _ p b # Q P _ _ _ _ p q # K P _ _ _ _ p k # B P _ _ _ _ p B # N P _ _ _ _ p n # R P _ _ _ _ p r initial-position:&:@:char <- new-array 82/R, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 114/r, 78/N, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 110/n, 66/B, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 98/b, 81/Q, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 113/q, 75/K, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 107/k, 66/B, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 98/b, 78/N, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 110/n, 82/R, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 114/r #? 82/R, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 114/r, #? 78/N, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 110/n, #? 66/B, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 98/b, #? 81/Q, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 113/q, #? 75/K, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 107/k, #? 66/B, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 98/b, #? 78/N, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 110/n, #? 82/R, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 114/r board <- new-board initial-position ] scenario printing-the-board [ local-scope board:board <- initial-position assume-screen 30/width, 12/height run [ screen:&:screen <- print-board screen:&:screen, board ] screen-should-contain [ # 012345678901234567890123456789 .8 | r n b q k b n r . .7 | p p p p p p p p . .6 | . .5 | . .4 | . .3 | . .2 | P P P P P P P P . .1 | R N B Q K B N R . . +---------------- . . a b c d e f g h . . . . . ] ] ## data structure: move container move [ # valid range: 0-7 from-file:num from-rank:num to-file:num to-rank:num ] # prints only error messages to screen def read-move stdin:&:source:char, screen:&:screen -> result:&:move, quit?:bool, error?:bool, stdin:&:source:char, screen:&:screen [ local-scope load-ingredients from-file:num, quit?:bool, error?:bool <- read-file stdin, screen return-if quit?, 0/dummy return-if error?, 0/dummy # construct the move object result:&:move <- new move:type *result <- put *result, from-file:offset, from-file from-rank:num, quit?, error? <- read-rank stdin, screen return-if quit?, 0/dummy return-if error?, 0/dummy *result <- put *result, from-rank:offset, from-rank error? <- expect-from-channel stdin, 45/dash, screen return-if error?, 0/dummy, 0/quit to-file:num, quit?, error? <- read-file stdin, screen return-if quit?, 0/dummy return-if error?, 0/dummy *result <- put *result, to-file:offset, to-file to-rank:num, quit?, error? <- read-rank stdin, screen return-if quit?, 0/dummy return-if error?, 0/dummy *result <- put *result, to-rank:offset, to-rank error? <- expect-from-channel stdin, 10/newline, screen return-if error?, 0/dummy, 0/quit ] # valid values for file: 0-7 def read-file stdin:&:source:char, screen:&:screen -> file:num, quit:bool, error:bool, stdin:&:source:char, screen:&:screen [ local-scope load-ingredients c:char, eof?:bool, stdin <- read stdin return-if eof?, 0/dummy, 1/quit, 0/error q-pressed?:bool <- equal c, 81/Q return-if q-pressed?, 0/dummy, 1/quit, 0/error q-pressed? <- equal c, 113/q return-if q-pressed?, 0/dummy, 1/quit, 0/error empty-fake-keyboard?:bool <- equal c, 0/eof return-if empty-fake-keyboard?, 0/dummy, 1/quit, 0/error { newline?:bool <- equal c, 10/newline break-unless newline? print screen, [that's not enough] return 0/dummy, 0/quit, 1/error } file:num <- subtract c, 97/a # 'a' <= file <= 'h' { above-min:bool <- greater-or-equal file, 0 break-if above-min print screen, [file too low: ] print screen, c cursor-to-next-line screen return 0/dummy, 0/quit, 1/error } { below-max:bool <- lesser-than file, 8 break-if below-max print screen, [file too high: ] print screen, c return 0/dummy, 0/quit, 1/error } return file, 0/quit, 0/error ] # valid values for rank: 0-7 def read-rank stdin:&:source:char, screen:&:screen -> rank:num, quit?:bool, error?:bool, stdin:&:source:char, screen:&:screen [ local-scope load-ingredients c:char, eof?:bool, stdin <- read stdin return-if eof?, 0/dummy, 1/quit, 0/error q-pressed?:bool <- equal c, 81/Q return-if q-pressed?, 0/dummy, 1/quit, 0/error q-pressed? <- equal c, 113/q return-if q-pressed?, 0/dummy, 1/quit, 0/error empty-fake-keyboard?:bool <- equal c, 0/eof return-if empty-fake-keyboard?, 0/dummy, 1/quit, 0/error { newline?:bool <- equal c, 10 # newline break-unless newline? print screen, [that's not enough] return 0/dummy, 0/quit, 1/error } rank:num <- subtract c, 49/'1' # assert'1' <= rank <= '8' { above-min:bool <- greater-or-equal rank, 0 break-if above-min print screen, [rank too low: ] print screen, c return 0/dummy, 0/quit, 1/error } { below-max:bool <- lesser-or-equal rank, 7 break-if below-max print screen, [rank too high: ] print screen, c return 0/dummy, 0/quit, 1/error } return rank, 0/quit, 0/error ] # read a character from the given channel and check that it's what we expect # return true on error def expect-from-channel stdin:&:source:char, expected:char, screen:&:screen -> result:bool, stdin:&:source:char, screen:&:screen [ local-scope load-ingredients c:char, eof?:bool, stdin <- read stdin return-if eof? 1/true { match?:bool <- equal c, expected break-if match? print screen, [expected character not found] } result <- not match? ] 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 run [ # 'read-move' is waiting for input wait-for-routine-to-block read-move-routine read-move-state:num <- routine-state read-move-routine waiting?:bool <- not-equal read-move-state, 2/discontinued assert waiting?, [ F read-move-blocking: routine failed to pause after coming up (before any keys were pressed)] # press 'a' sink <- write sink, 97/a restart read-move-routine # 'read-move' still waiting for input wait-for-routine-to-block read-move-routine read-move-state <- routine-state read-move-routine waiting? <- not-equal read-move-state, 2/discontinued assert waiting?, [ F read-move-blocking: routine failed to pause after rank 'a'] # press '2' sink <- write sink, 50/'2' restart read-move-routine # 'read-move' still waiting for input wait-for-routine-to-block read-move-routine read-move-state <- routine-state read-move-routine waiting? <- not-equal read-move-state, 2/discontinued assert waiting?, [ F read-move-blocking: routine failed to pause after file 'a2'] # press '-' sink <- write sink, 45/'-' restart read-move-routine # 'read-move' still waiting for input wait-for-routine-to-block read-move-routine read-move-state <- routine-state read-move-routine waiting? <- not-equal read-move-state, 2/discontinued assert waiting?, [ F read-move-blocking: routine failed to pause after hyphen 'a2-'] # press 'a' sink <- write sink, 97/a restart read-move-routine # 'read-move' still waiting for input wait-for-routine-to-block read-move-routine read-move-state <- routine-state read-move-routine waiting? <- not-equal read-move-state, 2/discontinued assert waiting?, [ F read-move-blocking: routine failed to pause after rank 'a2-a'] # press '4' sink <- write sink, 52/'4' restart read-move-routine # 'read-move' still waiting for input wait-for-routine-to-block read-move-routine read-move-state <- routine-state read-move-routine waiting? <- not-equal read-move-state, 2/discontinued assert waiting?, [ F read-move-blocking: routine failed to pause after file 'a2-a4'] # press 'newline' sink <- write sink, 10 # newline restart read-move-routine # 'read-move' now completes wait-for-routine-to-block read-move-routine read-move-state <- routine-state read-move-routine completed?:bool <- equal read-move-state, 1/completed assert completed?, [ F read-move-blocking: routine failed to terminate on newline] trace 1, [test], [reached end] ] trace-should-contain [ test: reached end ] ] 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 run [ # 'read-move' is waiting for input wait-for-routine-to-block read-move-routine read-move-state:num <- routine-state read-move-routine waiting?:bool <- not-equal read-move-state, 2/discontinued assert waiting?, [ F read-move-quit: routine failed to pause after coming up (before any keys were pressed)] # press 'q' sink <- write sink, 113/q restart read-move-routine # 'read-move' completes wait-for-routine-to-block read-move-routine read-move-state <- routine-state read-move-routine completed?:bool <- equal read-move-state, 1/completed assert completed?, [ F read-move-quit: routine failed to terminate on 'q'] trace 1, [test], [reached end] ] trace-should-contain [ test: reached end ] ] 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 run [ # 'read-move' is waiting for input wait-for-routine-to-block read-move-routine read-move-state:num <- routine-state read-move-routine waiting?:bool <- not-equal read-move-state, 2/discontinued assert waiting?, [ F read-move-illegal-file: routine failed to pause after coming up (before any keys were pressed)] sink <- write sink, 50/'2' restart read-move-routine wait-for-routine-to-block read-move-routine ] screen-should-contain [ .file too low: 2 . . . ] ] 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 run [ # 'read-move' is waiting for input wait-for-routine-to-block read-move-routine read-move-state:num <- routine-state read-move-routine waiting?:bool <- not-equal read-move-state, 2/discontinued assert waiting?, [ F read-move-illegal-rank: routine failed to pause after coming up (before any keys were pressed)] sink <- write sink, 97/a sink <- write sink, 97/a restart read-move-routine wait-for-routine-to-block read-move-routine ] screen-should-contain [ .rank too high: a . . . ] ] 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 run [ # 'read-move' is waiting for input wait-for-routine-to-block read-move-routine read-move-state:num <- routine-state read-move-routine waiting?:bool <- not-equal read-move-state, 2/discontinued assert waiting?, [ F read-move-empty: routine failed to pause after coming up (before any keys were pressed)] sink <- write sink, 10/newline sink <- write sink, 97/a restart read-move-routine wait-for-routine-to-block read-move-routine ] screen-should-contain [ .that's not enough . . . ] ] def make-move board:board, m:&:move -> board:board [ local-scope load-ingredients from-file:num <- get *m, from-file:offset from-rank:num <- get *m, from-rank:offset to-file:num <- get *m, to-file:offset to-rank:num <- get *m, to-rank:offset from-f:&:@:char <- index *board, from-file to-f:&:@:char <- index *board, to-file src:char/square <- index *from-f, from-rank *to-f <- put-index *to-f, to-rank, src *from-f <- put-index *from-f, from-rank, 32/space ] scenario making-a-move [ local-scope assume-screen 30/width, 12/height board:board <- initial-position move:&:move <- new move:type *move <- merge 6/g, 1/'2', 6/g, 3/'4' run [ board <- make-move board, move screen:&:screen <- print-board screen:&:screen, board ] screen-should-contain [ # 012345678901234567890123456789 .8 | r n b q k b n r . .7 | p p p p p p p p . .6 | . .5 | . .4 | P . .3 | . .2 | P P P P P P P . .1 | R N B Q K B N R . . +---------------- . . a b c d e f g h . . . ] ]