comparison lisp/emacs-lisp/advice.el @ 54493:d8586f19729a

(ad-subr-arglist): Simplify.

54492:75c387f0b055

;;; advice.el --- an overloading mechanism for Emacs Lisp functions

;; Copyright (C) 1993,1994,2000, 2001  Free Software Foundation, Inc.

;; Author: Hans Chalupsky <[e-mail]>
;; Maintainer: FSF
;; Created: 12 Dec 1992
;; Keywords: extensions, lisp, tools

(defun ad-subr-arglist (subr-name)
  "Retrieve arglist of the subr with SUBR-NAME.
Either use the one stored under the `ad-subr-arglist' property,
or try to retrieve it from the docstring and cache it under
that property, or otherwise use `(&rest ad-subr-args)'."
  (cond ((ad-subr-args-defined-p subr-name)
	 (ad-get-subr-args subr-name))
	;; says jwz: Should use this for Lemacs 19.8 and above:
	;;((fboundp 'subr-min-args)
	;;  ...)
	;; says hans: I guess what Jamie means is that I should use the values
	;; of `subr-min-args' and `subr-max-args' to construct the subr arglist
	;; without having to look it up via parsing the docstring, e.g.,
	;; values 1 and 2 would suggest `(arg1 &optional arg2)' as an
	;; argument list.  However, that won't work because there is no
	;; way to distinguish a subr with args `(a &optional b &rest c)' from
	;; one with args `(a &rest c)' using that mechanism. Also, the argument
	;; names from the docstring are more meaningful. Hence, I'll stick with
	;; the old way of doing things.
	(t (let ((doc (or (ad-real-documentation subr-name t) "")))
	     (cond ((string-match "^\\(([^\)]+)\\)\n?\\'" doc)
		    (ad-define-subr-args
		     subr-name
		     (cdr (car (read-from-string
				(downcase (match-string 1 doc))))))
		    (ad-get-subr-args subr-name))
		   ;; This is actually an error.
		   (t '(&rest ad-subr-args)))))))

(defun ad-docstring (definition)
  "Return the unexpanded docstring of DEFINITION."
  (let ((docstring
	 (if (ad-compiled-p definition)

54493:d8586f19729a

;;; advice.el --- an overloading mechanism for Emacs Lisp functions

;; Copyright (C) 1993,1994,2000,01,2004  Free Software Foundation, Inc.

;; Author: Hans Chalupsky <[e-mail]>
;; Maintainer: FSF
;; Created: 12 Dec 1992
;; Keywords: extensions, lisp, tools

(defun ad-subr-arglist (subr-name)
  "Retrieve arglist of the subr with SUBR-NAME.
Either use the one stored under the `ad-subr-arglist' property,
or try to retrieve it from the docstring and cache it under
that property, or otherwise use `(&rest ad-subr-args)'."
  (if (ad-subr-args-defined-p subr-name)
      (ad-get-subr-args subr-name)
    ;; says jwz: Should use this for Lemacs 19.8 and above:
    ;;((fboundp 'subr-min-args)
    ;;  ...)
    ;; says hans: I guess what Jamie means is that I should use the values
    ;; of `subr-min-args' and `subr-max-args' to construct the subr arglist
    ;; without having to look it up via parsing the docstring, e.g.,
    ;; values 1 and 2 would suggest `(arg1 &optional arg2)' as an
    ;; argument list.  However, that won't work because there is no
    ;; way to distinguish a subr with args `(a &optional b &rest c)' from
    ;; one with args `(a &rest c)' using that mechanism. Also, the argument
    ;; names from the docstring are more meaningful. Hence, I'll stick with
    ;; the old way of doing things.
    (let ((doc (or (ad-real-documentation subr-name t) "")))
      (if (not (string-match "\n\n\\((.+)\\)\\'" doc))
	  (error "The usage info is missing from the subr %s" subr-name)
	(ad-define-subr-args
	 subr-name
	 (cdr (car (read-from-string
		    (downcase (match-string 1 doc))))))
	(ad-get-subr-args subr-name)))))

(defun ad-docstring (definition)
  "Return the unexpanded docstring of DEFINITION."
  (let ((docstring
	 (if (ad-compiled-p definition)