Changeset 5051

Timestamp:

Aug 28, 2006, 3:57:55 AM (18 years ago)

Author:

Gary Byers

Message:

More missing BASIC-STREAM methods (STREAM-LINE-COLUMN, STREAM-LISTEN,
STREAM-EOFP.)

File:

• trunk/ccl/level-1/l1-streams.lisp (modified) (8 diffs)

trunk/ccl/level-1/l1-streams.lisp

@@ -587 +587 @@
                 limit (io-buffer-count buf)))
         (setf (io-buffer-idx buf) (the fixnum (1+ idx)))
-        (schar (io-buffer-buffer buf) idx)))))
+        (%code-char (aref (the (simple-array (unsigned-byte 8) (*)) (io-buffer-buffer buf)) idx))))))
 
 (defun %private-ioblock-tyi (ioblock)
@@ -605 +605 @@
               limit (io-buffer-count buf)))
       (setf (io-buffer-idx buf) (the fixnum (1+ idx)))
-      (schar (io-buffer-buffer buf) idx))))
+      (%code-char (aref (the (simple-array (unsigned-byte 8) (*)) (io-buffer-buffer buf)) idx)))))
 
 (defun %locked-ioblock-tyi (ioblock)
@@ -624 +624 @@
                 limit (io-buffer-count buf)))
         (setf (io-buffer-idx buf) (the fixnum (1+ idx)))
-        (schar (io-buffer-buffer buf) idx)))))
+        (%code-char (aref (the (simple-array (unsigned-byte 8) (*)) (io-buffer-buffer buf)) idx))))))
 
 (declaim (inline %ioblock-tyy-no-hang))
@@ -643 +643 @@
               limit (io-buffer-count buf)))
       (setf (io-buffer-idx buf) (the fixnum (1+ idx)))
-      (schar (io-buffer-buffer buf) idx))))
+      (%code-char (aref (the (simple-array (unsigned-byte 8) (*)) (io-buffer-buffer buf)) idx)))))
 
 
@@ -657 +657 @@
           (setq idx (io-buffer-idx buf)
                 limit (io-buffer-count buf)))
-        (let ((byte (uvref (io-buffer-buffer buf) idx)))
-          (if (characterp byte) byte (%code-char byte))))))
+        (%code-char (aref (the (simple-array (unsigned-byte 8) (*)) (io-buffer-buffer buf)) idx)))))
 
 (defun %ioblock-clear-input (ioblock)    
@@ -737 +736 @@
          (buffer (io-buffer-buffer out)))
     (declare (fixnum written bufsize col)
-             (simple-string buffer)
+             (type (simple-array (unsigned-byte 8) (*)) buffer)
              (optimize (speed 3) (safety 0)))
     (do* ((pos start-octet (+ pos written))
@@ -2367 +2366 @@
     (%ioblock-eofp ioblock)))
 
+(defmethod stream-eofp ((stream basic-input-stream))
+  (let* ((ioblock (basic-stream-ioblock stream)))
+    (with-ioblock-input-locked (ioblock)
+      (%ioblock-eofp ioblock))))
+
 (defmethod stream-listen ((stream buffered-input-stream-mixin))
   (with-stream-ioblock-input (ioblock stream :speedy t)
     (%ioblock-listen ioblock)))
+
+(defmethod stream-listen ((stream basic-input-stream))
+  (let* ((ioblock (basic-stream-ioblock stream)))
+    (with-ioblock-input-locked (ioblock)
+      (%ioblock-listen ioblock))))
 
 (defun flush-ioblock (ioblock finish-p)
@@ -2409 +2418 @@
   (let* ((ioblock (stream-ioblock stream nil)))
     (and ioblock (ioblock-charpos ioblock))))
+
+(defmethod stream-line-column ((stream basic-character-output-stream))
+  (let* ((ioblock (basic-stream.state stream)))
+    (and ioblock (ioblock-charpos ioblock))))
+
+
 
 (defmethod stream-set-column ((stream buffered-character-output-stream-mixin)