X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftypep.lisp;h=374d3bcc37301920639186745c1e24238bc45966;hb=0f3a5f2e8886d18d0b4f6485c38a42be629422ae;hp=0df87b1c2f89099f845d35ef37ee4d2a01423e3e;hpb=2034cb134af58c5998f4e305673af6e2c75bc179;p=sbcl.git diff --git a/src/code/typep.lisp b/src/code/typep.lisp index 0df87b1..374d3bc 100644 --- a/src/code/typep.lisp +++ b/src/code/typep.lisp @@ -28,95 +28,105 @@ ;;; function when it can't figure out anything more intelligent to do. (defun %typep (object specifier) (%%typep object - (if (ctype-p specifier) - specifier - (specifier-type specifier)))) -(defun %%typep (object type) + (if (ctype-p specifier) + specifier + (specifier-type specifier)))) +(defun %%typep (object type &optional (strict t)) (declare (type ctype type)) (etypecase type (named-type (ecase (named-type-name type) ((* t) t) + ((instance) (%instancep object)) + ((funcallable-instance) (funcallable-instance-p object)) + ((extended-sequence) (extended-sequence-p object)) ((nil) nil))) (numeric-type (and (numberp object) - (let (;; I think this works because of an invariant of the - ;; two components of a COMPLEX are always coerced to - ;; be the same, e.g. (COMPLEX 1.0 3/2) => #C(1.0 1.5). - ;; Dunno why that holds, though -- ANSI? Python - ;; tradition? marsh faerie spirits? -- WHN 2001-10-27 - (num (if (complexp object) - (realpart object) - object))) - (ecase (numeric-type-class type) - (integer (integerp num)) - (rational (rationalp num)) - (float - (ecase (numeric-type-format type) - (short-float (typep num 'short-float)) - (single-float (typep num 'single-float)) - (double-float (typep num 'double-float)) - (long-float (typep num 'long-float)) - ((nil) (floatp num)))) - ((nil) t))) - (flet ((bound-test (val) - (let ((low (numeric-type-low type)) - (high (numeric-type-high type))) - (and (cond ((null low) t) - ((listp low) (> val (car low))) - (t (>= val low))) - (cond ((null high) t) - ((listp high) (< val (car high))) - (t (<= val high))))))) - (ecase (numeric-type-complexp type) - ((nil) t) - (:complex - (and (complexp object) - (bound-test (realpart object)) - (bound-test (imagpart object)))) - (:real - (and (not (complexp object)) - (bound-test object))))))) + (let (;; I think this works because of an invariant of the + ;; two components of a COMPLEX are always coerced to + ;; be the same, e.g. (COMPLEX 1.0 3/2) => #C(1.0 1.5). + ;; Dunno why that holds, though -- ANSI? Python + ;; tradition? marsh faerie spirits? -- WHN 2001-10-27 + (num (if (complexp object) + (realpart object) + object))) + (ecase (numeric-type-class type) + (integer (integerp num)) + (rational (rationalp num)) + (float + (ecase (numeric-type-format type) + (short-float (typep num 'short-float)) + (single-float (typep num 'single-float)) + (double-float (typep num 'double-float)) + (long-float (typep num 'long-float)) + ((nil) (floatp num)))) + ((nil) t))) + (flet ((bound-test (val) + (let ((low (numeric-type-low type)) + (high (numeric-type-high type))) + (and (cond ((null low) t) + ((listp low) (> val (car low))) + (t (>= val low))) + (cond ((null high) t) + ((listp high) (< val (car high))) + (t (<= val high))))))) + (ecase (numeric-type-complexp type) + ((nil) t) + (:complex + (and (complexp object) + (bound-test (realpart object)) + (bound-test (imagpart object)))) + (:real + (and (not (complexp object)) + (bound-test object))))))) (array-type (and (arrayp object) - (ecase (array-type-complexp type) - ((t) (not (typep object 'simple-array))) - ((nil) (typep object 'simple-array)) - ((:maybe) t)) - (or (eq (array-type-dimensions type) '*) - (do ((want (array-type-dimensions type) (cdr want)) - (got (array-dimensions object) (cdr got))) - ((and (null want) (null got)) t) - (unless (and want got - (or (eq (car want) '*) - (= (car want) (car got)))) - (return nil)))) - (if (unknown-type-p (array-type-element-type type)) - ;; better to fail this way than to get bogosities like - ;; (TYPEP (MAKE-ARRAY 11) '(ARRAY SOME-UNDEFINED-TYPE)) => T - (error "~@" - (type-specifier type)) - t) - (or (eq (array-type-element-type type) *wild-type*) - (values (type= (array-type-specialized-element-type type) - (specifier-type (array-element-type - object))))))) + (ecase (array-type-complexp type) + ((t) (not (typep object 'simple-array))) + ((nil) (typep object 'simple-array)) + ((:maybe) t)) + (or (eq (array-type-dimensions type) '*) + (do ((want (array-type-dimensions type) (cdr want)) + (got (array-dimensions object) (cdr got))) + ((and (null want) (null got)) t) + (unless (and want got + (or (eq (car want) '*) + (= (car want) (car got)))) + (return nil)))) + (if (unknown-type-p (array-type-element-type type)) + ;; better to fail this way than to get bogosities like + ;; (TYPEP (MAKE-ARRAY 11) '(ARRAY SOME-UNDEFINED-TYPE)) => T + (error "~@" + (type-specifier type)) + t) + (or (eq (array-type-element-type type) *wild-type*) + (values (type= (array-type-specialized-element-type type) + (specifier-type (array-element-type + object))))))) (member-type - (if (member object (member-type-members type)) t)) + (when (member-type-member-p object type) + t)) (classoid #+sb-xc-host (ctypep object type) #-sb-xc-host (classoid-typep (layout-of object) type object)) (union-type - (some (lambda (union-type-type) (%%typep object union-type-type)) - (union-type-types type))) + (some (lambda (union-type-type) (%%typep object union-type-type strict)) + (union-type-types type))) (intersection-type (every (lambda (intersection-type-type) - (%%typep object intersection-type-type)) - (intersection-type-types type))) + (%%typep object intersection-type-type strict)) + (intersection-type-types type))) (cons-type (and (consp object) - (%%typep (car object) (cons-type-car-type type)) - (%%typep (cdr object) (cons-type-cdr-type type)))) + (%%typep (car object) (cons-type-car-type type) strict) + (%%typep (cdr object) (cons-type-cdr-type type) strict))) + #!+sb-simd-pack + (simd-pack-type + (and (simd-pack-p object) + (let* ((tag (%simd-pack-tag object)) + (name (nth tag *simd-pack-element-types*))) + (not (not (member name (simd-pack-type-element-type type))))))) (character-set-type (and (characterp object) (let ((code (char-code object)) @@ -131,36 +141,39 @@ ;; Parse it again to make sure it's really undefined. (let ((reparse (specifier-type (unknown-type-specifier type)))) (if (typep reparse 'unknown-type) - (error "unknown type specifier: ~S" - (unknown-type-specifier reparse)) - (%%typep object reparse)))) + (error "unknown type specifier: ~S" + (unknown-type-specifier reparse)) + (%%typep object reparse strict)))) (negation-type - (not (%%typep object (negation-type-type type)))) + (not (%%typep object (negation-type-type type) strict))) (hairy-type ;; Now the tricky stuff. (let* ((hairy-spec (hairy-type-specifier type)) - (symbol (car hairy-spec))) + (symbol (car hairy-spec))) (ecase symbol - (and - (every (lambda (spec) (%%typep object (specifier-type spec))) - (rest hairy-spec))) - ;; Note: it should be safe to skip OR here, because union - ;; types can always be represented as UNION-TYPE in general - ;; or other CTYPEs in special cases; we never need to use - ;; HAIRY-TYPE for them. - (not - (unless (proper-list-of-length-p hairy-spec 2) - (error "invalid type specifier: ~S" hairy-spec)) - (not (%%typep object (specifier-type (cadr hairy-spec))))) - (satisfies - (unless (proper-list-of-length-p hairy-spec 2) - (error "invalid type specifier: ~S" hairy-spec)) - (values (funcall (symbol-function (cadr hairy-spec)) object)))))) + (and + (every (lambda (spec) (%%typep object (specifier-type spec) strict)) + (rest hairy-spec))) + ;; Note: it should be safe to skip OR here, because union + ;; types can always be represented as UNION-TYPE in general + ;; or other CTYPEs in special cases; we never need to use + ;; HAIRY-TYPE for them. + (not + (unless (proper-list-of-length-p hairy-spec 2) + (error "invalid type specifier: ~S" hairy-spec)) + (not (%%typep object (specifier-type (cadr hairy-spec)) strict))) + (satisfies + (unless (proper-list-of-length-p hairy-spec 2) + (error "invalid type specifier: ~S" hairy-spec)) + (values (funcall (symbol-function (cadr hairy-spec)) object)))))) (alien-type-type (sb!alien-internals:alien-typep object (alien-type-type-alien-type type))) (fun-type - (error "Function types are not a legal argument to TYPEP:~% ~S" - (type-specifier type))))) + (if strict + (error "Function types are not a legal argument to TYPEP:~% ~S" + (type-specifier type)) + (and (functionp object) + (csubtypep (specifier-type (sb!impl::%fun-type object)) type)))))) ;;; Do a type test from a class cell, allowing forward reference and ;;; redefinition. @@ -168,27 +181,33 @@ (let ((classoid (classoid-cell-classoid cell))) (unless classoid (error "The class ~S has not yet been defined." - (classoid-cell-name cell))) + (classoid-cell-name cell))) (classoid-typep obj-layout classoid object))) ;;; Test whether OBJ-LAYOUT is from an instance of CLASSOID. (defun classoid-typep (obj-layout classoid object) (declare (optimize speed)) - (when (layout-invalid obj-layout) - (if (and (typep (classoid-of object) 'standard-classoid) object) - (setq obj-layout (sb!pcl::check-wrapper-validity object)) - (error "TYPEP was called on an obsolete object (was class ~S)." - (classoid-proper-name (layout-classoid obj-layout))))) - (let ((layout (classoid-layout classoid)) - (obj-inherits (layout-inherits obj-layout))) - (when (layout-invalid layout) - (error "The class ~S is currently invalid." classoid)) - (or (eq obj-layout layout) - (dotimes (i (length obj-inherits) nil) - (when (eq (svref obj-inherits i) layout) - (return t)))))) - -;;; This implementation is a placeholder to use until PCL is set up, -;;; at which time it will be overwritten by a real implementation. -(defun sb!pcl::check-wrapper-validity (object) - object) + ;; FIXME & KLUDGE: We could like to grab the *WORLD-LOCK* here (to ensure that + ;; class graph doesn't change while we're doing the typep test), but in + ;; pratice that causes trouble -- deadlocking against the compiler + ;; if compiler output (or macro, or compiler-macro expansion) causes + ;; another thread to do stuff. Not locking is a shoddy bandaid as it is remains + ;; easy to trigger the same problem using a different code path -- but in practice + ;; locking here makes Slime unusable with :SPAWN in post *WORLD-LOCK* world. So... + ;; -- NS 2008-12-16 + (multiple-value-bind (obj-layout layout) + (do ((layout (classoid-layout classoid) (classoid-layout classoid)) + (i 0 (+ i 1)) + (obj-layout obj-layout)) + ((and (not (layout-invalid obj-layout)) + (not (layout-invalid layout))) + (values obj-layout layout)) + (aver (< i 2)) + (when (layout-invalid obj-layout) + (setq obj-layout (update-object-layout-or-invalid object layout))) + (%ensure-classoid-valid classoid layout "typep")) + (let ((obj-inherits (layout-inherits obj-layout))) + (or (eq obj-layout layout) + (dotimes (i (length obj-inherits) nil) + (when (eq (svref obj-inherits i) layout) + (return t)))))))