0.pre7.71:

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

diff --git a/tests/interface.pure.lisp b/tests/interface.pure.lisp
index 8c163b8..6febe33 100644 (file)
--- a/tests/interface.pure.lisp
+++ b/tests/interface.pure.lisp
@@ -20,22 +20,21 @@
 (defvar *public-package-names*
   '("SB-ALIEN" "SB-C-CALL" "SB-DEBUG" "SB-EXT" "SB-GRAY" "SB-MP"
     "SB-PROFILE" "SB-PCL" "COMMON-LISP"))
-(defun has-arglist-info-p (function)
-  (declare (type function function))
+(defun has-arglist-info-p (fun)
+  (declare (type function fun))
   ;; The Lisp-level type FUNCTION can conceal a multitude of sins..
-  (case (sb-kernel:get-type function)
-    ((#.sb-vm:function-header-type #.sb-vm:closure-function-header-type)
-      (sb-kernel:%function-arglist function))
-    (#.sb-vm:closure-header-type (has-arglist-info-p
-                                  (sb-kernel:%closure-function
-                                   function)))
+  (case (sb-kernel:get-type fun)
+    ((#.sb-vm:simple-fun-header-widetag #.sb-vm:closure-fun-header-widetag)
+      (sb-kernel:%simple-fun-arglist fun))
+    (#.sb-vm:closure-header-widetag (has-arglist-info-p
+                                    (sb-kernel:%closure-fun fun)))
     ;; In code/describe.lisp, ll. 227 (%describe-function), we use a scheme
     ;; like above, and it seems to work. -- MNA 2001-06-12
     ;;
     ;; (There might be other cases with arglist info also.
-    ;; FUNCTION-HEADER-TYPE and CLOSURE-HEADER-TYPE just
+    ;; SIMPLE-FUN-HEADER-WIDETAG and CLOSURE-HEADER-WIDETAG just
     ;; happen to be the two case that I had my nose rubbed in when
-    ;; debugging a GC problem caused by applying %FUNCTION-ARGLIST to
+    ;; debugging a GC problem caused by applying %SIMPLE-FUN-ARGLIST to
     ;; a closure. -- WHN 2001-06-05)
     (t nil)))
 (defun check-ext-symbols-arglist (package)
@@ -50,9 +49,6 @@
               ;; though, and I haven't figured out what does work
               ;; right. For now we just punt.
               (values))
-             #+nil 
-             ((sb-int:info :function :accessor-for ext-sym)
-              (values))
              ((typep fun 'generic-function)
                 (sb-pcl::generic-function-pretty-arglist fun))
              (t