about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2015-02-05 20:54:00 -0800
committerKartik K. Agaram <vc@akkartik.com>2015-02-05 20:54:00 -0800
commit8ab4b12c85a73ce064abaad52f4eeda55f159bc0 (patch)
treed252d7e6a062208b33dba45f8890cf3d37b4f53c
parentf4f17ce2ad5936d6373a35e63e3d2365de2a5ff3 (diff)
downloadmu-8ab4b12c85a73ce064abaad52f4eeda55f159bc0.tar.gz
708
-rw-r--r--buffered-stdin.mu2
-rw-r--r--chessboard.mu2
-rw-r--r--mu.arc3
-rw-r--r--mu.arc.t20
4 files changed, 14 insertions, 13 deletions
diff --git a/buffered-stdin.mu b/buffered-stdin.mu
index 66ad4aca..9a7bc7ae 100644
--- a/buffered-stdin.mu
+++ b/buffered-stdin.mu
@@ -8,7 +8,7 @@
   (fork-helper send-keys-to-stdin:fn nil:literal/globals nil:literal/limit nil:literal/keyboard stdin:channel-address)
   ; buffer stdin
   (buffered-stdin:channel-address <- init-channel 1:literal)
-  (fork-helper buffer-stdin:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
+  (fork-helper buffer-lines:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
   { begin
     ; now read characters from the buffer until 'enter' is typed
     (s:string-address <- new "? ")
diff --git a/chessboard.mu b/chessboard.mu
index 9c7c737d..57a66fec 100644
--- a/chessboard.mu
+++ b/chessboard.mu
@@ -223,7 +223,7 @@
   (fork-helper send-keys-to-stdin:fn nil:literal/globals nil:literal/limit nil:literal/keyboard stdin:channel-address)
   ; buffer stdin
   (buffered-stdin:channel-address <- init-channel 1:literal)
-  (fork-helper buffer-stdin:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
+  (fork-helper buffer-lines:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
   ($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
diff --git a/mu.arc b/mu.arc
index a1d7c2f0..281d542e 100644
--- a/mu.arc
+++ b/mu.arc
@@ -2231,7 +2231,8 @@
   } ;? 1
 )
 
-(init-fn buffer-stdin
+; collect characters until newline before sending out
+(init-fn buffer-lines
   (default-space:space-address <- new space:literal 30:literal)
   (stdin:channel-address <- next-input)
   (buffered-stdin:channel-address <- next-input)
diff --git a/mu.arc.t b/mu.arc.t
index f529f72e..8c2168f0 100644
--- a/mu.arc.t
+++ b/mu.arc.t
@@ -4456,7 +4456,7 @@
       (stdin:channel-address <- init-channel 1:literal)
       (fork send-keys-to-stdin:fn nil:literal/globals nil:literal/limit k:keyboard-address stdin:channel-address)
       (buffered-stdin:channel-address <- init-channel 1:literal)
-      (r:integer/routine <- fork buffer-stdin:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
+      (r:integer/routine <- fork buffer-lines:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
       (screen:terminal-address <- init-fake-terminal 20:literal 10:literal)
       (5:string-address/raw <- get screen:terminal-address/deref data:offset)
       (fork-helper send-prints-to-stdout:fn nil:literal/globals nil:literal/limit screen:terminal-address buffered-stdin:channel-address)
@@ -4480,7 +4480,7 @@
              "                    "
              "                    "
              "                    "))
-  (prn "F - 'buffer-stdin' prints nothing until newline is encountered"))
+  (prn "F - 'buffer-lines' prints nothing until newline is encountered"))
 ;? (quit) ;? 3
 
 (reset)
@@ -4493,7 +4493,7 @@
       (stdin:channel-address <- init-channel 1:literal)
       (fork send-keys-to-stdin:fn nil:literal/globals nil:literal/limit k:keyboard-address stdin:channel-address)
       (buffered-stdin:channel-address <- init-channel 1:literal)
-      (r:integer/routine <- fork buffer-stdin:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
+      (r:integer/routine <- fork buffer-lines:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
       (screen:terminal-address <- init-fake-terminal 20:literal 10:literal)
       (5:string-address/raw <- get screen:terminal-address/deref data:offset)
       (fork-helper send-prints-to-stdout:fn nil:literal/globals nil:literal/limit screen:terminal-address buffered-stdin:channel-address)
@@ -4515,7 +4515,7 @@
              "                    "
              "                    "
              "                    "))
-  (prn "F - 'buffer-stdin' prints lines to screen"))
+  (prn "F - 'buffer-lines' prints lines to screen"))
 
 (reset)
 (new-trace "print-buffered-contents-right-at-newline")
@@ -4527,7 +4527,7 @@
       (stdin:channel-address <- init-channel 1:literal)
       (fork send-keys-to-stdin:fn nil:literal/globals nil:literal/limit k:keyboard-address stdin:channel-address)
       (buffered-stdin:channel-address <- init-channel 1:literal)
-      (r:integer/routine <- fork buffer-stdin:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
+      (r:integer/routine <- fork buffer-lines:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
       (screen:terminal-address <- init-fake-terminal 20:literal 10:literal)
       (5:string-address/raw <- get screen:terminal-address/deref data:offset)
       (fork-helper send-prints-to-stdout:fn nil:literal/globals nil:literal/limit screen:terminal-address buffered-stdin:channel-address)
@@ -4551,7 +4551,7 @@
              "                    "
              "                    "
              "                    "))
-  (prn "F - 'buffer-stdin' prints lines to screen immediately on newline"))
+  (prn "F - 'buffer-lines' prints lines to screen immediately on newline"))
 
 (reset)
 (new-trace "buffered-contents-skip-backspace")
