better encapsulation support in generic functions

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

diff --git a/tests/interface.impure.lisp b/tests/interface.impure.lisp
index 0838bdd..63e7c7a 100644 (file)
--- a/tests/interface.impure.lisp
+++ b/tests/interface.impure.lisp
@@ -30,31 +30,32 @@
 (assert (string= (documentation #'(setf foo) 'function)
                  "(setf foo) documentation"))
 \f
+(with-test (:name :disassemble)
 ;;; DISASSEMBLE shouldn't fail on closures or unpurified functions
-(defun disassemble-fun (x) x)
-(disassemble 'disassemble-fun)
-
-(let ((x 1)) (defun disassemble-closure (y) (if y (setq x y) x)))
-(disassemble 'disassemble-closure)
-
-#+sb-eval
-(progn
-  ;; Nor should it fail on interpreted functions
-  (let ((sb-ext:*evaluator-mode* :interpret))
-    (eval `(defun disassemble-eval (x) x))
-    (disassemble 'disassemble-eval))
-
-  ;; disassemble-eval should still be an interpreted function.
-  ;; clhs disassemble: "(If that function is an interpreted function,
-  ;; it is first compiled but the result of this implicit compilation
-  ;; is not installed.)"
-  (assert (sb-eval:interpreted-function-p #'disassemble-eval)))
-
-;; nor should it fail on generic functions or other funcallable instances
-(defgeneric disassemble-generic (x))
-(disassemble 'disassemble-generic)
-(let ((fin (sb-mop:make-instance 'sb-mop:funcallable-standard-object)))
-  (disassemble fin))
+  (defun disassemble-fun (x) x)
+  (disassemble 'disassemble-fun)
+
+  (let ((x 1)) (defun disassemble-closure (y) (if y (setq x y) x)))
+  (disassemble 'disassemble-closure)
+
+  #+sb-eval
+  (progn
+    ;; Nor should it fail on interpreted functions
+    (let ((sb-ext:*evaluator-mode* :interpret))
+      (eval `(defun disassemble-eval (x) x))
+      (disassemble 'disassemble-eval))
+
+    ;; disassemble-eval should still be an interpreted function.
+    ;; clhs disassemble: "(If that function is an interpreted function,
+    ;; it is first compiled but the result of this implicit compilation
+    ;; is not installed.)"
+    (assert (sb-eval:interpreted-function-p #'disassemble-eval)))
+
+  ;; nor should it fail on generic functions or other funcallable instances
+  (defgeneric disassemble-generic (x))
+  (disassemble 'disassemble-generic)
+  (let ((fin (make-instance 'sb-mop:funcallable-standard-object)))
+    (disassemble fin)))
 
 ;;; while we're at it, much the same applies to
 ;;; FUNCTION-LAMBDA-EXPRESSION:
@@ -69,7 +70,11 @@
     (assert (eql (fle-name #'fle-closure) 'fle-closure))
     (assert (eql (fle-name #'disassemble-generic) 'disassemble-generic))
     (function-lambda-expression
-     (sb-mop:make-instance 'sb-mop:funcallable-standard-object))
+     (make-instance 'sb-mop:funcallable-standard-object))
+    (function-lambda-expression
+     (make-instance 'generic-function))
+    (function-lambda-expression
+     (make-instance 'standard-generic-function))
     #+sb-eval
     (progn
       (let ((sb-ext:*evaluator-mode* :interpret))
@@ -86,6 +91,10 @@
 (let ((sb-ext:*evaluator-mode* :compile))
   (eval `(let (x) (defun closure-to-describe () (incf x)))))
 
+(with-test (:name :describe-empty-gf)
+  (describe (make-instance 'generic-function))
+  (describe (make-instance 'standard-generic-function)))
+
 ;;; DESCRIBE should run without signalling an error.
 (with-test (:name (describe :no-error))
   (describe (make-to-be-described))
@@ -319,5 +328,18 @@
        (declare (ignore x))
        nil))))
 
+(with-test (:name (trace generic-function))
+  (defgeneric traced-gf (x))
+  (defmethod traced-gf (x) (1+ x))
+  (assert (= (traced-gf 3) 4))
+  (trace traced-gf)
+  (let ((output (with-output-to-string (*trace-output*)
+                  (assert (= (traced-gf 3) 4)))))
+    (assert (> (length output) 0)))
+  (assert (typep #'traced-gf 'standard-generic-function))
+  (untrace traced-gf)
+  (let ((output (with-output-to-string (*trace-output*)
+                  (assert (= (traced-gf 3) 4)))))
+    (assert (= (length output) 0))))
 \f
 ;;;; success