Changeset 14070


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/byte-io.lisp

    r11391 r14070  
    3434(defun write-byte (byte stream)
    3535  (declare (type stream stream))
    36   (let ((element-type (stream-element-type stream)))
     36  (let ((element-type (expand-deftype (stream-element-type stream))))
    3737    (require-type byte element-type)
    3838    (let ((width (cadr element-type)))
     
    4949(defun read-byte (stream &optional (eof-error-p t) eof-value)
    5050  (declare (type stream stream))
    51   (let* ((element-type (stream-element-type stream)))
     51  (let* ((element-type (expand-deftype (stream-element-type stream))))
    5252    (unless element-type
    5353      (if eof-error-p
  • trunk/abcl/src/org/armedbear/lisp/read-sequence.lisp

    r11391 r14070  
    3838      (require-type end '(integer 0))
    3939      (setf end (length sequence)))
    40   (let* ((element-type (stream-element-type stream)))
     40  (let* ((element-type (expand-deftype (stream-element-type stream))))
    4141    (cond ((eq element-type 'character)
    4242           (do ((pos start (1+ pos)))
  • trunk/abcl/src/org/armedbear/lisp/write-sequence.lisp

    r11391 r14070  
    4646      (setf end (length sequence)))
    4747  (let ((end (the fixnum end))
    48         (stream-element-type (stream-element-type stream)))
     48        (stream-element-type (expand-deftype (stream-element-type stream))))
    4949    (cond ((eq stream-element-type 'character)
    5050           (if (stringp sequence)
Note: See TracChangeset for help on using the changeset viewer.