mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-24 07:20:37 +00:00
CC Mode: Correct and simplify quoted number regexps
C++ Mode now gives correct fontification when \' is inserted between the adjacent apostrophes in the number 0xde'adb''eef. * lisp/progmodes/cc-mode.el (c-maybe-quoted-number-head): Simplify and correct. (c-maybe-quoted-number-tail, c-maybe-quoted-number): Simplify.
This commit is contained in:
parent
6864ac2bc3
commit
2a6f1527f6
@ -1774,14 +1774,14 @@ position of `after-change-functions'.")
|
||||
(defconst c-maybe-quoted-number-head
|
||||
(concat
|
||||
"\\(0\\("
|
||||
"\\([Xx]\\([[:xdigit:]]\\('[[:xdigit:]]\\|[[:xdigit:]]\\)*'?\\)?\\)"
|
||||
"[Xx]\\([[:xdigit:]]\\('?[[:xdigit:]]\\)*\\)?"
|
||||
"\\|"
|
||||
"\\([Bb]\\([01]\\('[01]\\|[01]\\)*'?\\)?\\)"
|
||||
"[Bb]\\([01]\\('?[01]\\)*\\)?"
|
||||
"\\|"
|
||||
"\\('[0-7]\\|[0-7]\\)*'?"
|
||||
"\\('?[0-7]\\)*"
|
||||
"\\)"
|
||||
"\\|"
|
||||
"[1-9]\\('[0-9]\\|[0-9]\\)*'?"
|
||||
"[1-9]\\('?[0-9]\\)*"
|
||||
"\\)")
|
||||
"Regexp matching the head of a numeric literal, including with digit separators.")
|
||||
|
||||
@ -1808,11 +1808,11 @@ position of `after-change-functions'.")
|
||||
(defconst c-maybe-quoted-number-tail
|
||||
(concat
|
||||
"\\("
|
||||
"\\([xX']?[[:xdigit:]]\\('[[:xdigit:]]\\|[[:xdigit:]]\\)*\\)"
|
||||
"\\([xX']?[[:xdigit:]]\\('?[[:xdigit:]]\\)*\\)"
|
||||
"\\|"
|
||||
"\\([bB']?[01]\\('[01]\\|[01]\\)*\\)"
|
||||
"\\([bB']?[01]\\('?[01]\\)*\\)"
|
||||
"\\|"
|
||||
"\\('?[0-9]\\('[0-9]\\|[0-9]\\)*\\)"
|
||||
"\\('?[0-9]\\)+"
|
||||
"\\)")
|
||||
"Regexp matching the tail of a numeric literal, including with digit separators.
|
||||
Note that this is a strict tail, so won't match, e.g. \"0x....\".")
|
||||
@ -1828,14 +1828,14 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".")
|
||||
(defconst c-maybe-quoted-number
|
||||
(concat
|
||||
"\\(0\\("
|
||||
"\\([Xx][[:xdigit:]]\\('[[:xdigit:]]\\|[[:xdigit:]]\\)*\\)"
|
||||
"\\([Xx][[:xdigit:]]\\('?[[:xdigit:]]\\)*\\)"
|
||||
"\\|"
|
||||
"\\([Bb][01]\\('[01]\\|[01]\\)*\\)"
|
||||
"\\([Bb][01]\\('?[01]\\)*\\)"
|
||||
"\\|"
|
||||
"\\('[0-7]\\|[0-7]\\)*"
|
||||
"\\('?[0-7]\\)*"
|
||||
"\\)"
|
||||
"\\|"
|
||||
"[1-9]\\('[0-9]\\|[0-9]\\)*"
|
||||
"[1-9]\\('?[0-9]\\)*"
|
||||
"\\)")
|
||||
"Regexp matching a numeric literal, including with digit separators.")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user