From: Christophe R. <cr...@us...> - 2003-03-22 12:25:25
|
Update of /cvsroot/sbcl/sbcl/tests In directory sc8-pr-cvs1:/tmp/cvs-serv17363/tests Modified Files: Tag: pcl_class_defrobulation_branch mop.impure.lisp Log Message: 0.7.13.pcl-class.7 New SB-MOP package ... use SB-PCL and reexport MOP-defined symbols ... to do that, we need to cope with dependencies in the package-data structures ... adjust MOP test to suit Index: mop.impure.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/tests/mop.impure.lisp,v retrieving revision 1.7.4.3 retrieving revision 1.7.4.4 diff -u -d -r1.7.4.3 -r1.7.4.4 --- mop.impure.lisp 21 Mar 2003 15:31:20 -0000 1.7.4.3 +++ mop.impure.lisp 22 Mar 2003 12:25:22 -0000 1.7.4.4 @@ -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 () ()) @@ -99,17 +97,17 @@ ;;; 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 @@ -119,9 +117,9 @@ ;;; and all generic functions in SB-PCL 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) + unless (or (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))) |