diff options
author | Tim Hatch <tim@timhatch.com> | 2014-06-07 07:58:54 -0700 |
---|---|---|
committer | Tim Hatch <tim@timhatch.com> | 2014-06-07 07:58:54 -0700 |
commit | 32ceb8d947ab8efa9a37543a88a9428aaeacc8a9 (patch) | |
tree | 8b52b931ede55ef56e96b3eb41e4cf30f822ee34 /pygments/lexers/compiled.py | |
parent | dfdf0de2da30f0626706c5f3ec9f3c3153c69917 (diff) | |
parent | 1725e215f9833d271462ccc7d3bd5fc7c0e41bab (diff) | |
download | pygments-32ceb8d947ab8efa9a37543a88a9428aaeacc8a9.tar.gz |
Merged in krasul/pygments-main/swift (pull request #371)
Initial Swift lexer
Diffstat (limited to 'pygments/lexers/compiled.py')
-rw-r--r-- | pygments/lexers/compiled.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py index 48a11578..25c7a4d8 100644 --- a/pygments/lexers/compiled.py +++ b/pygments/lexers/compiled.py @@ -210,7 +210,10 @@ class CppLexer(CFamilyLexer): r'export|friend|mutable|namespace|new|operator|' r'private|protected|public|reinterpret_cast|' r'restrict|static_cast|template|this|throw|throws|' - r'typeid|typename|using|virtual)\b', Keyword), + r'typeid|typename|using|virtual|' + r'constexpr|nullptr|decltype|thread_local|' + r'alignas|alignof|static_assert|noexcept|override|final)\b', Keyword), + (r'(char16_t|char32_t)\b', Keyword.Type), (r'(class)(\s+)', bygroups(Keyword, Text), 'classname'), inherit, ], |