Reverse the n-ary logxor change. The behaviour is weird in a set

[bpt/guile.git] / ice-9 / lineio.scm

diff --git a/ice-9/lineio.scm b/ice-9/lineio.scm
index 28e4a65..b45cf0d 100644 (file)
--- a/ice-9/lineio.scm
+++ b/ice-9/lineio.scm
@@ -1,6 +1,6 @@
 ;;; installed-scm-file
 
-;;;;   Copyright (C) 1996 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1996, 1998, 2001 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -14,12 +14,38 @@
 ;;;; 
 ;;;; You should have received a copy of the GNU General Public License
 ;;;; along with this software; see the file COPYING.  If not, write to
-;;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+;;;; Boston, MA 02111-1307 USA
+;;;;
+;;;; As a special exception, the Free Software Foundation gives permission
+;;;; for additional uses of the text contained in its release of GUILE.
+;;;;
+;;;; The exception is that, if you link the GUILE library with other files
+;;;; to produce an executable, this does not by itself cause the
+;;;; resulting executable to be covered by the GNU General Public License.
+;;;; Your use of that executable is in no way restricted on account of
+;;;; linking the GUILE library code into it.
+;;;;
+;;;; This exception does not however invalidate any other reasons why
+;;;; the executable file might be covered by the GNU General Public License.
+;;;;
+;;;; This exception applies only to the code released by the
+;;;; Free Software Foundation under the name GUILE.  If you copy
+;;;; code from other Free Software Foundation releases into a copy of
+;;;; GUILE, as the General Public License permits, the exception does
+;;;; not apply to the code that you add in this way.  To avoid misleading
+;;;; anyone as to the status of such modified files, you must delete
+;;;; this exception notice from them.
+;;;;
+;;;; If you write modifications of your own for GUILE, it is your choice
+;;;; whether to permit this exception to apply to your modifications.
+;;;; If you do not wish that, delete this exception notice.
 ;;;; 
 
 \f
 
-(define-module #/ice-9/lineio)
+(define-module (ice-9 lineio)
+  :use-module (ice-9 readline))
 
 \f
 ;;; {Line Buffering Input Ports}
@@ -31,6 +57,11 @@
 ;;;
 ;;;    read-string     which returns the next line of input
 ;;;    unread-string   which pushes a line back onto the stream
+;;; 
+;;; The implementation of unread-string is kind of limited; it doesn't
+;;; interact properly with unread-char, or any of the other port
+;;; reading functions.  Only read-string will get you back the things that
+;;; unread-string accepts.
 ;;;
 ;;; Normally a "line" is all characters up to and including a newline.
 ;;; If lines are put back using unread-string, they can be broken arbitrarily
@@ -80,7 +111,7 @@
                     (let ((c (string-ref (car buffers))))
                       (if (= 1 (string-length (car buffers)))
                           (set! buffers (cdr buffers))
-                          (set-car! buffers (make-shared-substring (car buffers) 1)))
+                          (set-car! buffers (substring (car buffers) 1)))
                       c))))
 
         (propogate-close (lambda () (close-port underlying-port)))
@@ -89,9 +120,7 @@
 
         (unread-string (lambda (str)
                          (and (< 0 (string-length str))
-                              (if (ungetc-char-ready? self)
-                                  (set! buffers (append! (list str (string (read-char self))) buffers))
-                                  (set! buffers (cons str buffers))))))
+                                  (set! buffers (cons str buffers)))))
 
         (read-string (lambda ()
                       (cond
@@ -99,10 +128,8 @@
                         (let ((answer (car buffers)))
                           (set! buffers (cdr buffers))
                           answer))
-                       ((ungetc-char-ready? self)
-                        (read-line self 'include-newline))
                        (else
-                        (read-line underlying-port 'include-newline))))))
+                        (read-line underlying-port 'concat)))))) ;handle-newline->concat
 
     (set-object-property! self 'unread-string unread-string)
     (set-object-property! self 'read-string read-string)