Added keywords from C++20 (#23)

* `__has_cpp_attribute` * `assert` * `audit` * `axiom` * `char8_t` * `consteval` * `ensures` * `expects` * `likely` * `no_unique_address` * `unlikely`
ludwigpacifici · Mar 31, 2019 · 02f1047 · 02f1047
1 parent 9b10e18
commit 02f1047
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 *.log
 *~
 /faceup/
+README.html
diff --git a/README.md b/README.md
@@ -12,15 +12,11 @@ It is recommended to use it in addition with the `c++-mode` major mode for extra
 
 # Preview
 
-`modern-c++-font-lock-mode` is enabled:
+With `modern-c++-font-lock-mode`:
 
-<p align="center"><img src="https://raw.githubusercontent.com/ludwigpacifici/modern-cpp-font-lock/master/img/mc%2B%2Bfl-on.png" width="640" /></p>
+<p align="center"><img src="https://raw.githubusercontent.com/ludwigpacifici/modern-cpp-font-lock/master/img/mc%2B%2Bfl-on.png" /></p>
 
-`modern-c++-font-lock-mode` is disabled:
-
-<p align="center"><img src="https://raw.githubusercontent.com/ludwigpacifici/modern-cpp-font-lock/master/img/mc%2B%2Bfl-off.png" width="640" /></p>
-
-Using `GNU Emacs 24.5.1` and `CC Mode version 5.32.5`.
+Using `GNU Emacs 27.0.50` and `CC Mode version 5.33.2`.
 
 # Installation
 
@@ -107,6 +103,8 @@ Font-lock keywords are tested with the [faceup](https://github.com/Lindydancer/f
 
 # Feedback
 
+If you find a bug, please check if you can reproduce with `c++-mode` only. If it is the case, send your bug upstream to [CC Mode](http://cc-mode.sourceforge.net/)
+
 Do not hesitate to ask questions or share suggestions.
 
 Happy coding!

diff --git a/cpp/keyword/test.txt b/cpp/keyword/test.txt
@@ -21,6 +21,7 @@ concept
 const
 const_cast
 constexpr
+consteval
 continue
 decltype
 default
@@ -69,6 +70,8 @@ template
 this
 thread_local
 throw
+audit
+axiom
 transaction_safe
 transaction_safe_dynamic
 try

diff --git a/cpp/keyword/test.txt.faceup b/cpp/keyword/test.txt.faceup
@@ -21,6 +21,7 @@
 «k:const»
 «k:const_cast»
 «k:constexpr»
+«k:consteval»
 «k:continue»
 «k:decltype»
 «k:default»
@@ -69,6 +70,8 @@
 «k:this»
 «k:thread_local»
 «k:throw»
+«k:audit»
+«k:axiom»
 «k:transaction_safe»
 «k:transaction_safe_dynamic»
 «k:try»

diff --git a/cpp/raw/test.txt b/cpp/raw/test.txt
@@ -1,5 +1,6 @@
 bool
 char
+char8_t
 char16_t
 char32_t
 double
@@ -49,6 +50,7 @@ __TIME__
 __VA_AR_GS__
 __cplusplus
 __has_include
+__has_cpp_attribute
 
 alignas
 alignof
@@ -69,6 +71,7 @@ compl
 concept
 const
 const_cast
+consteval
 constexpr
 continue
 decltype
@@ -118,6 +121,8 @@ template
 this
 thread_local
 throw
+audit
+axiom
 transaction_safe
 transaction_safe_dynamic
 try
@@ -140,6 +145,12 @@ xor_eq
 [[nodiscard]]
 [[noreturn]]
 [[optimize_for_synchronized]]
+[[likely]]
+[[unlikely]]
+[[no_unique_address]]
+[[expects]]
+[[ensures]]
+[[assert]]
 
 ...
 
@@ -301,6 +312,7 @@ aconcept
 aconst
 aconst_cast
 aconstexpr
+aconsteval
 acontinue
 adecltype
 adefault
@@ -349,6 +361,8 @@ atemplate
 athis
 athread_local
 athrow
+aaudit
+aaxiom
 atransaction_safe
 atransaction_safe_dynamic
 atry
@@ -382,6 +396,7 @@ concepta
 consta
 const_casta
 constexpra
+constevala
 continuea
 decltypea
 defaulta
@@ -430,6 +445,8 @@ templatea
 thisa
 thread_locala
 throwa
+audita
+axioma
 transaction_safea
 transaction_safe_dynamica
 trya
@@ -451,13 +468,26 @@ maybe_unused]]
 nodiscard]]
 noreturn]]
 optimize_for_synchronized]]
