From unknown Tue Aug 19 05:11:36 2025 X-Loop: help-debbugs@gnu.org Subject: bug#46918: 28.0.50; checkdoc fooled by qualified method Resent-From: Mauro Aranda Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Mar 2021 13:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46918 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 46918@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16148643469276 (code B ref -1); Thu, 04 Mar 2021 13:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Mar 2021 13:25:46 +0000 Received: from localhost ([127.0.0.1]:58102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHnz8-0002PY-D9 for submit@debbugs.gnu.org; Thu, 04 Mar 2021 08:25:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:38108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHnz5-0002PQ-L6 for submit@debbugs.gnu.org; Thu, 04 Mar 2021 08:25:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHnz5-0002aj-EL for bug-gnu-emacs@gnu.org; Thu, 04 Mar 2021 08:25:43 -0500 Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]:35001) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHnyv-0003SW-RF for bug-gnu-emacs@gnu.org; Thu, 04 Mar 2021 08:25:41 -0500 Received: by mail-qt1-x830.google.com with SMTP id w1so20342420qto.2 for ; Thu, 04 Mar 2021 05:25:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:from:to:subject:date:mime-version; bh=qjB9556lYTJsF01CzZ8vmF98xJhLDWew4tKzwgWpeJs=; b=bRRVHeJ/VUI/7D329bBpJx9hAm3rEV4WLxHEm3wsiloFVmK9eQik1sXgdNJAIsxEyy /VNkktdUpjaO/AWXAkqvkYucQmGzFSmWdHqwQg5654/fHC5JGi6xvhDAbhNBOSOysQDg +fI/LeL/AxhlvUYqkidn7+fmwZHfLziTgmGsDKn1zrWqUAEyTJzAptaS3AklPEbA+cOs Vmi7iKobQGCSpb+wFsk7XVXCuW9b41GOtqK5okqZnsUbnls/OP49xYM3I/cJV26EhQY5 GTxvxSNkOJfRhqDdqyr1ajmz1PW+1Qs1cQD0J8/kNE/25lcs1HcPo7giKZ0l3X0p9Tsr W6Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:from:to:subject:date:mime-version; bh=qjB9556lYTJsF01CzZ8vmF98xJhLDWew4tKzwgWpeJs=; b=XHorbOq9fmpePPjSYG2k5Xmtu0x50dQAWbDtH7K9FniRhBA5DQf5diXNg5kZDmEly3 s4Bz619B/+dnEN7Ji9iq5DxzyuzPXFgjw8rpEMzmt0LrJfAVEehrHIWOcGN5AJA/qBg6 DMrQfw7vVwMsP607o7xqHJ6bTLqyzgLDEa7eY1UC+P0rj4JzBh3GO/Y5RWK3IIV2t/wf WmrFZKnhl1+sRD6rbxHGvwK/uG4Wk1gINtn25kfhIVSVf6rlOIWray4BxBVLal2s4Vf7 VujdgSxNIwpTpNCAF2jB4aEhULUnVSFyH8z5foLyX7SkteszFoGb/JLLrVHZ/p0u8CJH TM4Q== X-Gm-Message-State: AOAM533qmThgncNBxzX19eIwug8FS2+IA4vCvxMbOojpw+rtCpqSdbIB LWxbQzFCETV0eEalu84NjwnhmkvH7RoTqA== X-Google-Smtp-Source: ABdhPJxRn74/5cWHUC+RDwN2CrA+PJM6HrJMXsC4Vp9ZJUc/49yQNXA/BKauy2SLB3uNi4EKMZbH3w== X-Received: by 2002:ac8:7656:: with SMTP id i22mr4045553qtr.39.1614864330779; Thu, 04 Mar 2021 05:25:30 -0800 (PST) Received: from tbb-desktop ([201.213.132.172]) by smtp.gmail.com with ESMTPSA id y13sm187758qto.39.2021.03.04.05.25.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Mar 2021 05:25:30 -0800 (PST) Message-ID: <6040dfca.1c69fb81.518bd.1593@mx.google.com> X-Google-Original-Message-ID: <87eegvqce0.fsf@maurooaranda@gmail.com> From: Mauro Aranda Date: Thu, 04 Mar 2021 10:25:27 -0300 MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::830; envelope-from=maurooaranda@gmail.com; helo=mail-qt1-x830.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Starting from emacs -Q: 1. Type the following in the *scratch* buffer (cl-defmethod foo ((a (eql test))) "Return A." a) (cl-defmethod foo :around ((a (eql test))) "Return A." a) 2. M-x checkdoc 3. See how checkdoc doesn't complain about the first method, but does complain about the second method, with the following message: Error message: All variables and subroutines might as well have a documentation string which is wrong. From unknown Tue Aug 19 05:11:36 2025 X-Loop: help-debbugs@gnu.org Subject: bug#46918: 28.0.50; checkdoc fooled by qualified method Resent-From: Mauro Aranda Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Mar 2021 13:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46918 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 46918@debbugs.gnu.org Received: via spool by 46918-submit@debbugs.gnu.org id=B46918.16148644449461 (code B ref 46918); Thu, 04 Mar 2021 13:28:02 +0000 Received: (at 46918) by debbugs.gnu.org; 4 Mar 2021 13:27:24 +0000 Received: from localhost ([127.0.0.1]:58107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHo0h-0002SX-Q2 for submit@debbugs.gnu.org; Thu, 04 Mar 2021 08:27:24 -0500 Received: from mail-qk1-f172.google.com ([209.85.222.172]:41359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHo0c-0002SG-Hw for 46918@debbugs.gnu.org; Thu, 04 Mar 2021 08:27:22 -0500 Received: by mail-qk1-f172.google.com with SMTP id x10so2088377qkm.8 for <46918@debbugs.gnu.org>; Thu, 04 Mar 2021 05:27:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:from:to:subject:references:date:in-reply-to:user-agent :mime-version; bh=C2Ui8D2/t0bUn+/qABjM192CFu9/kcfxHvz/MUdJl5k=; b=WnqThwH3rxb46PFsxafo9Rh4oWFqeIHNv9F2rK8t2UFjYJrWhsA5ZA/MDcs4T5Kyf3 FrQ9k6tf10YywDYrr/lcDfQgxWTLyfoRI7U9tpL++4fi9wmhKNXO/T0mv4eJmiCZ5CHc rAQAFiI/RysYXZnJL1i8aKWlEqH5Hw3hzqKie1d3+Akfzkfal3Lnkg9m1ytJHdFNNdx3 LRl6aTxvQsHIOZuF1D6tUGOk24PyInQ31detC75NKMqxszRoJKVi94jWVVsSVgqg4k0W 2bOv2eF+S6+8T0MD4EL0n3Pu9XCY7DcX7psOSAOHU0Oy0ltYPY9I+lmbhTcoo6Bye0AI jCoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:from:to:subject:references:date :in-reply-to:user-agent:mime-version; bh=C2Ui8D2/t0bUn+/qABjM192CFu9/kcfxHvz/MUdJl5k=; b=WXYaEQFoBcuO+OZts2gX08jefwiSiDgti+lwFA+tL1/SuihDPCtBrTEdh2SIphKk+0 fX0hNOfjgv3m7xLng4g4DQH94yiMsm9pV7N3DePyye1EEU4JqzonzGWI8L82Wg7HiDB6 qKbdBG/ISSqoKR/+LHXMSQl+o/1Z5gUzQQmU3X3pxULlnVbpexXaeKSTAiI6C2K8WfmC GrztCFKhvXY6hsYmFR64nO0/pxyKlyQ/DsJP8EMUNy/E228yEYPZe4Ueubou4mgkGRJV d5mhb8ocIpKeiZwyhewEpfqN6hTCPDkoJd7dubgnb0tHpGmr/9pUmmmS/phgzYIm14a1 wKEw== X-Gm-Message-State: AOAM530AQzpI+kDIhqQb32ziBPXZMr8nOUftPnSVZuDr4RQ3wuoaXqvK Lj3hhW7t/JCHcuERE3xUQfPE+M7gYK8++w== X-Google-Smtp-Source: ABdhPJyj4r9ltsROjm8KzBCYtntn+QVUCCgFCCTZswNQRROX/ysUNm8GDZiL0wJBwIRHFxELAOlFbA== X-Received: by 2002:a37:490c:: with SMTP id w12mr3810748qka.156.1614864432760; Thu, 04 Mar 2021 05:27:12 -0800 (PST) Received: from tbb-desktop ([201.213.132.172]) by smtp.gmail.com with ESMTPSA id r133sm10408461qke.20.2021.03.04.05.27.11 for <46918@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Mar 2021 05:27:12 -0800 (PST) Message-ID: <6040e030.1c69fb81.9611c.2cb7@mx.google.com> X-Google-Original-Message-ID: <878s73qcb5.fsf@maurooaranda@gmail.com> From: Mauro Aranda References: <6040dfca.1c69fb81.518bd.1593@mx.google.com> Date: Thu, 04 Mar 2021 10:27:10 -0300 In-Reply-To: <6040dfca.1c69fb81.518bd.1593@mx.google.com> (Mauro Aranda's message of "Thu, 04 Mar 2021 10:25:27 -0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Oops, forgot to add the bug report information: In GNU Emacs 28.0.50 (build 12, x86_64-pc-linux-gnu, GTK+ Version 3.22.30, cairo version 1.15.10) of 2021-03-04 built on tbb-desktop Repository revision: ac42f719089a880bba418c95a7a16c4d7df392dd Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12008000 System Description: Ubuntu 18.04.5 LTS Configured features: CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG LIBSELINUX LIBXML2 MODULES NOTIFY INOTIFY PDUMPER PNG RSVG SOUND THREADS TIFF TOOLKIT_SCROLL_BARS X11 XDBE XIM XPM GTK3 ZLIB Important settings: value of $LC_MONETARY: es_AR.UTF-8 value of $LC_NUMERIC: es_AR.UTF-8 value of $LC_TIME: es_AR.UTF-8 value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Load-path shadows: None found. Features: (checkdoc lisp-mnt thingatpt help-fns radix-tree help-mode pp shadow sort mail-extr emacsbug message rmc puny dired dired-loaddefs rfc822 mml mml-sec epa derived epg epg-config gnus-util rmail rmail-loaddefs auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs password-cache json map text-property-search time-date subr-x seq byte-opt gv bytecomp byte-compile cconv mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader cl-loaddefs cl-lib sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils iso-transl tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core term/tty-colors frame minibuffer cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray cl-preloaded nadvice button loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote threads dbusbind inotify dynamic-setting system-font-setting font-render-setting cairo move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 55199 12044) (symbols 48 6955 4) (strings 32 20238 1400) (string-bytes 1 660821) (vectors 16 13795) (vector-slots 8 181278 17264) (floats 8 32 43) (intervals 56 381 38) (buffers 992 14)) From unknown Tue Aug 19 05:11:36 2025 X-Loop: help-debbugs@gnu.org Subject: bug#46918: 28.0.50; checkdoc fooled by qualified method Resent-From: Mauro Aranda Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Mar 2021 13:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46918 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 46918@debbugs.gnu.org Received: via spool by 46918-submit@debbugs.gnu.org id=B46918.16148647069946 (code B ref 46918); Thu, 04 Mar 2021 13:32:01 +0000 Received: (at 46918) by debbugs.gnu.org; 4 Mar 2021 13:31:46 +0000 Received: from localhost ([127.0.0.1]:58113 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHo4v-0002aH-Op for submit@debbugs.gnu.org; Thu, 04 Mar 2021 08:31:46 -0500 Received: from mail-qk1-f180.google.com ([209.85.222.180]:34191) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHo4r-0002Zu-2A; Thu, 04 Mar 2021 08:31:43 -0500 Received: by mail-qk1-f180.google.com with SMTP id t4so9568685qkp.1; Thu, 04 Mar 2021 05:31:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:from:to:subject:references:date:in-reply-to:user-agent :mime-version; bh=g5dWvlOe4O5Om5es3AS3hIh012vAsfay3E71akWL5PY=; b=j2z7TG3phjAjly2rrwNOOgXDC03J6VVl409CvhExKQJ9j8b3fceV1nia6amhmB1Z5I w+5kEPsD9Xa5luLaloYnN6t+jd0b/zJTHoEgnl5MJKKgFYGH31BvRDrNjC+QEwddNm0h gdhBhQyhueWeSh1NIF+vxdf+9f8gBsDo+oFCI4rRgi+FW+9YDqd/BxVGOsV3rPr9ovGQ r9NnkeZuulgS1TnMpBRlSeeruLHhS3pBPGMTGrp7dnI6cjPlEhN7GHGz3wvdEB8hiiDR lhN6rzKU707tsa3kVvuZP7k3aKnrT1sUP820ar47YhyUeEMspzko1mWpiLeESE5TPp23 2VCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:from:to:subject:references:date :in-reply-to:user-agent:mime-version; bh=g5dWvlOe4O5Om5es3AS3hIh012vAsfay3E71akWL5PY=; b=idAF2LdRT+cLFCnlPrteYY5h62JmSo/vw93IpU7rVPaA9l0GxeKoKKcuF7q+PbSHbW tmv0X9CQerV2CBu0n/7YIgyNZ3Zy9qyDRTlHLDZamxuv0uKtJQpHxu8Bi4dkgJIQkvs9 BT6UR5/ZaoJd96YFQYUEi0qdW3nNiMb6RmgehcwqqPa5lpFsWod/7/t/Oct5r74lIHVG jajnYEL4/mvhCUNEvhQn1DPgHZmJaRHTjaYbc4pG7UUdxYLi4S7O4o96bYtZkNEM34Nb CwWuO4ecLbXScpXTcMV34qPZVRaIhhlvoGfeLkCjdRr2k7NZ6GWT1Z14T2EwO9eDS5W/ hm1g== X-Gm-Message-State: AOAM531l6OFXH0SbtQxgLD9ZB4TMbqre5X89KCZCP6I/C4AUtARD2SsS hRXiI91hu5suKnzuFGDXqWi/nK6KcaGnr5zk X-Google-Smtp-Source: ABdhPJwWT4TkPO3p0vT811ZvsJg5Ic4GFggFalWR8jkTnIMnFB9s6OTGZXPh+OZB8mq9jEhgGjuXrQ== X-Received: by 2002:a05:620a:91b:: with SMTP id v27mr3957990qkv.201.1614864695404; Thu, 04 Mar 2021 05:31:35 -0800 (PST) Received: from tbb-desktop ([201.213.132.172]) by smtp.gmail.com with ESMTPSA id h67sm19677903qkd.112.2021.03.04.05.31.33 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Mar 2021 05:31:34 -0800 (PST) Message-ID: <6040e136.1c69fb81.ef964.af22@mx.google.com> X-Google-Original-Message-ID: <8735xbqc3v.fsf@maurooaranda@gmail.com> From: Mauro Aranda References: <6040dfca.1c69fb81.518bd.1593@mx.google.com> <6040e030.1c69fb81.9611c.2cb7@mx.google.com> Date: Thu, 04 Mar 2021 10:31:32 -0300 In-Reply-To: <6040e030.1c69fb81.9611c.2cb7@mx.google.com> (Mauro Aranda's message of "Thu, 04 Mar 2021 10:27:10 -0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain tags 46918 patch quit I attach a patch to fix this, together with new tests. I wanted to keep the first case simple, so I moved the handling of cl-defmethod to a different case. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Make-checkdoc-work-with-qualified-methods.patch Content-Description: Patch >From 3d6e813a42f3472c817cc512ccba60c70e04b64e Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Thu, 4 Mar 2021 08:34:58 -0300 Subject: [PATCH] Make checkdoc work with qualified methods * lisp/emacs-lisp/checkdoc.el (checkdoc--next-docstring): Handle cl-defmethod in a case of its own. Check for the presence of qualifiers, and skip them accordingly until the docstring. * test/lisp/emacs-lisp/checkdoc-tests.el (checkdoc-cl-defmethod-qualified-ok) (checkdoc-cl-defmethod-with-extra-qualifier-ok) (checkdoc-cl-defmethod-with-extra-and-nil-args-ok): Add tests for the fix. --- lisp/emacs-lisp/checkdoc.el | 21 +++++++++++++++++++- test/lisp/emacs-lisp/checkdoc-tests.el | 27 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 75aefdc7ba..213ab43184 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -932,7 +932,7 @@ checkdoc--next-docstring ;; definition ends prematurely. (end-of-file))) (`(,(or 'defun 'defvar 'defcustom 'defmacro 'defconst 'defsubst 'defadvice - 'cl-defun 'cl-defgeneric 'cl-defmethod 'cl-defmacro) + 'cl-defun 'cl-defgeneric 'cl-defmacro) ,(pred symbolp) ;; Require an initializer, i.e. ignore single-argument `defvar' ;; forms, which never have a doc string. @@ -942,6 +942,25 @@ checkdoc--next-docstring ;; initializer or argument list. (forward-sexp 3) (skip-chars-forward " \n\t") + t) + (`(,'cl-defmethod + ,(pred symbolp) + . ,rest) + (down-list) + (forward-sexp (pcase (car rest) + ;; No qualifier, so skip like we would have skipped in + ;; the first clause of the outer `pcase'. + ((pred listp) 3) + (':extra + ;; Skip the :extra qualifier together with its string too. + ;; Skip any additional qualifier. + (if (memq (nth 2 rest) '(:around :before :after)) + 6 + 5)) + ;; Skip :before, :after or :around qualifier too. + ((or ':around ':before ':after) + 4))) + (skip-chars-forward " \n\t") t))) ;;;###autoload diff --git a/test/lisp/emacs-lisp/checkdoc-tests.el b/test/lisp/emacs-lisp/checkdoc-tests.el index 93015fbb10..7a7aa9fb3c 100644 --- a/test/lisp/emacs-lisp/checkdoc-tests.el +++ b/test/lisp/emacs-lisp/checkdoc-tests.el @@ -52,6 +52,33 @@ checkdoc-cl-defmethod-with-types-ok (insert "(cl-defmethod foo ((a (eql smthg)) (b list)) \"Return A+B.\")") (checkdoc-defun))) +(ert-deftest checkdoc-cl-defmethod-qualified-ok () + "Checkdoc should be happy with a `cl-defmethod' using qualifiers." + (with-temp-buffer + (emacs-lisp-mode) + (insert "(cl-defmethod test :around ((a (eql smthg))) \"Return A.\")") + (checkdoc-defun))) + +(ert-deftest checkdoc-cl-defmethod-with-extra-qualifier-ok () + "Checkdoc should be happy with a :extra qualified `cl-defmethod'." + (with-temp-buffer + (emacs-lisp-mode) + (insert "(cl-defmethod foo :extra \"foo\" ((a (eql smthg))) \"Return A.\")") + (checkdoc-defun)) + + (with-temp-buffer + (emacs-lisp-mode) + (insert + "(cl-defmethod foo :extra \"foo\" :after ((a (eql smthg))) \"Return A.\")") + (checkdoc-defun))) + +(ert-deftest checkdoc-cl-defmethod-with-extra-qualifier-and-nil-args-ok () + "Checkdoc should be happy with a 0-arity :extra qualified `cl-defmethod'." + (with-temp-buffer + (emacs-lisp-mode) + (insert "(cl-defmethod foo :extra \"foo\" () \"Return A.\")") + (checkdoc-defun))) + (ert-deftest checkdoc-cl-defun-with-key-ok () "Checkdoc should be happy with a cl-defun using &key." (with-temp-buffer -- 2.30.0 --=-=-=-- From unknown Tue Aug 19 05:11:36 2025 X-Loop: help-debbugs@gnu.org Subject: bug#46918: 28.0.50; checkdoc fooled by qualified method Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Mar 2021 20:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46918 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Mauro Aranda Cc: 46918@debbugs.gnu.org Received: via spool by 46918-submit@debbugs.gnu.org id=B46918.16148891099665 (code B ref 46918); Thu, 04 Mar 2021 20:19:02 +0000 Received: (at 46918) by debbugs.gnu.org; 4 Mar 2021 20:18:29 +0000 Received: from localhost ([127.0.0.1]:60353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHuQX-0002Vo-Ku for submit@debbugs.gnu.org; Thu, 04 Mar 2021 15:18:29 -0500 Received: from quimby.gnus.org ([95.216.78.240]:53884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHuQW-0002VV-9y for 46918@debbugs.gnu.org; Thu, 04 Mar 2021 15:18:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xoKixlGw5Q25uuZ81LI1xHShIG0S2L6VR6IWFrGUAhQ=; b=IhJySorMgP8ZiAnfGnpSjxf71x 4RW10i0fIbNZDjR2z5+4uwrWPeLIOz6rGF00lykCQKlSF7qf9apoN2WTxWv+E55nKs2/i2sgCjQCM AR4uXwGYZ/ZbCsOMdw6vdwHtIrUB9hTXZJyQWBFSS0vlIj0FRstz9HmLb1Xm9PN3rakw=; Received: from cm-84.212.220.105.getinternet.no ([84.212.220.105] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lHuQN-0006fF-Qw; Thu, 04 Mar 2021 21:18:22 +0100 From: Lars Ingebrigtsen References: <6040dfca.1c69fb81.518bd.1593@mx.google.com> <6040e030.1c69fb81.9611c.2cb7@mx.google.com> <6040e136.1c69fb81.ef964.af22@mx.google.com> X-Now-Playing: Trevor Horn's _Trevor Horn Reimagines The Eighties_: "The Power of Love (feat. Matt Cardle)" Date: Thu, 04 Mar 2021 21:18:18 +0100 In-Reply-To: <6040e136.1c69fb81.ef964.af22@mx.google.com> (Mauro Aranda's message of "Thu, 04 Mar 2021 10:31:32 -0300") Message-ID: <87pn0eu0z9.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Mauro Aranda writes: > I attach a patch to fix this, together with new tests. I wanted to keep > the first case simple, so I moved the handling of cl-defmethod to a > different case. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Mauro Aranda writes: > I attach a patch to fix this, together with new tests. I wanted to keep > the first case simple, so I moved the handling of cl-defmethod to a > different case. Looks good to me. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Tue Aug 19 05:11:36 2025 X-Loop: help-debbugs@gnu.org Subject: bug#46918: 28.0.50; checkdoc fooled by qualified method References: <6040dfca.1c69fb81.518bd.1593@mx.google.com> Resent-From: Mauro Aranda Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Mar 2021 20:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46918 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Lars Ingebrigtsen Cc: 46918@debbugs.gnu.org Received: via spool by 46918-submit@debbugs.gnu.org id=B46918.161489013019432 (code B ref 46918); Thu, 04 Mar 2021 20:36:01 +0000 Received: (at 46918) by debbugs.gnu.org; 4 Mar 2021 20:35:30 +0000 Received: from localhost ([127.0.0.1]:60396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHuh0-00053F-Gp for submit@debbugs.gnu.org; Thu, 04 Mar 2021 15:35:30 -0500 Received: from mail-qk1-f175.google.com ([209.85.222.175]:34521) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHugz-00052y-8O; Thu, 04 Mar 2021 15:35:29 -0500 Received: by mail-qk1-f175.google.com with SMTP id t4so11188261qkp.1; Thu, 04 Mar 2021 12:35:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:from:to:cc:subject:in-reply-to:date:mime-version; bh=kCcfzFi0bniAfwG/FqU0G8jMSLsOz8hzfmJFr+FZplw=; b=VwdP1ulJ3VRFrAu8tw6Cyzn+agqAtQQ0TJ+dfuC2u4jv4KSfZ2cC3r4akv3o2AqK+6 HKgBJ7BOY8ypI1cSv5vtZAq5jAlSJR9io5AlngOtsjbEf5gvmyMx5vf3b1xiciNIVl1W 2fDxllIN42YLI4+8lWMBwAP8AjxmSHdOnFKu/dt/ZmpIHvCY1iz7dg1I98bIGwefQcYp 0/4tS6O6JbLSoJMegmJ3eUwp7usx6UOl1OzKSXV9+D3gfq/031cuLc+yJVDULzONECb4 1V6s33t4bvUSXimbYWmKVvU4FVKwGzHW3hZWT74O7K7PS4VEb1WpWJeNH8W4IrbkLELZ HdUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:from:to:cc:subject:in-reply-to:date :mime-version; bh=kCcfzFi0bniAfwG/FqU0G8jMSLsOz8hzfmJFr+FZplw=; b=Gj4SwQWFf0u8mR5wjBudYAr60HXEfWbCV1t1scCoOq0JN8XdDONaz2fJ8nG38kb26q CaZEEfGYWdr162Jj7FFeQYSZVSMoGClv/BolVKkqlRVVfoMGt0+EBUKyWBjuRSXDwZX3 ffP8WUGHokpEnlhPU5m8kfJK9eoOQNHjCVSbIuoGucnNok31vDMEyj9+LLMrOkiQejr8 pbtJJlo2AjSGa9XYm7slX4c1JURW7f/Ne36C6rpx+AFKAv8oB7OCCtzyAOSRxueJhlRx HnvVX5tLgPE6nnVYnuMqPHcv9U0H6luapThGTsiY5KqOmzjNickFQcJOl+lpwzSw7lRf oFQQ== X-Gm-Message-State: AOAM531dEutql/0R/oWvwjFe7oQxPZmNWrunWnfD1Ltu7fmixigUtH0y ZYW5HUmHPXbXdzwPQ0SUGd1qeTZf60KHT3JV X-Google-Smtp-Source: ABdhPJyQX1AatAwqSNf6d3mwehIKumN0w1yjZXoB0OIkZwkQYkGfXFjYaX+JDT5cV0X6JKV/iZAunw== X-Received: by 2002:a05:620a:16dc:: with SMTP id a28mr5889589qkn.442.1614890123468; Thu, 04 Mar 2021 12:35:23 -0800 (PST) Received: from tbb-desktop ([201.213.132.172]) by smtp.gmail.com with ESMTPSA id b10sm495498qtt.23.2021.03.04.12.35.21 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Mar 2021 12:35:23 -0800 (PST) Message-ID: <6041448b.1c69fb81.6debe.3d8e@mx.google.com> X-Google-Original-Message-ID: <87eegur71z.fsf@maurooaranda@gmail.com> From: Mauro Aranda In-Reply-To: <87pn0eu0z9.fsf@gnus.org> (message from Lars Ingebrigtsen on Thu, 04 Mar 2021 21:18:18 +0100) Date: Thu, 04 Mar 2021 17:35:20 -0300 MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 46918 28.1 quit Lars Ingebrigtsen writes: > Mauro Aranda writes: > >> I attach a patch to fix this, together with new tests. I wanted to keep >> the first case simple, so I moved the handling of cl-defmethod to a >> different case. > > Looks good to me. Thanks, I pushed the fix to master. It should be tweaked if the :extra qualifier is allowed to come last (Bug#46917), but it should be easy to do that.