From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#60953: The :match predicate with large regexp in tree-sitter font-lock seems inefficient Date: Mon, 30 Jan 2023 16:06:13 +0200 Message-ID: <83zga03yne.fsf@gnu.org> References: <7624dddc-4600-9a03-ac8b-d3c9e0ab618c@yandex.ru> <04729838-b7d4-8a08-2b71-12536a28aebb@yandex.ru> <83wn5ag4nc.fsf@gnu.org> <01b5d074-fb12-6b1f-cbfb-5e759833b854@yandex.ru> <838rhpg57n.fsf@gnu.org> <5026D975-983F-4D18-8690-BE139C92825D@gmail.com> <83pmb1emxi.fsf@gnu.org> <6f318afc-ca71-8b7e-c822-52e6635b5718@yandex.ru> <83sffxcfxw.fsf@gnu.org> <83pmb1cbg5.fsf@gnu.org> <2da844d3-ea31-289e-2821-aa174e365ffd@yandex.ru> <6784f9e7-844b-374d-2a1e-8a61cebe0d7e@yandex.ru> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16578"; mail-complaints-to="usenet@ciao.gmane.io" Cc: casouri@gmail.com, 60953@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jan 30 15:07:21 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 1pMUob-00046l-Oh for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 30 Jan 2023 15:07:21 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMUoK-0001K8-LL; Mon, 30 Jan 2023 09:07:04 -0500 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 1pMUoJ-0001EH-6w for bug-gnu-emacs@gnu.org; Mon, 30 Jan 2023 09:07:03 -0500 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 1pMUoI-0007Y8-Tg for bug-gnu-emacs@gnu.org; Mon, 30 Jan 2023 09:07:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pMUoI-0001up-GS for bug-gnu-emacs@gnu.org; Mon, 30 Jan 2023 09:07:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 30 Jan 2023 14:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60953 X-GNU-PR-Package: emacs Original-Received: via spool by 60953-submit@debbugs.gnu.org id=B60953.16750875907324 (code B ref 60953); Mon, 30 Jan 2023 14:07:02 +0000 Original-Received: (at 60953) by debbugs.gnu.org; 30 Jan 2023 14:06:30 +0000 Original-Received: from localhost ([127.0.0.1]:46735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMUnl-0001u4-IG for submit@debbugs.gnu.org; Mon, 30 Jan 2023 09:06:29 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:39794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMUni-0001tr-SL for 60953@debbugs.gnu.org; Mon, 30 Jan 2023 09:06:28 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMUnd-0007Sr-Hd; Mon, 30 Jan 2023 09:06:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=Wyq9ne4NlBwxBTb9CaVmeT/DuUxYnO30s70SqEbIgoo=; b=Z7nA98vW+1U3 chSFLQ2Nzmro7SbRU3z8azVu6K/GkJ2Rpwa8kfYA1OhDxcMIr+zfn1yI7TwpsrLmMkeIQZwNEHbxg KwlYujHlVyiSfyQfB/HQeBuNuX17w9irG215NFK4eFD6E/0aojWAkM4qs/dynlF35JXYYBn+8GaSd Yla8uQ6v7TmtMktcxaggDG8bjU8m7AWWqjnd8j0vJsobuHNb1ELsq1Pin5rUndTT0Pc6MCD/ZB9oO tBXYS4TwjyUXuu7Vz1UWb/w1lP8BMbFfWg5KrqQqvP908/T8P/vvmnaEKI2OgliFo8QudmmiBZxYF YCtDVsYevpSMCkxP4JWwGw==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMUnc-0006UU-Qv; Mon, 30 Jan 2023 09:06:21 -0500 In-Reply-To: <6784f9e7-844b-374d-2a1e-8a61cebe0d7e@yandex.ru> (message from Dmitry Gutov on Mon, 30 Jan 2023 02:49:47 +0200) 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:254427 Archived-At: > Date: Mon, 30 Jan 2023 02:49:47 +0200 > From: Dmitry Gutov > Cc: casouri@gmail.com, 60953@debbugs.gnu.org > > Code review welcome. See some below. > Is applying (and undoing) the narrowing this way legal enough? Or should > I go through some error handlers, or ensure blocks, etc? Mmm... no. You should use Fnarrow_to_region, I think. But why do you need to narrow there? fast_looking_at will not go beyond end_pos/end_byte anyway, there's no need to restrict it. Or are you thinking about widening a buffer that is already narrowed? But if so, can we have parser data beyond the restriction? > + Lisp_Object predicates = AREF(predicates_table, match.pattern_index); > + if (EQ (predicates, Qt)) > + { > + predicates = treesit_predicates_for_pattern (treesit_query, 0); > + ASET(predicates_table, match.pattern_index, predicates); Our style is to leave a blank between ASET and the left parenthesis. > + set_buffer_internal (buffer); > + > + TSNode treesit_node = XTS_NODE (node)->node; > + ptrdiff_t visible_beg = XTS_PARSER (XTS_NODE (node)->parser)->visible_beg; > + uint32_t start_byte_offset = ts_node_start_byte (treesit_node); > + uint32_t end_byte_offset = ts_node_end_byte (treesit_node); > + ptrdiff_t start_byte = visible_beg + start_byte_offset; > + ptrdiff_t end_byte = visible_beg + end_byte_offset; > + ptrdiff_t start_pos = buf_bytepos_to_charpos (buffer, start_byte); > + ptrdiff_t end_pos = buf_bytepos_to_charpos (buffer, end_byte); > + ptrdiff_t old_begv = BEGV; > + ptrdiff_t old_zv = ZV; Since you switch to BUFFER, you can use BYTE_TO_CHAR, no need for buf_bytepos_to_charpos. > + SET_BUF_BEGV(buffer, start_pos); > + SET_BUF_ZV(buffer, end_pos); And here I suggest an additional optimization, since you already know the byte positions: BEGV = start_pos; BEGV_BYTE = start_byte; ZV = end_pos; ZV_BYTE = end_byte;