+likely]]
+unlikely]]
+no_unique_address]]
+expects]]
+ensures]]
+assert]]
+
 [[carries_dependency
 [[deprecated
 [[fallthrough
 [[maybe_unused
 [[nodiscard
 [[noreturn
 [[optimize_for_synchronized
+[[likely
+[[unlikely
+[[no_unique_address
+[[expects
+[[ensures
+[[assert
 
 08
 09

diff --git a/cpp/raw/test.txt.faceup b/cpp/raw/test.txt.faceup
@@ -1,5 +1,6 @@
 «t:bool»
 «t:char»
+«t:char8_t»
 «t:char16_t»
 «t:char32_t»
 «t:double»
@@ -49,6 +50,7 @@
 «p:__VA_AR_GS__»
 «p:__cplusplus»
 «p:__has_include»
+«p:__has_cpp_attribute»
 
 «k:alignas»
 «k:alignof»
@@ -69,6 +71,7 @@
 «k:concept»
 «k:const»
 «k:const_cast»
+«k:consteval»
 «k:constexpr»
 «k:continue»
 «k:decltype»
@@ -118,6 +121,8 @@
 «k:this»
 «k:thread_local»
 «k:throw»
+«k:audit»
+«k:axiom»
 «k:transaction_safe»
 «k:transaction_safe_dynamic»
 «k:try»
@@ -140,6 +145,12 @@
 [[«c:nodiscard»]]
 [[«c:noreturn»]]
 [[«c:optimize_for_synchronized»]]
+[[«c:likely»]]
+[[«c:unlikely»]]
+[[«c:no_unique_address»]]
+[[«c:expects»]]
+[[«c:ensures»]]
+[[«c:assert»]]
 
 «f:...»
 
@@ -301,6 +312,7 @@ aconcept
 aconst
 aconst_cast
 aconstexpr
+aconsteval
 acontinue
 adecltype
 adefault
@@ -349,6 +361,8 @@ atemplate
 athis
 athread_local
 athrow
+aaudit
+aaxiom
 atransaction_safe
 atransaction_safe_dynamic
 atry
@@ -382,6 +396,7 @@ concepta
 consta
 «k:const»_casta
 constexpra
+constevala
 continuea
 decltypea
 defaulta
@@ -430,6 +445,8 @@ templatea
 thisa
 thread_locala
 throwa
+audita
+axioma
 transaction_safea
 «k:transaction_safe»_dynamica
 trya
@@ -451,13 +468,26 @@ maybe_unused]]
 nodiscard]]
 noreturn]]
 optimize_«k:for»_«k:synchronized»]]
+likely]]
+unlikely]]
+no_unique_address]]
+expects]]
+ensures]]
+assert]]
+
 [[carries_dependency
 [[deprecated
 [[fallthrough
 [[maybe_unused
 [[nodiscard
 [[noreturn
 [[optimize_«k:for»_«k:synchronized»
+[[likely
+[[unlikely
+[[no_unique_address
+[[expects
+[[ensures
+[[assert
 
 08
 09

diff --git a/img/all-operator-off-sample.png b/img/all-operator-off-sample.png
diff --git a/img/mc++fl-off.png b/img/mc++fl-off.png
diff --git a/img/mc++fl-on.png b/img/mc++fl-on.png
diff --git a/modern-cpp-font-lock.el b/modern-cpp-font-lock.el
@@ -64,7 +64,7 @@
 
 (defcustom modern-c++-types
   (eval-when-compile
-    (sort '("bool" "char" "char16_t" "char32_t" "double" "float" "int" "long" "short" "signed" "unsigned" "void" "wchar_t")
+    (sort '("bool" "char" "char8_t" "char16_t" "char32_t" "double" "float" "int" "long" "short" "signed" "unsigned" "void" "wchar_t")
           'modern-c++-string-lenght>))
   "List of C++ types. See doc:
 http://en.cppreference.com/w/cpp/language/types"
@@ -74,7 +74,7 @@ http://en.cppreference.com/w/cpp/language/types"
 
 (defcustom modern-c++-preprocessors
   (eval-when-compile
-    (sort '("#define" "#defined" "#elif" "#else" "#endif" "#error" "#if" "#ifdef" "#ifndef" "#include" "#line" "#pragma STDC CX_LIMITED_RANGE" "#pragma STDC FENV_ACCESS" "#pragma STDC FP_CONTRACT" "#pragma once" "#pragma pack" "#pragma" "#undef" "_Pragma" "__DATE__" "__FILE__" "__LINE__" "__STDCPP_STRICT_POINTER_SAFETY__" "__STDCPP_THREADS__" "__STDC_HOSTED__" "__STDC_ISO_10646__" "__STDC_MB_MIGHT_NEQ_WC__" "__STDC_VERSION__" "__STDC__" "__TIME__" "__VA_AR_GS__" "__cplusplus" "__has_include")
+    (sort '("#define" "#defined" "#elif" "#else" "#endif" "#error" "#if" "#ifdef" "#ifndef" "#include" "#line" "#pragma STDC CX_LIMITED_RANGE" "#pragma STDC FENV_ACCESS" "#pragma STDC FP_CONTRACT" "#pragma once" "#pragma pack" "#pragma" "#undef" "_Pragma" "__DATE__" "__FILE__" "__LINE__" "__STDCPP_STRICT_POINTER_SAFETY__" "__STDCPP_THREADS__" "__STDC_HOSTED__" "__STDC_ISO_10646__" "__STDC_MB_MIGHT_NEQ_WC__" "__STDC_VERSION__" "__STDC__" "__TIME__" "__VA_AR_GS__" "__cplusplus" "__has_include" "__has_cpp_attribute")
           'modern-c++-string-lenght>))
   "List of C++ preprocessor words. See doc:
 http://en.cppreference.com/w/cpp/keyword and
@@ -85,7 +85,7 @@ http://en.cppreference.com/w/cpp/preprocessor"
 
 (defcustom modern-c++-keywords
   (eval-when-compile
-    (sort '("alignas" "alignof" "and" "and_eq" "asm" "atomic_cancel" "atomic_commit" "atomic_noexcept" "auto" "bitand" "bitor" "break" "case" "catch" "class" "compl" "concept" "const" "constexpr" "const_cast" "continue" "co_await" "co_return" "co_yield" "decltype" "default" "delete" "do" "dynamic_cast" "else" "enum" "explicit" "export" "extern" "final" "for" "friend" "goto" "if" "import" "inline" "module" "mutable" "namespace" "new" "noexcept" "not" "not_eq" "operator" "or" "or_eq" "override" "private" "protected" "public" "register" "reinterpret_cast" "requires" "return" "sizeof" "static" "static_assert" "static_cast" "struct" "switch" "synchronized" "template" "this" "thread_local" "throw" "transaction_safe" "transaction_safe_dynamic" "try" "typedef" "typeid" "typename" "union" "using" "virtual" "volatile" "while" "xor" "xor_eq")
+    (sort '("alignas" "alignof" "and" "and_eq" "asm" "atomic_cancel" "atomic_commit" "atomic_noexcept" "audit" "auto" "axiom" "bitand" "bitor" "break" "case" "catch" "class" "compl" "concept" "const" "constexpr" "consteval" "const_cast" "continue" "co_await" "co_return" "co_yield" "decltype" "default" "delete" "do" "dynamic_cast" "else" "enum" "explicit" "export" "extern" "final" "for" "friend" "goto" "if" "import" "inline" "module" "mutable" "namespace" "new" "noexcept" "not" "not_eq" "operator" "or" "or_eq" "override" "private" "protected" "public" "register" "reinterpret_cast" "requires" "return" "sizeof" "static" "static_assert" "static_cast" "struct" "switch" "synchronized" "template" "this" "thread_local" "throw" "transaction_safe" "transaction_safe_dynamic" "try" "typedef" "typeid" "typename" "union" "using" "virtual" "volatile" "while" "xor" "xor_eq")
           'modern-c++-string-lenght>))
   "List of C++ keywords. See doc:
 http://en.cppreference.com/w/cpp/keyword"
@@ -95,7 +95,7 @@ http://en.cppreference.com/w/cpp/keyword"
 
 (defcustom modern-c++-attributes
   (eval-when-compile
-    (sort '("carries_dependency" "deprecated" "fallthrough" "maybe_unused" "nodiscard" "noreturn" "optimize_for_synchronized")
+    (sort '("carries_dependency" "deprecated" "fallthrough" "maybe_unused" "nodiscard" "noreturn" "optimize_for_synchronized" "likely" "unlikely" "no_unique_address" "expects" "ensures" "assert")
           'modern-c++-string-lenght>))
   "List of C++ attributes. See doc:
 http://en.cppreference.com/w/cpp/language/attributes"
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     *.log
     *~
     /faceup/
+    README.html