X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fmop.impure.lisp;h=3b9aede2ad6a5742866b270c9a3fe23feae432ec;hb=2253ebaef8a0a1527d2282a1c10f48c62e0d4a83;hp=c510eb107412578dcb62f8a9653416fc174eb8fa;hpb=b324caabfa2f0d04e2851a23f7e84dcd3fca5b9b;p=sbcl.git

diff --git a/tests/mop.impure.lisp b/tests/mop.impure.lisp
index c510eb1..3b9aede 100644
--- a/tests/mop.impure.lisp
+++ b/tests/mop.impure.lisp
@@ -383,6 +383,51 @@
   (assert (= 1 (length subs)))
   (assert (eq (car subs) (find-class 'bug-331-sub))))
 
+;;; detection of multiple class options in defclass, reported by Bruno Haible
+(defclass option-class (standard-class)
+  ((option :accessor cl-option :initarg :my-option)))
+(defmethod sb-pcl:validate-superclass ((c1 option-class) (c2 standard-class))
+  t)
+(multiple-value-bind (result error)
+    (ignore-errors (eval '(defclass option-class-instance ()
+                           ()
+                           (:my-option bar)
+                           (:my-option baz)
+                           (:metaclass option-class))))
+  (assert (not result))
+  (assert error))
+
+;;; class as :metaclass                         
+(assert (typep
+	 (sb-mop:ensure-class-using-class 
+	  nil 'class-as-metaclass-test
+	  :metaclass (find-class 'standard-class)
+	  :name 'class-as-metaclass-test
+	  :direct-superclasses (list (find-class 'standard-object)))
+	 'class))
+
+;;; COMPUTE-DEFAULT-INITARGS protocol mismatch reported by Bruno
+;;; Haible
+(defparameter *extra-initarg-value* 'extra)
+(defclass custom-default-initargs-class (standard-class)
+  ())
+(defmethod compute-default-initargs ((class custom-default-initargs-class))
+  (let ((original-default-initargs
+	 (remove-duplicates
+	  (reduce #'append
+		  (mapcar #'class-direct-default-initargs
+			  (class-precedence-list class)))
+	  :key #'car
+	  :from-end t)))
+    (cons (list ':extra '*extra-initarg-value* #'(lambda () *extra-initarg-value*))
+	  (remove ':extra original-default-initargs :key #'car))))
+(defmethod validate-superclass ((c1 custom-default-initargs-class)
+				(c2 standard-class))
+  t)
+(defclass extra-initarg ()
+  ((slot :initarg :extra))
+  (:metaclass custom-default-initargs-class))
+(assert (eq (slot-value (make-instance 'extra-initarg) 'slot) 'extra))
 
 ;;;; success
 (sb-ext:quit :unix-status 104)