X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcoerce.lisp;h=1d05f63ac2502cf3b2e17919ec9fe35bf5b1d452;hb=860543cc7ba0266e41e1d41ac9b6a208f3795f1a;hp=0d1dcff1ac2fbf7984f1c6b717ff5de558022a8c;hpb=0c7ffa8fb85a94482814835c9f28abfd0400ab99;p=sbcl.git diff --git a/src/code/coerce.lisp b/src/code/coerce.lisp index 0d1dcff..1d05f63 100644 --- a/src/code/coerce.lisp +++ b/src/code/coerce.lisp @@ -27,21 +27,11 @@ (:list '(pop in-object)) (:vector '(aref in-object index)))))))) - (def list-to-simple-string* (make-string length) schar :list) - - (def list-to-bit-vector* (make-array length :element-type '(mod 2)) - sbit :list) - - (def list-to-vector* (make-sequence-of-type type length) + (def list-to-vector* (make-sequence type length) aref :list t) - (def vector-to-vector* (make-sequence-of-type type length) - aref :vector t) - - (def vector-to-simple-string* (make-string length) schar :vector) - - (def vector-to-bit-vector* (make-array length :element-type '(mod 2)) - sbit :vector)) + (def vector-to-vector* (make-sequence type length) + aref :vector t)) (defun vector-to-list* (object) (let ((result (list nil)) @@ -53,24 +43,6 @@ (declare (fixnum index)) (rplacd splice (list (aref object index)))))) -(defun string-to-simple-string* (object) - (if (simple-string-p object) - object - (with-array-data ((data object) - (start) - (end (length object))) - (declare (simple-string data)) - (subseq data start end)))) - -(defun bit-vector-to-simple-bit-vector* (object) - (if (simple-bit-vector-p object) - object - (with-array-data ((data object) - (start) - (end (length object))) - (declare (simple-bit-vector data)) - (subseq data start end)))) - (defvar *offending-datum*); FIXME: Remove after debugging COERCE. ;;; These are used both by the full DEFUN function and by various @@ -80,7 +52,7 @@ ;;; argument type is known. It might be better to do this with ;;; DEFTRANSFORMs, though. (declaim (inline coerce-to-list)) -(declaim (inline coerce-to-simple-string coerce-to-bit-vector coerce-to-vector)) +(declaim (inline coerce-to-vector)) (defun coerce-to-fun (object) ;; (Unlike the other COERCE-TO-FOOs, this one isn't inline, because ;; it's so big and because optimizing away the outer ETYPECASE @@ -116,22 +88,11 @@ cons) :format-control "~S can't be coerced to a function." :format-arguments (list object))))))) + (defun coerce-to-list (object) (etypecase object (vector (vector-to-list* object)))) -(defun coerce-to-simple-string (object) - (etypecase object - (list (list-to-simple-string* object)) - (string (string-to-simple-string* object)) - (vector (vector-to-simple-string* object)))) -(defun coerce-to-bit-vector (object) - (etypecase object - (list (list-to-bit-vector* object)) - (vector (vector-to-bit-vector* object)))) -(defun coerce-to-simple-vector (x) - (if (simple-vector-p x) - x - (replace (make-array (length x)) x))) + (defun coerce-to-vector (object output-type-spec) (etypecase object (list (list-to-vector* object output-type-spec)) @@ -145,10 +106,7 @@ (/show0 "entering COERCE-ERROR") (error 'simple-type-error :format-control "~S can't be converted to type ~S." - :format-arguments (list object output-type-spec))) - (check-result (result) - #!+high-security (aver (typep result output-type-spec)) - result)) + :format-arguments (list object output-type-spec)))) (let ((type (specifier-type output-type-spec))) (cond ((%typep object output-type-spec) @@ -159,13 +117,15 @@ (character object)) ((csubtypep type (specifier-type 'function)) #!+high-security - (when (and (or (symbolp object) - (and (listp object) - (= (length object) 2) - (eq (car object) 'setf))) + (when (and (legal-fun-name-p object) (not (fboundp object))) (error 'simple-type-error :datum object + ;; FIXME: SATISFIES FBOUNDP is a kinda bizarre broken + ;; type specifier, since the set of values it describes + ;; isn't in general constant in time. Maybe we could + ;; find a better way of expressing this error? (Maybe + ;; with the UNDEFINED-FUNCTION condition?) :expected-type '(satisfies fboundp) :format-control "~S isn't fbound." :format-arguments (list object))) @@ -187,64 +147,86 @@ :format-arguments (list object))) (eval `#',object)) ((numberp object) - (let ((res - (cond - ((csubtypep type (specifier-type 'single-float)) - (%single-float object)) - ((csubtypep type (specifier-type 'double-float)) - (%double-float object)) - #!+long-float - ((csubtypep type (specifier-type 'long-float)) - (%long-float object)) - ((csubtypep type (specifier-type 'float)) - (%single-float object)) - ((csubtypep type (specifier-type '(complex single-float))) - (complex (%single-float (realpart object)) - (%single-float (imagpart object)))) - ((csubtypep type (specifier-type '(complex double-float))) - (complex (%double-float (realpart object)) - (%double-float (imagpart object)))) - #!+long-float - ((csubtypep type (specifier-type '(complex long-float))) - (complex (%long-float (realpart object)) - (%long-float (imagpart object)))) - ((csubtypep type (specifier-type 'complex)) - (complex object)) - (t - (coerce-error))))) - ;; If RES has the wrong type, that means that rule of canonical - ;; representation for complex rationals was invoked. According to - ;; the Hyperspec, (coerce 7/2 'complex) returns 7/2. Thus, if the - ;; object was a rational, there is no error here. - (unless (or (typep res output-type-spec) (rationalp object)) - (coerce-error)) - res)) + (cond + ((csubtypep type (specifier-type 'single-float)) + (let ((res (%single-float object))) + (unless (typep res output-type-spec) + (coerce-error)) + res)) + ((csubtypep type (specifier-type 'double-float)) + (let ((res (%double-float object))) + (unless (typep res output-type-spec) + (coerce-error)) + res)) + #!+long-float + ((csubtypep type (specifier-type 'long-float)) + (let ((res (%long-float object))) + (unless (typep res output-type-spec) + (coerce-error)) + res)) + ((csubtypep type (specifier-type 'float)) + (let ((res (%single-float object))) + (unless (typep res output-type-spec) + (coerce-error)) + res)) + (t + (let ((res + (cond + ((csubtypep type (specifier-type '(complex single-float))) + (complex (%single-float (realpart object)) + (%single-float (imagpart object)))) + ((csubtypep type (specifier-type '(complex double-float))) + (complex (%double-float (realpart object)) + (%double-float (imagpart object)))) + #!+long-float + ((csubtypep type (specifier-type '(complex long-float))) + (complex (%long-float (realpart object)) + (%long-float (imagpart object)))) + ((and (typep object 'rational) + (csubtypep type (specifier-type '(complex float)))) + ;; Perhaps somewhat surprisingly, ANSI specifies + ;; that (COERCE FOO 'FLOAT) is a SINGLE-FLOAT, + ;; not dispatching on + ;; *READ-DEFAULT-FLOAT-FORMAT*. By analogy, we + ;; do the same for complex numbers. -- CSR, + ;; 2002-08-06 + (complex (%single-float object))) + ((csubtypep type (specifier-type 'complex)) + (complex object)) + (t + (coerce-error))))) + ;; If RES has the wrong type, that means that rule of + ;; canonical representation for complex rationals was + ;; invoked. According to the Hyperspec, (coerce 7/2 + ;; 'complex) returns 7/2. Thus, if the object was a + ;; rational, there is no error here. + (unless (or (typep res output-type-spec) + (rationalp object)) + (coerce-error)) + res)))) ((csubtypep type (specifier-type 'list)) (if (vectorp object) - (vector-to-list* object) + (cond ((type= type (specifier-type 'list)) + (vector-to-list* object)) + ((type= type (specifier-type 'null)) + (if (= (length object) 0) + 'nil + (sequence-type-length-mismatch-error type + (length object)))) + ((csubtypep (specifier-type '(cons nil t)) type) + (if (> (length object) 0) + (vector-to-list* object) + (sequence-type-length-mismatch-error type 0))) + (t (sequence-type-too-hairy (type-specifier type)))) (coerce-error))) - ((csubtypep type (specifier-type 'string)) - (check-result - (typecase object - (list (list-to-simple-string* object)) - (string (string-to-simple-string* object)) - (vector (vector-to-simple-string* object)) - (t - (coerce-error))))) - ((csubtypep type (specifier-type 'bit-vector)) - (check-result - (typecase object - (list (list-to-bit-vector* object)) - (vector (vector-to-bit-vector* object)) - (t - (coerce-error))))) ((csubtypep type (specifier-type 'vector)) - (check-result - (typecase object - (list (list-to-vector* object output-type-spec)) - (vector (vector-to-vector* object output-type-spec)) - (t - (coerce-error))))) + (typecase object + ;; FOO-TO-VECTOR* go through MAKE-SEQUENCE, so length + ;; errors are caught there. -- CSR, 2002-10-18 + (list (list-to-vector* object output-type-spec)) + (vector (vector-to-vector* object output-type-spec)) + (t + (coerce-error)))) (t (coerce-error))))))