r4824: Auto commit for Debian build

[kmrcl.git] / buff-input.lisp

diff --git a/buff-input.lisp b/buff-input.lisp
index 9072fb9269df527356099653b56fac126ad80bbd..36ff2276527c3faa6ec0616937e76f3b1f7ff8d2 100644 (file)
--- a/buff-input.lisp
+++ b/buff-input.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: buff-input.lisp,v 1.3 2002/10/10 16:23:48 kevin Exp $
+;;;; $Id: buff-input.lisp,v 1.8 2003/05/06 01:50:04 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -18,7 +18,8 @@
 
 (in-package :kmrcl)
 
-(declaim (optimize (speed 3) (safety 0) (space 0) (debug 0)))
+(eval-when (:compile-toplevel)
+  (declaim (optimize (speed 3) (safety 0) (space 0) (debug 0))))
 
 (defconstant +max-field+ 10000)
 (defconstant +max-fields-per-line+ 20)
@@ -39,17 +40,18 @@
       (setf (aref bufs i) (make-array max-field-len :element-type 'character :fill-pointer 0 :adjustable nil)))
     bufs))
 
-(defun read-buffered-fields (fields strm &optional (field-delim +field-delim+))
+(defun read-buffered-fields (fields strm &optional (field-delim +field-delim+)
+                            (eof 'eof))
   "Read a line from a stream into a field buffers"
   (declare (type base-char field-delim)
           (type vector fields))
   (setf (fill-pointer fields) 0)
   (do ((ifield 0 (1+ ifield))
        (linedone nil)
-       (eof nil))
-      (linedone (if eof 'eof fields))
+       (is-eof nil))
+      (linedone (if is-eof eof fields))
     (declare (type fixnum ifield)
-            (type boolean linedone eof))
+            (type boolean linedone is-eof))
     (let ((field (aref fields ifield)))
       (declare (type base-string field))
       (do ((ipos 0)
@@ -74,7 +76,7 @@
          (setf (fill-pointer fields) ifield)
          (setq fielddone t)
          (setq linedone t)
-         (setq eof t))
+         (setq is-eof t))
         (t
          (setf (char field ipos) rc)
          (incf ipos)))))))
@@ -87,9 +89,6 @@
   (buffers)
   (field-lengths))
 
-(defmethod print-object ((f field-buffers) s)
-  (format s "#<~d>~%" (field-buffers-nfields f)))
-   
 (defun make-fields-buffer2 (&optional (max-fields +max-fields-per-line+) 
                                   (max-field-len +max-field+))
   (let ((bufs (make-array max-fields :element-type 'vector :fill-pointer nil :adjustable nil))
@@ -103,16 +102,17 @@
     bufstruct))
 
 
-(defun read-buffered-fields2 (fields strm &optional (field-delim +field-delim+))
+(defun read-buffered-fields2 (fields strm &optional (field-delim +field-delim+)
+                             (eof 'eof))
   "Read a line from a stream into a field buffers"
   (declare (character field-delim))
   (setf (field-buffers-nfields fields) 0)
   (do ((ifield 0 (1+ ifield))
        (linedone nil)
-       (eof nil))
-      (linedone (if eof 'eof fields))
+       (is-eof nil))
+      (linedone (if is-eof eof fields))
     (declare (fixnum ifield)
-            (t linedone eof))
+            (t linedone is-eof))
     (let ((field (aref (field-buffers-buffers fields) ifield)))
       (declare (simple-string field))
       (do ((ipos 0)
@@ -137,7 +137,7 @@
          (setf (field-buffers-nfields fields) ifield)
          (setq fielddone t)
          (setq linedone t)
-         (setq eof t))
+         (setq is-eof t))
         (t
          (setf (char field ipos) rc)
          (incf ipos)))))))
@@ -153,17 +153,18 @@
 (let ((linebuffer (make-array +max-line+
                              :element-type 'character
                              :fill-pointer 0)))
-  (defun read-buffered-line (strm)
+  (defun read-buffered-line (strm eof)
     "Read a line from astream into a vector buffer"
+    (declare (optimize (speed 3) (space 0) (safety 0)))
     (let ((pos 0)
          (done nil))
-      (declare (fixnum pos) (t done))
+      (declare (fixnum pos) (boolean done))
       (setf (fill-pointer linebuffer) 0)
       (do ((c (read-char strm nil +eof-char+)
              (read-char strm nil +eof-char+)))
          (done (progn
                  (unless (eql c +eof-char+) (unread-char c strm))
-                 (if (eql c +eof-char+) 'eof linebuffer)))
+                 (if (eql c +eof-char+) eof linebuffer)))
        (declare (character c))
        (cond
        ((char= c #\Newline)