From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Basil Contovounesios via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#64052: 30.0.50; Minor treesit cleanups Date: Tue, 13 Jun 2023 19:02:26 +0100 Message-ID: <87legnb5ql.fsf@epfl.ch> Reply-To: Basil Contovounesios Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34461"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Yuan Fu To: 64052@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jun 13 20:03:23 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q98MV-0008hz-0c for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 13 Jun 2023 20:03:23 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q98MD-0003ly-B9; Tue, 13 Jun 2023 14:03:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q98MA-0003la-Iy for bug-gnu-emacs@gnu.org; Tue, 13 Jun 2023 14:03:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q98MA-0004po-A6 for bug-gnu-emacs@gnu.org; Tue, 13 Jun 2023 14:03:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q98MA-0000wb-5E; Tue, 13 Jun 2023 14:03:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Basil Contovounesios Original-Sender: "Debbugs-submit" Resent-CC: casouri@gmail.com, bug-gnu-emacs@gnu.org Resent-Date: Tue, 13 Jun 2023 18:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64052 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: Yuan Fu Original-Received: via spool by submit@debbugs.gnu.org id=B.16866793563577 (code B ref -1); Tue, 13 Jun 2023 18:03:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Jun 2023 18:02:36 +0000 Original-Received: from localhost ([127.0.0.1]:43038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q98Lj-0000vc-7m for submit@debbugs.gnu.org; Tue, 13 Jun 2023 14:02:35 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:41392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q98Lh-0000vS-Ge for submit@debbugs.gnu.org; Tue, 13 Jun 2023 14:02:34 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q98Lh-0003k9-3Y for bug-gnu-emacs@gnu.org; Tue, 13 Jun 2023 14:02:33 -0400 Original-Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q98Le-0004n8-Lq for bug-gnu-emacs@gnu.org; Tue, 13 Jun 2023 14:02:32 -0400 Original-Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f8c65020dfso12598375e9.2 for ; Tue, 13 Jun 2023 11:02:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd.ie; s=google21; t=1686679348; x=1689271348; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=rPi/hERhssDgahB0pSmVmveIz1/FBBcspZZ4qvNEY2o=; b=R2AkLuIzSYGrP0NhkRb2dTnXqtKL+mwrbNKAlGryY+xpXsczNMHq5QWnuhQ2DUN2hR CxRqe6123ODzpGaB5OtojsmfY5gQd158FYqX26GtjWkWuclr9UtrMTNGtro56PiUqLeb XCwaXH9Xsg/xhoVCV8HHyvE+zApSn4tfPjtzcr88duxSesVZpNBfv0TnpocoGPcQYTmo SsXW1BOuR26Dv9yMFLNz4VS0JDC0doo1aM9yP6yzQn+QUdyfTRAN5noPpAk5aasPUCsF gQVgldKvt/ALy0FWsTE9H+heJTP/MxEUk1xEF0z73DMirI8/Zqx5P65WP34WftckVrqT j93w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686679348; x=1689271348; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rPi/hERhssDgahB0pSmVmveIz1/FBBcspZZ4qvNEY2o=; b=HFYZOO705HztzqUCTLYTg9TJMqFpWB0tL3ohtzYpCTpSIJQ2Yj4GYSOR+Vyr+URpbA f9jsjfdz2e6tSkYLD1uy6fr3gKcGFW4cFjHKvdlzVZBer7ZVdYHXBb6X7rNeE4pQYqI9 C+fTrWmRBRA05386f4/LZF8SzwvywiTagn+0pKRTOJynNz6fDcVcnYbEN/7qp5QRCZUP oFIAM/ruX1AFQS0w47HXM9T87aDMnohCx+gjx6AlhQsFdX3ytHKM69196BcmVa3FuvAd Tlv2cePwMFdWDoLYtHx/owvlEg76EDWuAVfTd5VamiEnEt6r3ly7s9fWOeOox5lX9gkE mZwA== X-Gm-Message-State: AC+VfDylgq4Yq1Xe1tjp3bFbIvFjbBrhdty/pG0VqTpZ24AhuZWLcej0 MdfG4IH+mVcQslaPKCO9FUKVCRnEK1t5KbXP2ro= X-Google-Smtp-Source: ACHHUZ6gqmPkyAQrAY5G5/m5W1ul4T/oo9rWY5oUtOkcU42SaYb6k/mFHW3En4kj21C7DDCrNMq9dQ== X-Received: by 2002:a7b:ce8a:0:b0:3f7:b6d9:46a0 with SMTP id q10-20020a7bce8a000000b003f7b6d946a0mr10647404wmj.30.1686679348214; Tue, 13 Jun 2023 11:02:28 -0700 (PDT) Original-Received: from localhost ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id p14-20020a7bcc8e000000b003f605566610sm15049567wma.13.2023.06.13.11.02.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jun 2023 11:02:27 -0700 (PDT) Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=contovob@tcd.ie; helo=mail-wm1-x336.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:263342 Archived-At: --=-=-= Content-Type: text/plain Severity: minor Tags: patch I noticed tree-sitter query predicates are using Flength where I believe list_length can be used directly, and the corresponding error messages say 'only got N arguments' even when N exceeds the expected number. Are these changes welcome/okay? Thanks, -- Basil --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Minor-tree-sitter-cleanups.patch >From 8d291e5c704c9d0ebae44d343ab8f3a464589967 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Sat, 3 Jun 2023 11:25:05 +0100 Subject: [PATCH] Minor tree-sitter cleanups * lisp/treesit.el (treesit-fontify-with-override): Fix docstring grammar. Remove redundant precondition. * src/treesit.c (Ftreesit_parser_set_included_ranges): Fix typo in commentary. (treesit_predicate_equal, treesit_predicate_match) (treesit_predicate_pred): Avoid fixnum roundtrip by using list_length in place of Flength. Make error messages more accurate. (treesit_eval_predicates): Quote predicate names in error message. --- lisp/treesit.el | 5 ++--- src/treesit.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lisp/treesit.el b/lisp/treesit.el index ea701ce1ff7..1dec830687f 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -894,13 +894,12 @@ treesit-fontify-with-override (start end face override &optional bound-start bound-end) "Apply FACE to the region between START and END. OVERRIDE can be nil, t, `append', `prepend', or `keep'. -See `treesit-font-lock-rules' for their semantic. +See `treesit-font-lock-rules' for their semantics. If BOUND-START and BOUND-END are non-nil, only fontify the region in between them." (when (or (null bound-start) (null bound-end) - (and bound-start bound-end - (<= bound-start end) + (and (<= bound-start end) (>= bound-end start))) (when (and bound-start bound-end) (setq start (max bound-start start) diff --git a/src/treesit.c b/src/treesit.c index 0af0e347694..ca627e1d7b3 100644 --- a/src/treesit.c +++ b/src/treesit.c @@ -1649,7 +1649,7 @@ DEFUN ("treesit-parser-set-included-ranges", TSRange *treesit_ranges = xmalloc (sizeof (TSRange) * len); struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer); - /* We can use XFUXNUM, XCAR, XCDR freely because we have checked + /* We can use XFIXNUM, XCAR, XCDR freely because we have checked the input by treesit_check_range_argument. */ for (int idx = 0; !NILP (ranges); idx++, ranges = XCDR (ranges)) @@ -2500,10 +2500,10 @@ treesit_predicate_capture_name_to_text (Lisp_Object name, treesit_predicate_equal (Lisp_Object args, struct capture_range captures, Lisp_Object *signal_data) { - if (XFIXNUM (Flength (args)) != 2) + if (list_length (args) != 2) { *signal_data = list2 (build_string ("Predicate `equal' requires " - "two arguments but only given"), + "two arguments but got"), Flength (args)); return false; } @@ -2535,10 +2535,10 @@ treesit_predicate_equal (Lisp_Object args, struct capture_range captures, treesit_predicate_match (Lisp_Object args, struct capture_range captures, Lisp_Object *signal_data) { - if (XFIXNUM (Flength (args)) != 2) + if (list_length (args) != 2) { *signal_data = list2 (build_string ("Predicate `match' requires two " - "arguments but only given"), + "arguments but got"), Flength (args)); return false; } @@ -2600,11 +2600,11 @@ treesit_predicate_match (Lisp_Object args, struct capture_range captures, treesit_predicate_pred (Lisp_Object args, struct capture_range captures, Lisp_Object *signal_data) { - if (XFIXNUM (Flength (args)) < 2) + if (list_length (args) < 2) { *signal_data = list2 (build_string ("Predicate `pred' requires " "at least two arguments, " - "but was only given"), + "but only got"), Flength (args)); return false; } @@ -2625,7 +2625,7 @@ treesit_predicate_pred (Lisp_Object args, struct capture_range captures, return !NILP (CALLN (Fapply, fn, nodes)); } -/* If all predicates in PREDICATES passes, return true; otherwise +/* If all predicates in PREDICATES pass, return true; otherwise return false. If everything goes fine, don't touch SIGNAL_DATA; if error occurs, set it to a suitable signal data. */ static bool @@ -2650,7 +2650,7 @@ treesit_eval_predicates (struct capture_range captures, Lisp_Object predicates, { *signal_data = list3 (build_string ("Invalid predicate"), fn, build_string ("Currently Emacs only supports" - " equal, match, and pred" + " `equal', `match', and `pred'" " predicates")); pass = false; } -- 2.34.1 --=-=-= Content-Type: text/plain In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo version 1.16.0, Xaw3d scroll bars) of 2023-06-13 built on blc Repository revision: 81932ebcfa56a33fcb1c7d9f91094e2b1f6e9b77 Repository branch: blc/treesit/master Windowing system distributor 'The X.Org Foundation', version 11.0.12101004 System Description: Ubuntu 22.04.2 LTS Configured using: 'configure CC=gcc-12 'CFLAGS=-Og -ggdb3' --prefix=/home/bic/.local --with-file-notification=yes --with-x --with-x-toolkit=lucid' Configured features: ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER WEBP X11 XAW3D XDBE XIM XINPUT2 XPM LUCID ZLIB Important settings: value of $LC_MONETARY: en_IE.UTF-8 value of $LC_NUMERIC: en_IE.UTF-8 value of $LC_TIME: en_IE.UTF-8 value of $LANG: en_GB.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t eldoc-mode: t show-paren-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 line-number-mode: t indent-tabs-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message mailcap yank-media puny dired dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068 epg-config gnus-util text-property-search time-date subr-x 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 rmc iso-transl tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode 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 lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine 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 emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads dbusbind inotify lcms2 dynamic-setting system-font-setting font-render-setting cairo x-toolkit xinput2 x multi-tty make-network-process emacs) Memory information: ((conses 16 36740 9186) (symbols 48 5178 0) (strings 32 13887 1303) (string-bytes 1 379577) (vectors 16 9299) (vector-slots 8 148629 8492) (floats 8 23 25) (intervals 56 245 0) (buffers 984 10)) --=-=-=--