From eec6e1bce391f19b8ca2da0df4ae737b563f70d1 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 16 Apr 2024 21:17:47 -0400 Subject: [PATCH] (cl-defstruct): Improve handling of unknown options Until now `cl-defstruct` signaled an error when encountering an unknown option. It's easy to code and it does the job, but it doesn't give good location info in the compiler's output, and it makes it more painful to use not-yet-supported options. So just signal a warning instead. * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Warn about unknown options, instead of signaling an error. (cherry picked from commit 484b0979099d91e286c248e32b2f693111fac2ad) --- lisp/emacs-lisp/cl-macs.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 1350e474d6a..2e501005bf7 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -3010,6 +3010,7 @@ To see the documentation for a defined struct type, use ;; All the above is for the following def-form. &rest &or symbolp (symbolp &optional def-form &rest sexp)))) (let* ((name (if (consp struct) (car struct) struct)) + (warning nil) (opts (cdr-safe struct)) (slots nil) (defaults nil) @@ -3094,7 +3095,10 @@ To see the documentation for a defined struct type, use (setq descs (nconc (make-list (car args) '(cl-skip-slot)) descs))) (t - (error "Structure option %s unrecognized" opt))))) + (setq warning + (macroexp-warn-and-return + (format "Structure option %S unrecognized" opt) + warning nil nil (list opt struct))))))) (unless (or include-name type ;; Don't create a bogus parent to `cl-structure-object' ;; while compiling the (cl-defstruct cl-structure-object ..) @@ -3333,6 +3337,7 @@ To see the documentation for a defined struct type, use (cl-struct-define ',name ,docstring ',include-name ',(or type 'record) ,(eq named t) ',descs ',tag-symbol ',tag ',print-auto)) + ,warning ',name))) ;;; Add cl-struct support to pcase -- 2.39.5