X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Finterface.pure.lisp;h=3fb1cf41d2792d9203b9712ac6f7f48b72811f0d;hb=8dc064d2296902f01afd9107e89a81146e3771fe;hp=0db8c7226db9190f3a3b37f2675bfb02ce5ff7f4;hpb=dfa55a883f94470267b626dae77ce7e7dfac3df6;p=sbcl.git

diff --git a/tests/interface.pure.lisp b/tests/interface.pure.lisp
index 0db8c72..3fb1cf4 100644
--- a/tests/interface.pure.lisp
+++ b/tests/interface.pure.lisp
@@ -16,19 +16,53 @@
 ;;; with byte compilation, since at least in sbcl-0.6.12 the byte
 ;;; compiler can't record argument list information.)
 (defvar *public-package-names*
-  '("SB-ALIEN" "SB-C-CALL" "SB-DEBUG" "SB-EXT" "SB-EXT""SB-GRAY" "SB-MP"
+  '("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)
-  (and (not (typep function 'sb-c::byte-function))
-       (sb-kernel:%function-arglist function)))
+  (declare (type function function))
+  ;; 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)))
+    ;; 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
+    ;; happen to be the two case that I had my nose rubbed in when
+    ;; debugging a GC problem caused by applying %FUNCTION-ARGLIST to
+    ;; a closure. -- WHN 2001-06-05)
+    (t nil)))
 (defun check-ext-symbols-arglist (package)
   (format t "~% looking at package: ~A" package)
   (do-external-symbols (ext-sym package)
     (when (fboundp ext-sym)
       (let ((fun (symbol-function ext-sym)))
-        (unless (has-arglist-info-p fun)
-          (error "~%Function ~A (~A) has no argument-list information available, ~%~
-                 and is probably byte-compiled.~%" ext-sym fun))))))
+	(cond ((macro-function ext-sym)
+	       ;; FIXME: Macro functions should have their argument list
+	       ;; information checked separately. Just feeding them into
+	       ;; the ordinary-function logic below doesn't work right,
+	       ;; 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
+	       (let ((fun (symbol-function ext-sym)))
+		 (unless (has-arglist-info-p fun)
+		   (error "Function ~A has no arg-list information available."
+			  ext-sym)))))))))
 (dolist (public-package *public-package-names*)
   (when (find-package public-package)
     (check-ext-symbols-arglist public-package)))
+(terpri)
+
+;;; FIXME: It would probably be good to require here that every
+;;; external symbol either has a doc string or has some good excuse
+;;; (like being an accessor for a structure which has a doc string).