Changeset 5066

Timestamp:

Sep 2, 2006, 10:00:15 AM (18 years ago)

Author:

Gary Byers

Message:

Try to avoid things like %COPY-IVECTOR-TO-IVECTOR when strings are
involved.

File:

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

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

@@ -762 +762 @@
                  (setq col 0)
                  (incf col))
-               (setf (schar buffer i) ch)))
+               (setf (aref buffer i) (%char-code ch))))
            (setf (ioblock-dirty ioblock) t)
            (incf index written)
@@ -874 +874 @@
                             (%extend-vector
                              0 string (the fixnum (+ len more)))))
-                    (%copy-ivector-to-ivector
+                    (%copy-u8-to-string
                      buf idx string len more)
                     (return (values string nil))))
@@ -883 +883 @@
                       string (%extend-vector
                               0 string (the fixnum (+ len more))))
-                (%copy-ivector-to-ivector
+                (%copy-u8-to-string
                  buf idx string len more)
                 (incf len more))))))))
@@ -907 +907 @@
           (if (> avail need)
             (setq avail need))
-          (%copy-ivector-to-ivector inbuf idx vector i avail)
+          (%copy-u8-to-string inbuf idx vector i avail)
           (setf (io-buffer-idx in) (+ idx avail))
           (incf i avail)
@@ -1500 +1500 @@
     (gvector :basic-stream class 0 nil nil)))
 
-(defmethod initialize-basic-stream ((s basic-stream) &key &allow-other-keys)
-  )
+(defmethod initialize-basic-stream ((s basic-stream) &key element-type &allow-other-keys)
+  (setf (getf (basic-stream.info s) :element-type) element-type))
 
 (defmethod initialize-basic-stream :after  ((s basic-input-stream) &key &allow-other-keys)
@@ -2211 +2211 @@
   (let* ((ioblock (stream-ioblock s nil)))
     (and ioblock (ioblock-device ioblock))))
+
+(defmethod stream-device ((s basic-stream) direction)
+  (declare (ignore direction))
+  (let* ((ioblock (basic-stream.state s)))
+    (and ioblock (ioblock-device ioblock))))
   
 (defmethod stream-element-type ((s buffered-stream-mixin))
   (%buffered-stream-element-type s))
 
+(defmethod stream-element-type ((s basic-stream))
+  (getf (basic-stream.info s) :element-type))
+
+
 (defmethod stream-create-ioblock ((stream buffered-stream-mixin) &rest args &key)
   (declare (dynamic-extent args))
@@ -2224 +2233 @@
 (defmethod stream-owner ((stream buffered-stream-mixin))
   (let* ((ioblock (stream-ioblock stream nil)))
+    (and ioblock (ioblock-owner ioblock))))
+
+(defmethod stream-owner ((stream basic-stream))
+  (let* ((ioblock (basic-stream.state stream)))
     (and ioblock (ioblock-owner ioblock))))