X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fmop.impure.lisp;h=8aad5b4101fb46b2217555361f6d4424e73d6f8a;hb=acc978383105b5a2bfd970f8a34214fd5774bb2a;hp=053148e6bcee72bf76ef524287b477713a08a70f;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git

diff --git a/tests/mop.impure.lisp b/tests/mop.impure.lisp
index 053148e..8aad5b4 100644
--- a/tests/mop.impure.lisp
+++ b/tests/mop.impure.lisp
@@ -16,7 +16,7 @@
 ;;;; no regressions.
 
 (defpackage "MOP-TEST"
-  (:use "CL" "SB-MOP"))
+  (:use "CL" "SB-MOP" "ASSERTOID"))
 
 (in-package "MOP-TEST")
 
@@ -382,6 +382,23 @@
 (let ((subs (sb-mop:class-direct-subclasses (find-class 'bug-331-super))))
   (assert (= 1 (length subs)))
   (assert (eq (car subs) (find-class 'bug-331-sub))))
+;;; (addendum to test for #331: conditions suffered the same problem)
+(define-condition condition-bug-331-super () ())
+(define-condition condition-bug-331-sub (condition-bug-331-super) ())
+(let ((subs (sb-mop:class-direct-subclasses
+             (find-class 'condition-bug-331-super))))
+  (assert (= 1 (length subs)))
+  (assert (eq (car subs) (find-class 'condition-bug-331-sub))))
+;;; (addendum to the addendum: the fix for this revealed breakage in
+;;; REINITIALIZE-INSTANCE)
+(define-condition condition-bug-331a () ((slot331a :reader slot331a)))
+(reinitialize-instance (find-class 'condition-bug-331a))
+(let* ((gf #'slot331a)
+       (methods (sb-mop:generic-function-methods gf)))
+  (assert (= (length methods) 1))
+  (assert (eq (car methods)
+              (find-method #'slot331a nil
+                           (list (find-class 'condition-bug-331a))))))
 
 ;;; detection of multiple class options in defclass, reported by Bruno Haible
 (defclass option-class (standard-class)
@@ -429,5 +446,37 @@
   (:metaclass custom-default-initargs-class))
 (assert (eq (slot-value (make-instance 'extra-initarg) 'slot) 'extra))
 
+;;; STANDARD-CLASS valid as a superclass for FUNCALLABLE-STANDARD-CLASS
+(defclass standard-class-for-fsc ()
+  ((scforfsc-slot :initarg :scforfsc-slot :accessor scforfsc-slot)))
+(defvar *standard-class-for-fsc*
+  (make-instance 'standard-class-for-fsc :scforfsc-slot 1))
+(defclass fsc-with-standard-class-superclass
+    (standard-class-for-fsc funcallable-standard-object)
+  ((fsc-slot :initarg :fsc-slot :accessor fsc-slot))
+  (:metaclass funcallable-standard-class))
+(defvar *fsc/scs*
+  (make-instance 'fsc-with-standard-class-superclass
+                 :scforfsc-slot 2
+                 :fsc-slot 3))
+(assert (= (scforfsc-slot *standard-class-for-fsc*) 1))
+(assert (= (scforfsc-slot *fsc/scs*) 2))
+(assert (= (fsc-slot *fsc/scs*) 3))
+(assert (subtypep 'fsc-with-standard-class-superclass 'function))
+(assert (not (subtypep 'standard-class-for-fsc 'function)))
+
+;;; also check that our sanity check for functionness is good
+(assert (raises-error?
+         (progn
+           (defclass bad-standard-class (funcallable-standard-object)
+             ()
+             (:metaclass standard-class))
+           (make-instance 'bad-standard-class))))
+(assert (raises-error?
+         (progn
+           (defclass bad-funcallable-standard-class (standard-object)
+             ()
+             (:metaclass funcallable-standard-class))
+           (make-instance 'bad-funcallable-standard-class))))
+
 ;;;; success
-(sb-ext:quit :unix-status 104)