X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fmop-6.impure-cload.lisp;h=64bb8f359b123d111ff239c76e1b3c21bdac71f9;hb=60deeb7616b22ae52cf1dd8bbc2904a1a0d80ffd;hp=06254d84c63297fdb3f4c6c8c1d3d8aa4c61056a;hpb=9ce24dc604859d2670a989da2a9015b67c37e00f;p=sbcl.git diff --git a/tests/mop-6.impure-cload.lisp b/tests/mop-6.impure-cload.lisp index 06254d8..64bb8f3 100644 --- a/tests/mop-6.impure-cload.lisp +++ b/tests/mop-6.impure-cload.lisp @@ -19,7 +19,7 @@ (in-package "MOP-6") ;;; COMPUTE-SLOTS :AROUND respecting requested order -(defclass slot-rearrangement-class (standard-class) +(defclass slot-rearrangement-class (standard-class) ()) (defmethod compute-slots ((c slot-rearrangement-class)) (reverse (call-next-method))) @@ -31,12 +31,12 @@ (b :initarg :b :initform 2)) (:metaclass slot-rearrangement-class)) -(with-test (:name (compute-slots standard-class :order)) +(with-test (:name (:compute-slots :standard-class :order)) (let ((class (find-class 'rearranged-class))) (finalize-inheritance class) - (assert (equal (mapcar #'slot-definition-name (class-slots class)) + (assert (equal (mapcar #'slot-definition-name (class-slots class)) '(b a))))) -(with-test (:name (compute-slots standard-class :slots)) +(with-test (:name (:compute-slots :standard-class :slots)) (let ((r (make-instance 'rearranged-class)) (r2 (make-instance 'rearranged-class :a 3 :b 4))) (assert (eql (slot-value r 'a) 1)) @@ -56,19 +56,19 @@ (b :initarg :b :initform 2)) (:metaclass funcallable-slot-rearrangement-class)) -(with-test (:name (compute-slots funcallable-standard-class :order)) +(with-test (:name (:compute-slots :funcallable-standard-class :order)) (let ((class (find-class 'funcallable-rearranged-class))) (finalize-inheritance class) - (assert (equal (mapcar #'slot-definition-name (class-slots class)) + (assert (equal (mapcar #'slot-definition-name (class-slots class)) '(b a))))) -(with-test (:name (compute-slots funcallable-standard-class :slots)) +(with-test (:name (:compute-slots :funcallable-standard-class :slots)) (let ((r (make-instance 'funcallable-rearranged-class)) (r2 (make-instance 'funcallable-rearranged-class :a 3 :b 4))) (assert (eql (slot-value r 'a) 1)) (assert (eql (slot-value r 'b) 2)) (assert (eql (slot-value r2 'a) 3)) (assert (eql (slot-value r2 'b) 4)))) -(with-test (:name (compute-slots funcallable-standard-clas :function)) +(with-test (:name (:compute-slots :funcallable-standard-clas :function)) (let ((r (make-instance 'funcallable-rearranged-class))) (set-funcallable-instance-function r (lambda (x) (list "Hello, World!" x))) (assert (equal (funcall r 3) '("Hello, World!" 3))))) \ No newline at end of file