X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fcoerce.lisp;h=576aba5965a36dc093ef0a295a71a9852ae10d0a;hb=6c4d4d984b1af6b2a73568cec3ab9c8795cff2da;hp=e257fd731ded492d7a0d39e4536eff93976ef53e;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git diff --git a/src/code/coerce.lisp b/src/code/coerce.lisp index e257fd7..576aba5 100644 --- a/src/code/coerce.lisp +++ b/src/code/coerce.lisp @@ -11,7 +11,7 @@ (in-package "SB!IMPL") -(macrolet ((def-frob (name result access src-type &optional typep) +(macrolet ((def (name result access src-type &optional typep) `(defun ,name (object ,@(if typep '(type) ())) (do* ((index 0 (1+ index)) (length (length (the ,(ecase src-type @@ -27,21 +27,11 @@ (:list '(pop in-object)) (:vector '(aref in-object index)))))))) - (def-frob list-to-simple-string* (make-string length) schar :list) - - (def-frob list-to-bit-vector* (make-array length :element-type '(mod 2)) - sbit :list) - - (def-frob list-to-vector* (make-sequence-of-type type length) + (def list-to-vector* (make-sequence type length) aref :list t) - (def-frob vector-to-vector* (make-sequence-of-type type length) - aref :vector t) - - (def-frob vector-to-simple-string* (make-string length) schar :vector) - - (def-frob 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,8 +52,8 @@ ;;; 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)) -(defun coerce-to-function (object) +(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 ;; doesn't seem to buy us that much anyway.) @@ -116,18 +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-vector (object output-type-spec) (etypecase object (list (list-to-vector* object output-type-spec)) @@ -136,16 +101,12 @@ ;;; old working version (defun coerce (object output-type-spec) #!+sb-doc - "Coerces the Object to an object of type Output-Type-Spec." + "Coerce the Object to an object of type Output-Type-Spec." (flet ((coerce-error () (/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 - (check-type-var 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) @@ -163,6 +124,11 @@ (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))) @@ -205,6 +171,14 @@ ((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 @@ -218,30 +192,27 @@ 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)))))) @@ -256,8 +227,7 @@ :format-control "~S can't be converted to type ~S." :format-arguments (list object output-type-spec))) (check-result (result) - #!+high-security - (check-type-var result output-type-spec) + #!+high-security (aver (typep result output-type-spec)) result)) (let ((type (specifier-type output-type-spec))) (cond @@ -268,7 +238,7 @@ ((csubtypep type (specifier-type 'character)) (character object)) ((csubtypep type (specifier-type 'function)) - (coerce-to-function object)) + (coerce-to-fun object)) ((numberp object) (let ((res (cond