function-lambda-expression: Return the name of a generic function.

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

diff --git a/tests/interface.impure.lisp b/tests/interface.impure.lisp
index 175edce..0838bdd 100644 (file)
--- a/tests/interface.impure.lisp
+++ b/tests/interface.impure.lisp
@@ -59,26 +59,26 @@
 ;;; while we're at it, much the same applies to
 ;;; FUNCTION-LAMBDA-EXPRESSION:
 (defun fle-fun (x) x)
-(function-lambda-expression #'fle-fun)
 
 (let ((x 1)) (defun fle-closure (y) (if y (setq x y) x)))
-(function-lambda-expression #'fle-closure)
 
-#+sb-eval
-(progn
-  ;; Nor should it fail on interpreted functions
-  (let ((sb-ext:*evaluator-mode* :interpret))
-    (eval `(defun fle-eval (x) x))
-    (function-lambda-expression #'fle-eval))
+(with-test (:name :function-lambda-expression)
+  (flet ((fle-name (x)
+           (nth-value 2 (function-lambda-expression x))))
+    (assert (eql (fle-name #'fle-fun) 'fle-fun))
+    (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))
+    #+sb-eval
+    (progn
+      (let ((sb-ext:*evaluator-mode* :interpret))
+        (eval `(defun fle-eval (x) x))
+        (assert (eql (fle-name #'fle-eval) 'fle-eval)))
+
+      ;; fle-eval should still be an interpreted function.
+      (assert (sb-eval:interpreted-function-p #'fle-eval)))))
 
-  ;; fle-eval should still be an interpreted function.
-  (assert (sb-eval:interpreted-function-p #'fle-eval)))
-
-;; nor should it fail on generic functions or other funcallable instances
-(defgeneric fle-generic (x))
-(function-lambda-expression #'fle-generic)
-(let ((fin (sb-mop:make-instance 'sb-mop:funcallable-standard-object)))
-  (function-lambda-expression fin))
 \f
 ;;; support for DESCRIBE tests
 (defstruct to-be-described a b)