Eliminate the READ-STRING and DISCARD-CHARS operations.

diff --git a/v7/src/runtime/genio.scm b/v7/src/runtime/genio.scm
index e25dee6e927f7fb15a349ac003f6fca2399c5a61..5623c0a554fe6c4cd0c4dbf7769a2f71a180cbb8 100644 (file)
--- a/v7/src/runtime/genio.scm
+++ b/v7/src/runtime/genio.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: genio.scm,v 1.20 2004/01/11 07:17:57 cph Exp $
+$Id: genio.scm,v 1.21 2004/01/19 04:30:20 cph Exp $
 
 Copyright 1991,1993,1995,1996,1999,2002 Massachusetts Institute of Technology
 Copyright 2003,2004 Massachusetts Institute of Technology
@@ -36,7 +36,6 @@ USA.
           (CHARS-REMAINING ,operation/chars-remaining)
           (CLOSE-INPUT ,operation/close-input)
           (DISCARD-CHAR ,operation/read-char)
-          (DISCARD-CHARS ,operation/discard-chars)
           (EOF? ,operation/eof?)
           (INPUT-BLOCKING-MODE ,operation/input-blocking-mode)
           (INPUT-BUFFER-SIZE ,operation/input-buffer-size)
@@ -45,7 +44,6 @@ USA.
           (INPUT-TERMINAL-MODE ,operation/input-terminal-mode)
           (PEEK-CHAR ,operation/peek-char)
           (READ-CHAR ,operation/read-char)
-          (READ-STRING ,operation/read-string)
           (READ-SUBSTRING ,operation/read-substring)
           (SET-INPUT-BLOCKING-MODE ,operation/set-input-blocking-mode)
           (SET-INPUT-BUFFER-SIZE ,operation/set-input-buffer-size)
@@ -167,9 +165,6 @@ USA.
 (define (operation/chars-remaining port)
   (input-buffer/chars-remaining (port/input-buffer port)))
 
-(define (operation/discard-chars port delimiters)
-  (input-buffer/discard-until-delimiter (port/input-buffer port) delimiters))
-
 (define (operation/eof? port)
   (input-buffer/eof? (port/input-buffer port)))
 
@@ -182,9 +177,6 @@ USA.
 (define (operation/read-substring port string start end)
   (input-buffer/read-substring (port/input-buffer port) string start end))
 
-(define (operation/read-string port delimiters)
-  (input-buffer/read-until-delimiter (port/input-buffer port) delimiters))
-
 (define (operation/input-buffer-size port)
   (input-buffer/size (port/input-buffer port)))
 

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 0aef50c087098519a4ef23d1805d23048154e67e..0a93b6285e2920d4e6a98fb2ce52bb07d71c9f31 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.474 2004/01/16 19:43:52 cph Exp $
+$Id: runtime.pkg,v 14.475 2004/01/19 04:30:57 cph Exp $
 
 Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology
 Copyright 1994,1995,1996,1997,1998,1999 Massachusetts Institute of Technology
@@ -2591,13 +2591,11 @@ USA.
          input-buffer/char-ready?
          input-buffer/chars-remaining
          input-buffer/close
-         input-buffer/discard-until-delimiter
          input-buffer/eof?
          input-buffer/open?
          input-buffer/peek-char
          input-buffer/read-char
          input-buffer/read-substring
-         input-buffer/read-until-delimiter
          input-buffer/set-size
          input-buffer/size
          make-input-buffer