* bug#15728: 24.3.50; cc-mode incorrectly parses particular macro
@ 2013-10-27 4:16 Dima Kogan
2013-10-27 13:49 ` bug#15728: bug #15728: " Alan Mackenzie
2013-10-27 21:51 ` Alan Mackenzie
0 siblings, 2 replies; 4+ messages in thread
From: Dima Kogan @ 2013-10-27 4:16 UTC (permalink / raw)
To: 15728
I have the following source file:
=========================================================================
int f(void)
{
#define A(b) \
int abc ## b; \
g()
}
=========================================================================
This indentation is what the latest emacs thinks is correct. Note that
the g() line is indented ahead of the 'int abc' line. This is wrong;
they should have the same indentation. Indeed this is what happens with
emacs23.
In the latest emacs the syntax parser thinks the g() line is
'statement-cont', instead of 'statement'; this is directly related to
the issue. Furthermore, the 'abc ## b' construct is what's confusing the
parser. Removing the '##' makes it parse correctly again.
I'm observing this issue with all emacs24 builds I've tried, with 'emacs
-Q'.
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#15728: bug #15728: 24.3.50; cc-mode incorrectly parses particular macro
2013-10-27 4:16 bug#15728: 24.3.50; cc-mode incorrectly parses particular macro Dima Kogan
@ 2013-10-27 13:49 ` Alan Mackenzie
2013-10-27 18:45 ` Dima Kogan
2013-10-27 21:51 ` Alan Mackenzie
1 sibling, 1 reply; 4+ messages in thread
From: Alan Mackenzie @ 2013-10-27 13:49 UTC (permalink / raw)
To: 15728; +Cc: Dima Kogan
Hello, Dima
Dima Kogan <dima@secretsauce.net> writes:
> I have the following source file:
> =========================================================================
> int f(void)
> {
> #define A(b) \
> int abc ## b; \
> g()
> }
> =========================================================================
> This indentation is what the latest emacs thinks is correct. Note that
> the g() line is indented ahead of the 'int abc' line. This is wrong;
> they should have the same indentation. Indeed this is what happens with
> emacs23.
> In the latest emacs the syntax parser thinks the g() line is
> 'statement-cont', instead of 'statement'; this is directly related to
> the issue. Furthermore, the 'abc ## b' construct is what's confusing the
> parser. Removing the '##' makes it parse correctly again.
Funnily enough, it seems to work OK if the macro isn't written inside a
function.
> I'm observing this issue with all emacs24 builds I've tried, with 'emacs
> -Q'.
Thanks for the bug report, and thanks even more for making it crisp and
concise.
I think the following patch should fix it. Would you try it out,
please, and let me know how well it works.
diff -r c21bf2a4a8b8 cc-engine.el
--- a/cc-engine.el Sun Oct 20 14:10:45 2013 +0000
+++ b/cc-engine.el Sun Oct 27 13:31:43 2013 +0000
@@ -1266,12 +1266,15 @@
;; looking for more : and ?.
(setq c-maybe-labelp nil
skip-chars (substring c-stmt-delim-chars 0 -2)))
- ;; At a CPP construct?
- ((and c-opt-cpp-symbol (looking-at c-opt-cpp-symbol)
- (save-excursion
- (forward-line 0)
- (looking-at c-opt-cpp-prefix)))
- (c-end-of-macro))
+ ;; At a CPP construct or a "#" or "##" operator?
+ ((and c-opt-cpp-symbol (looking-at c-opt-cpp-symbol))
+ (if (save-excursion
+ (skip-chars-backward " \t")
+ (and (bolp)
+ (or (bobp)
+ (not (eq (char-before (1- (point))) ?\\)))))
+ (c-end-of-macro)
+ (skip-chars-forward c-opt-cpp-symbol)))
((memq (char-after) non-skip-list)
(throw 'done (point)))))
;; In trailing space after an as yet undetected virtual semicolon?
--
Alan Mackenzie (Nuremberg, Germany).
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#15728: bug #15728: 24.3.50; cc-mode incorrectly parses particular macro
2013-10-27 13:49 ` bug#15728: bug #15728: " Alan Mackenzie
@ 2013-10-27 18:45 ` Dima Kogan
0 siblings, 0 replies; 4+ messages in thread
From: Dima Kogan @ 2013-10-27 18:45 UTC (permalink / raw)
To: 15728
Alan Mackenzie <acm@muc.de> writes:
> I think the following patch should fix it. Would you try it out,
> please, and let me know how well it works.
Hi Alan. I tried the patch and it does solve the issue for me. Thank you
very much for fixing this issue so quickly.
dima
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#15728: bug #15728: 24.3.50; cc-mode incorrectly parses particular macro
2013-10-27 4:16 bug#15728: 24.3.50; cc-mode incorrectly parses particular macro Dima Kogan
2013-10-27 13:49 ` bug#15728: bug #15728: " Alan Mackenzie
@ 2013-10-27 21:51 ` Alan Mackenzie
1 sibling, 0 replies; 4+ messages in thread
From: Alan Mackenzie @ 2013-10-27 21:51 UTC (permalink / raw)
To: 15728-done
Bug fixed.
--
Alan Mackenzie (Nuremberg, Germany).
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-10-27 21:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-27 4:16 bug#15728: 24.3.50; cc-mode incorrectly parses particular macro Dima Kogan
2013-10-27 13:49 ` bug#15728: bug #15728: " Alan Mackenzie
2013-10-27 18:45 ` Dima Kogan
2013-10-27 21:51 ` Alan Mackenzie
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).