From: Eli Zaretskii <eliz@gnu.org>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: casouri@gmail.com, 60953@debbugs.gnu.org
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 [thread overview]
Message-ID: <83zga03yne.fsf@gnu.org> (raw)
In-Reply-To: <6784f9e7-844b-374d-2a1e-8a61cebe0d7e@yandex.ru> (message from Dmitry Gutov on Mon, 30 Jan 2023 02:49:47 +0200)
> Date: Mon, 30 Jan 2023 02:49:47 +0200
> From: Dmitry Gutov <dgutov@yandex.ru>
> 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;
next prev parent reply other threads:[~2023-01-30 14:06 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-20 3:53 bug#60953: The :match predicate with large regexp in tree-sitter font-lock seems inefficient Dmitry Gutov
2023-01-24 4:04 ` Dmitry Gutov
2023-01-25 3:13 ` Yuan Fu
2023-01-25 3:48 ` Dmitry Gutov
2023-01-25 12:49 ` Eli Zaretskii
2023-01-25 23:21 ` Dmitry Gutov
2023-01-26 6:50 ` Eli Zaretskii
2023-01-26 7:17 ` Yuan Fu
2023-01-26 8:10 ` Eli Zaretskii
2023-01-26 17:15 ` Dmitry Gutov
2023-01-26 18:24 ` Eli Zaretskii
2023-01-26 19:35 ` Dmitry Gutov
2023-01-26 20:01 ` Eli Zaretskii
2023-01-26 21:26 ` Dmitry Gutov
2023-01-30 0:49 ` Dmitry Gutov
2023-01-30 14:06 ` Eli Zaretskii [this message]
2023-01-30 14:47 ` Dmitry Gutov
2023-01-30 15:08 ` Eli Zaretskii
2023-01-30 17:15 ` Dmitry Gutov
2023-01-30 17:49 ` Eli Zaretskii
2023-01-30 18:20 ` Dmitry Gutov
2023-01-30 18:42 ` Eli Zaretskii
2023-01-30 19:01 ` Dmitry Gutov
2023-01-30 19:05 ` Eli Zaretskii
2023-01-30 19:58 ` Dmitry Gutov
2023-01-30 23:57 ` Yuan Fu
2023-01-31 0:44 ` Dmitry Gutov
2023-01-31 3:23 ` Eli Zaretskii
2023-01-31 18:16 ` Dmitry Gutov
2023-02-01 2:39 ` Dmitry Gutov
2023-02-01 13:39 ` Eli Zaretskii
2023-02-01 15:13 ` Dmitry Gutov
2023-02-01 21:20 ` Dmitry Gutov
2023-02-02 2:16 ` Yuan Fu
2023-02-02 6:34 ` Eli Zaretskii
2023-02-02 12:12 ` Dmitry Gutov
2023-02-02 14:23 ` Eli Zaretskii
2023-02-02 17:03 ` Dmitry Gutov
2023-02-02 17:26 ` Eli Zaretskii
2023-02-02 17:53 ` Dmitry Gutov
2023-02-02 18:03 ` Eli Zaretskii
2023-02-02 19:44 ` Dmitry Gutov
2023-02-01 13:10 ` Eli Zaretskii
2023-02-01 15:15 ` Dmitry Gutov
2023-01-26 17:12 ` Dmitry Gutov
2023-01-26 18:07 ` Dmitry Gutov
2023-01-26 20:46 ` Dmitry Gutov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83zga03yne.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=60953@debbugs.gnu.org \
--cc=casouri@gmail.com \
--cc=dgutov@yandex.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.