Changeset 14070

Timestamp:

08/11/12 12:07:52 (9 years ago)

Author:

ehuelsmann

Message:

Expand types before checking them: fixes Drakma.

Patch by Stas Boukarev.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• byte-io.lisp (modified) (2 diffs)
• read-sequence.lisp (modified) (1 diff)
• write-sequence.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/byte-io.lisp

@@ -34 +34 @@
 (defun write-byte (byte stream)
   (declare (type stream stream))
-  (let ((element-type (stream-element-type stream)))
+  (let ((element-type (expand-deftype (stream-element-type stream))))
     (require-type byte element-type)
     (let ((width (cadr element-type)))
@@ -49 +49 @@
 (defun read-byte (stream &optional (eof-error-p t) eof-value)
   (declare (type stream stream))
-  (let* ((element-type (stream-element-type stream)))
+  (let* ((element-type (expand-deftype (stream-element-type stream))))
     (unless element-type
       (if eof-error-p

trunk/abcl/src/org/armedbear/lisp/read-sequence.lisp

@@ -38 +38 @@
       (require-type end '(integer 0))
       (setf end (length sequence)))
-  (let* ((element-type (stream-element-type stream)))
+  (let* ((element-type (expand-deftype (stream-element-type stream))))
     (cond ((eq element-type 'character)
            (do ((pos start (1+ pos)))

trunk/abcl/src/org/armedbear/lisp/write-sequence.lisp

@@ -46 +46 @@
       (setf end (length sequence)))
   (let ((end (the fixnum end))
-        (stream-element-type (stream-element-type stream)))
+        (stream-element-type (expand-deftype (stream-element-type stream))))
     (cond ((eq stream-element-type 'character)
            (if (stringp sequence)