Changeset 5590

Timestamp:

Dec 4, 2006, 11:52:24 AM (18 years ago)

Author:

Gary Byers

Message:

Choke earlier on unsupported stream element-types; do some upgrading to support
some more element types (BIT -> (UNSIGNED-BYTE 8)).

Maybe support arbitrarily large integer types someday soon.
Maybe not.

File:

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

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

@@ -2979 +2979 @@
                           (t '%ioblock-write-char-translating-newline-to-line-separator))))))))
 
-(defun buffer-element-type-for-character-encoding (encoding)
-  (declare (ignore encoding))
-  '(unsigned-byte 8))
+
+(defun ensure-reasonable-element-type (element-type)
+  (let* ((upgraded (upgraded-array-element-type element-type)))
+    (if (eq upgraded 'bit)
+      '(unsigned-byte 8)
+      (if (eq upgraded t)
+        (error "Stream element-type ~s can't be reasonably supported." element-type)
+        upgraded))))
 
 (defun init-stream-ioblock (stream
@@ -3035 +3040 @@
             (make-heap-ivector insize
                                (if character-p
-                                 (buffer-element-type-for-character-encoding encoding)
-                                 element-type))
+                                 '(unsigned-byte 8)
+                                 (setq element-type
+                                       (ensure-reasonable-element-type element-type))))
           (setf (ioblock-inbuf ioblock)
                 (make-io-buffer :buffer buffer
@@ -3060 +3066 @@
               (make-heap-ivector outsize
                                  (if character-p
-                                   (buffer-element-type-for-character-encoding encoding)
-                                   element-type))
+                                   '(unsigned-byte 8)
+                                   (setq element-type (ensure-reasonable-element-type element-type))))
             (setf (ioblock-outbuf ioblock)
                   (make-io-buffer :buffer buffer