Changeset 11627

Timestamp:

Jan 19, 2009, 7:54:15 PM (11 years ago)

Author:

gb

Message:

Make an ioblock's unread-char function selectable (based on stream class.)

File:

• trunk/source/level-1/l1-streams.lisp (modified) (3 diffs)

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

@@ -1940 +1940 @@
         (incf col))
       (if (< code limit)
-               (%ioblock-write-u8-element ioblock code)
-               (funcall encode-function char #'%ioblock-write-u8-element ioblock)))))
+        (%ioblock-write-u8-element ioblock code)
+        (funcall encode-function char #'%ioblock-write-u8-element ioblock)))))
 
 
@@ -2679 +2679 @@
   (setf (ioblock-sharing ioblock) sharing)
   (when character-p
-    (setf (ioblock-unread-char-function ioblock) '%ioblock-untyi)
+    (setf (ioblock-unread-char-function ioblock) (select-stream-untyi-function (ioblock-stream ioblock) :input))
     (setf (ioblock-decode-literal-code-unit-limit ioblock)
           (if encoding
@@ -5982 +5982 @@
 
 
+(defmethod select-stream-untyi-function ((s symbol) direction)
+  (select-stream-untyi-function (find-class s) direction))
+
+(defmethod select-stream-untyi-function ((c class) direction)
+  (select-stream-untyi-function (class-prototype c) direction))
+
+(defmethod select-stream-untyi-function ((s fd-stream) (direction t))
+  '%ioblock-untyi)
+
+(defmethod select-stream-untyi-function ((s basic-stream) (direction t))
+  '%ioblock-untyi)
 
 ; end of L1-streams.lisp