Merge pull request #2359 from invokr/master

Added new C++11 tokens to highlighting rules
This commit is contained in:
Harutyun Amirjanyan 2015-02-16 19:13:07 +03:00
commit 04e75ea0db

View file

@ -18,13 +18,13 @@ var c_cppHighlightRules = function() {
var storageType = (
"asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|" +
"_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void|" +
"class|wchar_t|template"
"class|wchar_t|template|char16_t|char32_t"
);
var storageModifiers = (
"const|extern|register|restrict|static|volatile|inline|private|" +
"protected|public|friend|explicit|virtual|export|mutable|typename|" +
"constexpr|new|delete"
"constexpr|new|delete|alignas|alignof|decltype|noexcept|thread_local"
);
var keywordOperators = (
@ -33,7 +33,7 @@ var c_cppHighlightRules = function() {
);
var builtinConstants = (
"NULL|true|false|TRUE|FALSE"
"NULL|true|false|TRUE|FALSE|nullptr"
);
var keywordMapper = this.$keywords = this.createKeywordMapper({