From 96d6689d3c9b7ed3ea791c6a6c0345e89ba209f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johan=20Bockg=C3=A5rd?= Date: Sat, 5 Sep 2015 17:10:50 +0200 Subject: [PATCH] Use PAT rather than UPAT in pcase macros * lisp/emacs-lisp/cl-macs.el (cl-struct) : * lisp/emacs-lisp/eieio.el (eieio) : Use PAT rather than UPAT. --- lisp/emacs-lisp/cl-macs.el | 6 +++--- lisp/emacs-lisp/eieio.el | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 06e75b36670..30581e37e94 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2777,10 +2777,10 @@ non-nil value, that slot cannot be set via `setf'. ;;;###autoload (pcase-defmacro cl-struct (type &rest fields) "Pcase patterns to match cl-structs. -Elements of FIELDS can be of the form (NAME UPAT) in which case the contents of -field NAME is matched against UPAT, or they can be of the form NAME which +Elements of FIELDS can be of the form (NAME PAT) in which case the contents of +field NAME is matched against PAT, or they can be of the form NAME which is a shorthand for (NAME NAME)." - (declare (debug (sexp &rest [&or (sexp pcase-UPAT) sexp]))) + (declare (debug (sexp &rest [&or (sexp pcase-PAT) sexp]))) `(and (pred (pcase--flip cl-typep ',type)) ,@(mapcar (lambda (field) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 23203003d07..d6c27be0567 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -349,10 +349,10 @@ variable name of the same name as the slot." (pcase-defmacro eieio (&rest fields) "Pcase patterns to match EIEIO objects. -Elements of FIELDS can be of the form (NAME UPAT) in which case the contents of -field NAME is matched against UPAT, or they can be of the form NAME which +Elements of FIELDS can be of the form (NAME PAT) in which case the contents of +field NAME is matched against PAT, or they can be of the form NAME which is a shorthand for (NAME NAME)." - (declare (debug (&rest [&or (sexp pcase-UPAT) sexp]))) + (declare (debug (&rest [&or (sexp pcase-PAT) sexp]))) (let ((is (make-symbol "table"))) ;; FIXME: This generates a horrendous mess of redundant let bindings. ;; `pcase' needs to be improved somehow to introduce let-bindings more -- 2.39.2