0.9.1.4: ENSURE-CLASS-USING-CLASS patch by Gerd Moellman, from cmucl-imp

[sbcl.git] / tests / mop.impure.lisp

diff --git a/tests/mop.impure.lisp b/tests/mop.impure.lisp
index c510eb1..f58ff98 100644 (file)
--- a/tests/mop.impure.lisp
+++ b/tests/mop.impure.lisp
@@ -383,6 +383,28 @@
   (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))
 \f
 ;;;; success
 (sb-ext:quit :unix-status 104)