X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Ftype.impure.lisp;h=9448016f3c0af1f077b96f6c10f3b20eddcaa93f;hb=83fd554b67913275d8dc06edcad8b2f065c89c49;hp=1dbf49cc44a6774c48b87c63942b5e6b81262fe2;hpb=467a8e5dba8bfa2598ca8e22c1204dc173ce556f;p=sbcl.git diff --git a/tests/type.impure.lisp b/tests/type.impure.lisp index 1dbf49c..9448016 100644 --- a/tests/type.impure.lisp +++ b/tests/type.impure.lisp @@ -13,7 +13,13 @@ integer fixnum (integer 0 10) single-float (single-float -1.0 1.0) (single-float 0.1) (real 4 8) (real -1 7) (real 2 11) - (member #\a #\b #\c) (member 1 #\a) (member 3.0 3.3)))) + (member #\a #\b #\c) (member 1 #\a) (member 3.0 3.3) + ;; FIXME: When bug 91 is fixed, add these to the list: + ;; (INTEGER -1 1) + ;; UNSIGNED-BYTE + ;; (RATIONAL -1 7) (RATIONAL -2 4) + ;; RATIO + ))) (dolist (i types) (format t "type I=~S~%" i) (dolist (j types) @@ -25,13 +31,10 @@ (dolist (k types) (format t " type K=~S~%" k) (assert (subtypep `(or ,i ,j) `(or ,i ,j ,k))) - ;; FIXME: The old code (including original CMU CL code) - ;; fails this test. When this is fixed, we can re-enable it. - #+nil (assert (subtypep `(or ,i ,j) `(or ,k ,j ,i))))))) + (assert (subtypep `(or ,i ,j) `(or ,k ,j ,i))))))) ;;; gotchas that can come up in handling subtypeness as "X is a ;;; subtype of Y if each of the elements of X is a subtype of Y" -#+nil ; FIXME: suppressed until we can fix old CMU CL big (let ((subtypep-values (multiple-value-list (subtypep '(single-float -1.0 1.0) '(or (real -100.0 0.0) @@ -43,7 +46,8 @@ ;; But if it does, that'd be neat. (t t) ;; (And any other return would be wrong.) - )))) + ) + :test #'equal))) (defun type-evidently-= (x y) (and (subtypep x y) @@ -88,12 +92,148 @@ ;;; bug 12: type system didn't grok nontrivial intersections (assert (subtypep '(and symbol (satisfies keywordp)) 'symbol)) (assert (not (subtypep '(and symbol (satisfies keywordp)) 'null))) -#| ; "we gotta target, but you gotta be patient": 0.6.11.11 work in progress (assert (subtypep 'keyword 'symbol)) (assert (not (subtypep 'symbol 'keyword))) (assert (subtypep 'ratio 'real)) (assert (subtypep 'ratio 'number)) -|# + +;;;; Douglas Thomas Crosher rewrote the CMU CL type test system to allow +;;;; inline type tests for CONDITIONs and STANDARD-OBJECTs, and generally +;;;; be nicer, and Martin Atzmueller ported the patches. +;;;; They look nice but they're nontrivial enough that it's not obvious +;;;; from inspection that everything is OK. Let's make sure that things +;;;; still basically work. + +;; structure type tests setup +(defstruct structure-foo1) +(defstruct (structure-foo2 (:include structure-foo1)) + x) +(defstruct (structure-foo3 (:include structure-foo2))) +(defstruct (structure-foo4 (:include structure-foo3)) + y z) + +;; structure-class tests setup +(defclass structure-class-foo1 () () (:metaclass cl:structure-class)) +(defclass structure-class-foo2 (structure-class-foo1) + () (:metaclass cl:structure-class)) +(defclass structure-class-foo3 (structure-class-foo2) + () (:metaclass cl:structure-class)) +(defclass structure-class-foo4 (structure-class-foo3) + () (:metaclass cl:structure-class)) + +;; standard-class tests setup +(defclass standard-class-foo1 () () (:metaclass cl:standard-class)) +(defclass standard-class-foo2 (standard-class-foo1) + () (:metaclass cl:standard-class)) +(defclass standard-class-foo3 (standard-class-foo2) + () (:metaclass cl:standard-class)) +(defclass standard-class-foo4 (standard-class-foo3) + () (:metaclass cl:standard-class)) + +;; condition tests setup +(define-condition condition-foo1 (condition) ()) +(define-condition condition-foo2 (condition-foo1) ()) +(define-condition condition-foo3 (condition-foo2) ()) +(define-condition condition-foo4 (condition-foo3) ()) + +(fmakunbound 'test-inline-type-tests) +(defun test-inline-type-tests () + ;; structure type tests + (assert (typep (make-structure-foo3) 'structure-foo2)) + (assert (not (typep (make-structure-foo1) 'structure-foo4))) + (assert (null (ignore-errors + (setf (structure-foo2-x (make-structure-foo1)) 11)))) + + ;; structure-class tests + (assert (typep (make-instance 'structure-class-foo3) + 'structure-class-foo2)) + (assert (not (typep (make-instance 'structure-class-foo1) + 'structure-class-foo4))) + (assert (null (ignore-errors + (setf (slot-value (make-instance 'structure-class-foo1) 'x) + 11)))) + + ;; standard-class tests + (assert (typep (make-instance 'standard-class-foo3) + 'standard-class-foo2)) + (assert (not (typep (make-instance 'standard-class-foo1) + 'standard-class-foo4))) + (assert (null (ignore-errors + (setf (slot-value (make-instance 'standard-class-foo1) 'x) + 11)))) + + ;; condition tests + (assert (typep (make-condition 'condition-foo3) + 'condition-foo2)) + (assert (not (typep (make-condition 'condition-foo1) + 'condition-foo4))) + (assert (null (ignore-errors + (setf (slot-value (make-condition 'condition-foo1) 'x) + 11)))) + (assert (subtypep 'error 't)) + (assert (subtypep 'simple-condition 'condition)) + (assert (subtypep 'simple-error 'simple-condition)) + (assert (subtypep 'simple-error 'error)) + (assert (not (subtypep 'condition 'simple-condition))) + (assert (not (subtypep 'error 'simple-error))) + (assert (eq (car (sb-kernel:class-direct-superclasses (find-class + 'simple-condition))) + (find-class 'condition))) + + (assert (eq (car (sb-pcl:class-direct-superclasses (sb-pcl:find-class + 'simple-condition))) + (sb-pcl:find-class 'condition))) + (assert (null (set-difference + (sb-pcl:class-direct-subclasses (sb-pcl:find-class + 'simple-condition)) + (mapcar #'sb-pcl:find-class '(simple-type-error simple-error + sb-int:simple-style-warning))))) + + ;; precedence lists + (assert (equal (sb-pcl:class-precedence-list + (sb-pcl:find-class 'simple-condition)) + (mapcar #'sb-pcl:find-class '(simple-condition condition + sb-kernel:instance t)))) + + ;; stream classes + (assert (null (sb-kernel:class-direct-superclasses (find-class + 'fundamental-stream)))) + (assert (equal (sb-pcl:class-direct-superclasses (sb-pcl:find-class + 'fundamental-stream)) + (mapcar #'sb-pcl:find-class '(standard-object stream)))) + (assert (null (set-difference + (sb-pcl:class-direct-subclasses (sb-pcl:find-class + 'fundamental-stream)) + (mapcar #'sb-pcl:find-class '(fundamental-binary-stream + fundamental-character-stream + fundamental-output-stream + fundamental-input-stream))))) + (assert (equal (sb-pcl:class-precedence-list (sb-pcl:find-class + 'fundamental-stream)) + (mapcar #'sb-pcl:find-class '(fundamental-stream + standard-object + sb-pcl::std-object + sb-pcl::slot-object + stream + sb-kernel:instance + t)))) + (assert (equal (sb-pcl:class-precedence-list (sb-pcl:find-class + 'fundamental-stream)) + (mapcar #'sb-pcl:find-class '(fundamental-stream + standard-object + sb-pcl::std-object + sb-pcl::slot-object stream + sb-kernel:instance t)))) + (assert (subtypep (find-class 'stream) (find-class t))) + (assert (subtypep (find-class 'fundamental-stream) 'stream)) + (assert (not (subtypep 'stream 'fundamental-stream)))) + +;;; inline-type tests: +;;; Test the interpreted version. +(test-inline-type-tests) +;;; Test the compiled version. +(compile nil #'test-inline-type-tests) +(test-inline-type-tests) ;;; success (quit :unix-status 104)