defmacroize (oop goops accessors), (oop goops save)

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

diff --git a/ice-9/lineio.scm b/ice-9/lineio.scm
index b45cf0d..f122268 100644 (file)
--- a/ice-9/lineio.scm
+++ b/ice-9/lineio.scm
@@ -1,51 +1,28 @@
 ;;; installed-scm-file
 
-;;;;   Copyright (C) 1996, 1998, 2001 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1996, 1998, 2001, 2003, 2006 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
-;;;; the Free Software Foundation; either version 2, or (at your option)
-;;;; any later version.
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 2.1 of the License, or (at your option) any later version.
 ;;;; 
-;;;; This program is distributed in the hope that it will be useful,
+;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;;; Lesser General Public License for more details.
 ;;;; 
-;;;; 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, 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.
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;;;; 
 
 \f
 
 (define-module (ice-9 lineio)
-  :use-module (ice-9 readline))
+  :use-module (ice-9 readline)
+  :export (unread-string read-string lineio-port?
+          make-line-buffering-input-port))
 
 \f
 ;;; {Line Buffering Input Ports}
@@ -77,15 +54,15 @@
 ;; 'unread-string and 'read-string properties, bound to hooks
 ;; implementing these functions.
 ;;
-(define-public (unread-string str line-buffering-input-port)
+(define (unread-string str line-buffering-input-port)
   ((object-property line-buffering-input-port 'unread-string) str))
 
 ;;
-(define-public (read-string line-buffering-input-port)
+(define (read-string line-buffering-input-port)
   ((object-property line-buffering-input-port 'read-string)))
 
 
-(define-public (lineio-port? port)
+(define (lineio-port? port)
   (not (not (object-property port 'read-string))))
 
 ;; make-line-buffering-input-port port
@@ -96,7 +73,7 @@
 ;; to read-char, read-string, and unread-string.
 ;;
 
-(define-public (make-line-buffering-input-port underlying-port)
+(define (make-line-buffering-input-port underlying-port)
   (let* (;; buffers - a list of strings put back by unread-string or cached
         ;; using read-line.
         ;;
@@ -108,7 +85,7 @@
         (getc (lambda ()
                 (if (not buffers)
                     (read-char underlying-port)
-                    (let ((c (string-ref (car buffers))))
+                    (let ((c (string-ref (car buffers) 0)))
                       (if (= 1 (string-length (car buffers)))
                           (set! buffers (cdr buffers))
                           (set-car! buffers (substring (car buffers) 1)))