X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-introspect%2Fsb-introspect.lisp;h=5ba8bdc350a76d04a015b9fe6c93a5572b3d8ea0;hb=decddddf7e581fa1ebee846e5fddcd52229bb9a8;hp=45b17845a0ad6b0c693c1c5739b85ba829e32096;hpb=f22ad70037030c07074327cf239bd84dc17b44b6;p=sbcl.git diff --git a/contrib/sb-introspect/sb-introspect.lisp b/contrib/sb-introspect/sb-introspect.lisp index 45b1784..5ba8bdc 100644 --- a/contrib/sb-introspect/sb-introspect.lisp +++ b/contrib/sb-introspect/sb-introspect.lisp @@ -25,6 +25,8 @@ (defpackage :sb-introspect (:use "CL") (:export "FUNCTION-ARGLIST" + "FUNCTION-LAMBDA-LIST" + "DEFTYPE-LAMBDA-LIST" "VALID-FUNCTION-NAME-P" "FIND-DEFINITION-SOURCE" "FIND-DEFINITION-SOURCES-BY-NAME" @@ -186,9 +188,14 @@ If an unsupported TYPE is requested, the function will return NIL. (not (eq type :generic-function))) (find-definition-source fun))))) ((:type) - (let ((expander-fun (sb-int:info :type :expander name))) - (when expander-fun - (find-definition-source expander-fun)))) + ;; Source locations for types are saved separately when the expander + ;; is a closure without a good source-location. + (let ((loc (sb-int:info :type :source-location name))) + (if loc + (translate-source-location loc) + (let ((expander-fun (sb-int:info :type :expander name))) + (when expander-fun + (find-definition-source expander-fun)))))) ((:method) (when (fboundp name) (let ((fun (real-fdefinition name))) @@ -224,11 +231,12 @@ If an unsupported TYPE is requested, the function will return NIL. (find-definition-source class))))) ((:method-combination) (let ((combination-fun - (ignore-errors (find-method #'sb-mop:find-method-combination - nil - (list (find-class 'generic-function) - (list 'eql name) - t))))) + (find-method #'sb-mop:find-method-combination + nil + (list (find-class 'generic-function) + (list 'eql name) + t) + nil))) (when combination-fun (find-definition-source combination-fun)))) ((:package) @@ -407,22 +415,36 @@ If an unsupported TYPE is requested, the function will return NIL. ;; FIXME there may be other structure predicate functions (member self (list *struct-predicate*)))) -;;; FIXME: maybe this should be renamed as FUNCTION-LAMBDA-LIST? (defun function-arglist (function) + "Deprecated alias for FUNCTION-LAMBDA-LIST." + (function-lambda-list function)) + +(define-compiler-macro function-arglist (function) + (sb-int:deprecation-warning 'function-arglist 'function-lambda-list) + `(function-lambda-list ,function)) + +(defun function-lambda-list (function) "Describe the lambda list for the extended function designator FUNCTION. -Works for special-operators, macros, simple functions, -interpreted functions, and generic functions. Signals error if -not found" +Works for special-operators, macros, simple functions, interpreted functions, +and generic functions. Signals an error if FUNCTION is not a valid extended +function designator." (cond ((valid-function-name-p function) - (function-arglist (or (and (symbolp function) - (macro-function function)) - (fdefinition function)))) + (function-lambda-list (or (and (symbolp function) + (macro-function function)) + (fdefinition function)))) ((typep function 'generic-function) (sb-pcl::generic-function-pretty-arglist function)) #+sb-eval ((typep function 'sb-eval:interpreted-function) (sb-eval:interpreted-function-lambda-list function)) - (t (sb-kernel:%simple-fun-arglist (sb-kernel:%fun-fun function))))) + (t + (sb-kernel:%simple-fun-arglist (sb-kernel:%fun-fun function))))) + +(defun deftype-lambda-list (typespec-operator) + "Returns the lambda list of TYPESPEC-OPERATOR as first return +value, and a flag whether the arglist could be found as second +value." + (sb-int:info :type :lambda-list typespec-operator)) (defun struct-accessor-structure-class (function) (let ((self (sb-vm::%simple-fun-self function)))