@@ -4563,7 +4563,7 @@
       (stdin:channel-address <- init-channel 1:literal)
       (fork send-keys-to-stdin:fn nil:literal/globals nil:literal/limit k:keyboard-address stdin:channel-address)
       (buffered-stdin:channel-address <- init-channel 1:literal)
-      (r:integer/routine <- fork buffer-stdin:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
+      (r:integer/routine <- fork buffer-lines:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
       (screen:terminal-address <- init-fake-terminal 20:literal 10:literal)
       (5:string-address/raw <- get screen:terminal-address/deref data:offset)
       (fork-helper send-prints-to-stdout:fn nil:literal/globals nil:literal/limit screen:terminal-address buffered-stdin:channel-address)
@@ -4585,7 +4585,7 @@
              "                    "
              "                    "
              "                    "))
-  (prn "F - 'buffer-stdin' handles backspace"))
+  (prn "F - 'buffer-lines' handles backspace"))
 
 (reset)
 (new-trace "buffered-contents-ignore-excess-backspace")
@@ -4597,7 +4597,7 @@
       (stdin:channel-address <- init-channel 1:literal)
       (fork send-keys-to-stdin:fn nil:literal/globals nil:literal/limit k:keyboard-address stdin:channel-address)
       (buffered-stdin:channel-address <- init-channel 1:literal)
-      (r:integer/routine <- fork buffer-stdin:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
+      (r:integer/routine <- fork buffer-lines:fn nil:literal/globals nil:literal/limit stdin:channel-address buffered-stdin:channel-address)
       (screen:terminal-address <- init-fake-terminal 20:literal 10:literal)
       (5:string-address/raw <- get screen:terminal-address/deref data:offset)
       (fork-helper send-prints-to-stdout:fn nil:literal/globals nil:literal/limit screen:terminal-address buffered-stdin:channel-address)
@@ -4622,7 +4622,7 @@
              "                    "
              "                    "
              "                    "))
-  (prn "F - 'buffer-stdin' ignores backspace when there's nothing to backspace over"))
+  (prn "F - 'buffer-lines' ignores backspace when there's nothing to backspace over"))
 
 )  ; section 100