[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 53dc1f3fe0a 4/4: Print know function types in C-h f
From: |
Andrea Corallo |
Subject: |
master 53dc1f3fe0a 4/4: Print know function types in C-h f |
Date: |
Sun, 4 Jun 2023 07:08:11 -0400 (EDT) |
branch: master
commit 53dc1f3fe0aa9b932e6413007e7a6d39c00f1721
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>
Print know function types in C-h f
* lisp/emacs-lisp/comp.el (comp-known-type-specifiers): Improve comment.
(comp-funciton-type-spec): New function.
* lisp/help-fns.el (help-fns--signature): Update to make use of
`comp-funciton-type-spec'.
---
lisp/emacs-lisp/comp.el | 28 ++++++++++++++++++++++++----
lisp/help-fns.el | 12 ++++++++----
2 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index da551ae2fd9..86707dd3516 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -277,10 +277,10 @@ Useful to hook into pass checkers.")
;; FIXME this probably should not be here but... good for now.
(defconst comp-known-type-specifiers
`(
- ;; Functions we can trust not to be or if redefined should expose
- ;; the same type. Vast majority of these is either pure or
- ;; primitive, the original list is the union of pure +
- ;; side-effect-free-fns + side-effect-and-error-free-fns:
+ ;; Functions we can trust not to be redefined or if redefined
+ ;; should expose the same type. The vast majority of these is
+ ;; either pure or primitive, the original list is the union of
+ ;; pure + side-effect-free-fns + side-effect-and-error-free-fns:
(% (function ((or number marker) (or number marker)) number))
(* (function (&rest (or number marker)) number))
(+ (function (&rest (or number marker)) number))
@@ -4447,6 +4447,26 @@ of (commands) to run simultaneously."
(delete-directory subdir))))))
(message "Cache cleared"))
+;;;###autoload
+(defun comp-funciton-type-spec (function)
+ "Given FUNCTION gives its type specifier.
+Return a cons with its car being the function specifier and its
+cdr being a symbol.
+
+If the symbol is `inferred' the type specifier is automatically
+inferred from the code itself by the native compiler, if it is
+`know' the type specifier comes from
+`comp-known-type-specifiers'."
+ (let ((kind 'know)
+ type-spec )
+ (when-let ((res (gethash function comp-known-func-cstr-h)))
+ (setf type-spec (comp-cstr-to-type-spec res)))
+ (unless type-spec
+ (setf kind 'inferred
+ type-spec (subr-type (symbol-function function))))
+ (when type-spec
+ (cons type-spec kind))))
+
(provide 'comp)
;; LocalWords: limplified limplification limplify Limple LIMPLE libgccjit elc
eln
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index c4e09e48bea..dcf265ea170 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -711,10 +711,14 @@ the C sources, too."
(unless (and (symbolp function)
(get function 'reader-construct))
(insert high-usage "\n")
- (when (and (featurep 'native-compile)
- (subr-native-elisp-p (symbol-function function))
- (subr-type (symbol-function function)))
- (insert (format "\nInferred type: %s\n" (subr-type
(symbol-function function))))))
+ (when-let* ((res (comp-funciton-type-spec function))
+ (type-spec (car res))
+ (kind (cdr res)))
+ (insert (format
+ (if (eq kind 'inferred)
+ "\nInferred type: %s\n"
+ "\nType: %s\n")
+ type-spec))))
(fill-region fill-begin (point))
high-doc)))))