procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle C++17's constexpr keyword in if statements

Browse source 
* lisp/progmodes/cc-engine.el (c-after-conditional): Test for matches to
c-block-stmt-hangon-key.

* lisp/progmodes/cc-langs.el (c-block-stmt-hangon-kwds): New lang const.
(c-block-stmt-hangon-key): New lang const/var matching any element of the
above.
This commit is contained in:
Alan Mackenzie 2018-03-28 19:39:30 +00:00
parent 3ccbe1f43f
commit b61b3c804c
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/progmodes/cc-engine.el
View file

@ -9847,9 +9847,15 @@ comment at the start of cc-engine.el for more info."
;; This function might do hidden buffer changes.
(save-excursion
(and (zerop (c-backward-token-2 1 t lim))
(if (looking-at c-block-stmt-hangon-key)
(zerop (c-backward-token-2 1 t lim))
t)
(or (looking-at c-block-stmt-1-key)
(and (eq (char-after) ?\()
(zerop (c-backward-token-2 1 t lim))
(if (looking-at c-block-stmt-hangon-key)
(zerop (c-backward-token-2 1 t lim))
t)
(or (looking-at c-block-stmt-2-key)
(looking-at c-block-stmt-1-2-key))))
(point))))

11
lisp/progmodes/cc-langs.el
View file

@ -2587,6 +2587,17 @@ Keywords here should also be in `c-block-stmt-1-kwds'."
(c-lang-const c-block-stmt-2-kwds))
:test 'string-equal))
(c-lang-defconst c-block-stmt-hangon-kwds
"Keywords which may directly follow a member of `c-block-stmt-1/2-kwds'."
t nil
c++ '("constexpr"))
(c-lang-defconst c-block-stmt-hangon-key
;; Regexp matching a "hangon" keyword in a `c-block-stmt-1/2-kwds'
;; construct.
t (c-make-keywords-re t (c-lang-const c-block-stmt-hangon-kwds)))
(c-lang-defvar c-block-stmt-hangon-key (c-lang-const c-block-stmt-hangon-key))
(c-lang-defconst c-opt-block-stmt-key
;; Regexp matching the start of any statement that has a
;; substatement (except a bare block). Nil in languages that