[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#15728: bug #15728: 24.3.50; cc-mode incorrectly parses particular ma
bug#15728: bug #15728: 24.3.50; cc-mode incorrectly parses particular macro
Sun, 27 Oct 2013 13:49:15 +0000
Dima Kogan <address@hidden> writes:
> I have the following source file:
> int f(void)
> #define A(b) \
> int abc ## b; \
> 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
> 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
> I'm observing this issue with all emacs24 builds I've tried, with 'emacs
Thanks for the bug report, and thanks even more for making it crisp and
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)
- (forward-line 0)
- (looking-at c-opt-cpp-prefix)))
+ ;; 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))) ?\\)))))
+ (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).