X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fmop.impure.lisp;h=e446bffa579771e6d3a26daf0a8d189a31b29954;hb=41d85303c73124856e193aea2c15f4e8f5bb9ec8;hp=f78e6bbd4eb82775b8435396284fc65417cc9b23;hpb=6ef051b23f4b54081aaf119ba8be523c4e014b80;p=sbcl.git

diff --git a/tests/mop.impure.lisp b/tests/mop.impure.lisp
index f78e6bb..e446bff 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 () ())
@@ -99,17 +97,42 @@
 ;;; 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
+;;; method, except for UPDATE-DEPENDENT
+(assert (null (loop for x being each external-symbol in "SB-PCL"
+		    unless (or (eq x 'update-dependent)
+			       (not (typep (fdefinition x) 'generic-function))
+			       (> (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))
 ;;;; success
 (sb-ext:quit :unix-status 104)