X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fmop.impure.lisp;h=d5116f999bca40a8a6d59e87d26a0acebbce8449;hb=602c9b1f15e2d96e4b79a3341a734b5eb8e02093;hp=135c330c84572da7d0fb2bf0d1d4d882d7e17605;hpb=8160f3ac81fff66563276cfbc7546d43891dae5c;p=sbcl.git diff --git a/tests/mop.impure.lisp b/tests/mop.impure.lisp index 135c330..d5116f9 100644 --- a/tests/mop.impure.lisp +++ b/tests/mop.impure.lisp @@ -11,22 +11,20 @@ ;;;; absolutely no warranty. See the COPYING and CREDITS files for ;;;; more information. -;;;; Note that the MOP is not in a supported state. Package issues -;;;; (both MOP/SB-PCL and CL/SB-PCL) have yet to be resolved, and -;;;; there is likely to be missing functionality. However, this seems -;;;; a good a way as any of ensuring that we have no regressions. +;;;; Note that the MOP is not in an entirely supported state. +;;;; However, this seems a good a way as any of ensuring that we have +;;;; no regressions. (defpackage "MOP-TEST" - ;; eventually, we might want "MOP" as well here. - (:use "CL")) + (:use "CL" "SB-MOP")) (in-package "MOP-TEST") ;;; Readers for Class Metaobjects (pp. 212--214 of AMOP) (defclass red-herring (forward-ref) ()) -(assert (null (sb-pcl:class-direct-slots (find-class 'forward-ref)))) -(assert (null (sb-pcl:class-direct-default-initargs +(assert (null (class-direct-slots (find-class 'forward-ref)))) +(assert (null (class-direct-default-initargs (find-class 'forward-ref)))) ;;; Readers for Generic Function Metaobjects (pp. 216--218 of AMOP) @@ -34,23 +32,23 @@ (:argument-precedence-order b c a)) (assert (equal - (sb-pcl:generic-function-lambda-list #'fn-with-odd-arg-precedence) + (generic-function-lambda-list #'fn-with-odd-arg-precedence) '(a b c))) (assert (equal - (sb-pcl:generic-function-argument-precedence-order #'fn-with-odd-arg-precedence) + (generic-function-argument-precedence-order #'fn-with-odd-arg-precedence) '(b c a))) ;;; Test for DOCUMENTATION's order, which was wrong until sbcl-0.7.8.39 (assert (equal - (sb-pcl:generic-function-argument-precedence-order #'documentation) - (let ((ll (sb-pcl:generic-function-lambda-list #'documentation))) + (generic-function-argument-precedence-order #'documentation) + (let ((ll (generic-function-lambda-list #'documentation))) (list (nth 1 ll) (nth 0 ll))))) (assert (null - (sb-pcl:generic-function-declarations #'fn-with-odd-arg-precedence))) + (generic-function-declarations #'fn-with-odd-arg-precedence))) (defgeneric gf-with-declarations (x) (declare (optimize (speed 3))) (declare (optimize (safety 0)))) -(let ((decls (sb-pcl:generic-function-declarations #'gf-with-declarations))) +(let ((decls (generic-function-declarations #'gf-with-declarations))) (assert (= (length decls) 2)) (assert (member '(optimize (speed 3)) decls :test #'equal)) (assert (member '(optimize (safety 0)) decls :test #'equal))) @@ -64,16 +62,16 @@ (a-class-slot :allocation :class :accessor a-class-slot))) (dolist (m (list (list #'an-instance-slot :instance) (list #'a-class-slot :class))) - (let ((methods (sb-pcl:generic-function-methods (car m)))) + (let ((methods (generic-function-methods (car m)))) (assert (= (length methods) 1)) - (assert (eq (sb-pcl:slot-definition-allocation - (sb-pcl:accessor-method-slot-definition + (assert (eq (slot-definition-allocation + (accessor-method-slot-definition (car methods))) (cadr m))))) ;;; Class Finalization Protocol (see section 5.5.2 of AMOP) (let ((finalized-count 0)) - (defmethod sb-pcl:finalize-inheritance :after ((x standard-class)) + (defmethod finalize-inheritance :after ((x standard-class)) (incf finalized-count)) (defun get-count () finalized-count)) (defclass finalization-test-1 () ()) @@ -91,7 +89,7 @@ ;;; that it is at least possible to define classes with that as a ;;; metaclass. (defclass gf-class (standard-generic-function) () - (:metaclass sb-pcl::funcallable-standard-class)) + (:metaclass funcallable-standard-class)) (defgeneric g (a b c) (:generic-function-class gf-class)) @@ -99,32 +97,78 @@ ;;; relationships. These aren't necessarily true, but are probably ;;; not going to change often. (dolist (x '(number array sequence character symbol)) - (assert (eq (car (sb-pcl:class-direct-superclasses (find-class x))) + (assert (eq (car (class-direct-superclasses (find-class x))) (find-class t))) (assert (member (find-class x) - (sb-pcl:class-direct-subclasses (find-class t))))) + (class-direct-subclasses (find-class t))))) ;;; the class-prototype of the NULL class used to be some weird ;;; standard-instance-like thing. Make sure it's actually NIL. ;;; ;;; (and FIXME: eventually turn this into asserting that the prototype ;;; of all built-in-classes is of the relevant type) -(assert (null (sb-pcl:class-prototype (find-class 'null)))) +(assert (null (class-prototype (find-class 'null)))) -;;; simple consistency checks for the SB-PCL (perhaps AKA SB-MOP) -;;; package: all of the functionality specified in AMOP is in -;;; functions: -(assert (null (loop for x being each external-symbol in "SB-PCL" - unless (fboundp x) collect x))) -;;; and all generic functions in SB-PCL have at least one specified +;;; simple consistency checks for the SB-MOP package: all of the +;;; functionality specified in AMOP is in functions and classes: +(assert (null (loop for x being each external-symbol in "SB-MOP" + unless (or (fboundp x) (find-class x)) collect x))) +;;; and all generic functions in SB-MOP have at least one specified ;;; method, except for UPDATE-DEPENDENT -(assert (null (loop for x being each external-symbol in "SB-PCL" - unless (or (eq x 'sb-pcl:update-dependent) +(assert (null (loop for x being each external-symbol in "SB-MOP" + unless (or (not (fboundp x)) + (eq x 'update-dependent) (not (typep (fdefinition x) 'generic-function)) - (> (length (sb-pcl:generic-function-methods + (> (length (generic-function-methods (fdefinition x))) 0)) collect x))) +;;; make sure that ENSURE-CLASS-USING-CLASS's arguments are the right +;;; way round (!) +(defvar *e-c-u-c-arg-order* nil) +(defmethod ensure-class-using-class :after + (class (name (eql 'e-c-u-c-arg-order)) &key &allow-other-keys) + (setf *e-c-u-c-arg-order* t)) +(defclass e-c-u-c-arg-orderoid () ()) +(assert (null *e-c-u-c-arg-order*)) +(defclass e-c-u-c-arg-order () ()) +(assert (eq *e-c-u-c-arg-order* t)) + +;;; verify that FIND-CLASS works after FINALIZE-INHERITANCE +(defclass automethod-class (standard-class) ()) +(defmethod validate-superclass ((c1 automethod-class) (c2 standard-class)) + t) +(defmethod finalize-inheritance :after ((x automethod-class)) + (format t "~&~S ~S~%" x (find-class (class-name x)))) +(defclass automethod-object () () + (:metaclass automethod-class)) +(defvar *automethod-object* (make-instance 'automethod-object)) +(assert (typep *automethod-object* 'automethod-object)) + +;;; COMPUTE-EFFECTIVE-SLOT-DEFINITION should take three arguments, one +;;; of which is the name of the slot. +(defvar *compute-effective-slot-definition-count* 0) +(defmethod compute-effective-slot-definition :before + (class (name (eql 'foo)) dsds) + (incf *compute-effective-slot-definition-count*)) +(defclass cesd-test-class () + ((foo :initarg :foo))) +(make-instance 'cesd-test-class :foo 3) +;;; FIXME: this assertion seems a little weak. I don't know why +;;; COMPUTE-EFFECTIVE-SLOT-DEFINITION gets called twice in this +;;; sequence, nor whether that's compliant with AMOP. -- CSR, +;;; 2003-04-17 +(assert (> *compute-effective-slot-definition-count* 0)) + +;;; this used to cause a nasty uncaught metacircularity in PCL. +(defclass substandard-method (standard-method) ()) +(defgeneric substandard-defgeneric (x y) + (:method-class substandard-method) + (:method ((x number) (y number)) (+ x y)) + (:method ((x string) (y string)) (concatenate 'string x y))) +(assert (= (substandard-defgeneric 1 2) 3)) +(assert (string= (substandard-defgeneric "1" "2") "12")) + ;;;; success (sb-ext:quit :unix-status 104)