From: Alan Mackenzie <acm@muc.de>
To: 63535@debbugs.gnu.org
Cc: acm@muc.de
Subject: bug#63535: Master branch: Error in forw_comment (syntax.c) handling of escaped LFs
Date: Tue, 16 May 2023 14:03:18 +0000 [thread overview]
Message-ID: <ZGONJsKaOuu-ys-j@ACM> (raw)
In-Reply-To: <ZGNhpJ619imkJlhr@ACM>
On Tue, May 16, 2023 at 10:57:40 +0000, Alan Mackenzie wrote:
> Hello, Emacs.
> In the master branch:
> Consider the following C++ Mode buffer:
> // comment \
> comment line 2
> line_3();
> .. The backslash at the end of line 1 extends the comment into line 2.
> Put point at // on L1, and do:
> M-: (setq s (parse-partial-sexp (point) (+ (point) 9)))
> .. s gets the parse state of the inside of the comment.
> Now put point at EOL 1, between the backslash and the LF. Do
> M-: (parse-partial-sexp (point) (point-max) nil nil s 'syntax-table)
> .. This ought to leave point at BOL 2, since the syntax before the LF at
> EOL 1 is that of a C++ comment, otherwise neutral. Instead, it leaves
> point wrongly at BOL 3.
> #########################################################################
> The reason for this bug is at L+42 of forw_comment (in syntax.c). There
> we have
> && !(comment_end_can_be_escaped && char_quoted (from, from_byte))
> .. Checking char_quoted is wrong. Instead the function should check the
> current parse state.
And here is a patch which fixes it. I will apply this patch to master
soon if I don't hear any objection.
diff --git a/src/syntax.c b/src/syntax.c
index e9e04e2d638..76d9f16e4ed 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -2344,7 +2344,9 @@ forw_comment (ptrdiff_t from, ptrdiff_t from_byte, ptrdiff_t stop,
&& SYNTAX_FLAGS_COMMENT_STYLE (syntax, 0) == style
&& (SYNTAX_FLAGS_COMMENT_NESTED (syntax) ?
(nesting > 0 && --nesting == 0) : nesting < 0)
- && !(comment_end_can_be_escaped && char_quoted (from, from_byte)))
+ && !(comment_end_can_be_escaped &&
+ (((prev_syntax & 0xff) == Sescape)
+ || ((prev_syntax & 0xff) == Scharquote))))
/* We have encountered a comment end of the same style
as the comment sequence which began this comment
section. */
--
Alan Mackenzie (Nuremberg, Germany).
next prev parent reply other threads:[~2023-05-16 14:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-16 10:57 bug#63535: Master branch: Error in forw_comment (syntax.c) handling of escaped LFs Alan Mackenzie
2023-05-16 14:03 ` Alan Mackenzie [this message]
2023-05-17 22:01 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-05-22 14:59 ` Alan Mackenzie
2023-05-22 15:16 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-05-22 16:16 ` Alan Mackenzie
2023-05-16 15:43 ` Eli Zaretskii
2023-05-16 16:15 ` Alan Mackenzie
2023-05-16 16:29 ` Eli Zaretskii
2023-05-16 16:58 ` Alan Mackenzie
2023-05-16 17:50 ` Eli Zaretskii
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=ZGONJsKaOuu-ys-j@ACM \
--to=acm@muc.de \
--cc=63535@debbugs.gnu.org \
/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.