From 8917f509574e944a5c8aed426afc19c5f633950d Mon Sep 17 00:00:00 2001
From: ADAM David Alan Martin <adam@recursive.engineer>
Date: Wed, 28 Apr 2021 23:29:25 -0400
Subject: [PATCH] More C++ syntax improvements.

---
 vim/after/syntax/cpp.vim | 22 +++++++++++++++++++---
 vim/colors/adam.vim      |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/vim/after/syntax/cpp.vim b/vim/after/syntax/cpp.vim
index ba0a8fa..cd1db2a 100644
--- a/vim/after/syntax/cpp.vim
+++ b/vim/after/syntax/cpp.vim
@@ -38,6 +38,10 @@ syn region cxxBoostLibrary matchgroup=cxxLibPrefix start="\<\(boost\)\z(::\)\@="
 "syn match "::" containedin=@cxxLibrary contained
 "end="::\(.*\)\@>\>"
 
+syn region cxxAttribute matchgroup=cxxAttributeBracing start="\[\[" end="]]"
+
+syn keyword cxxStlKeywords contained containedin=cxxAttribute noreturn carries_dependency deprecated fallthrough nodiscard maybe_unused
+
 " Broken?
 "syn region cxxStlLibrary start="\(\<std\)\(::\)" end="\( \|;\|(\|<\|$\)\@="
 "syn region cxxBoostLibrary start="\(\<\(bp_\)\?boost\)\(::\)\@=" end="\( \|;\|(\|<\|$\)\@="
@@ -61,6 +65,7 @@ syn keyword cxxStlTypes containedin=cxxStlLibrary iostream basic_string vector d
 syn keyword cxxStlTypes containedin=cxxStlLibrary,cxxBoostLibrary array contained
 syn keyword cxxStlTypes containedin=cxxStlLibrary,cxxBoostLibrary unordered_map unordered_multimap contained
 syn keyword cxxStlTypes containedin=cxxStlLibrary,cxxBoostLibrary unordered_set unordered_multiset contained
+syn keyword cxxStlTypes containedin=cxxStlLibrary,cxxBoostLibrary tuple contained
 
 
 syn keyword cxxStlService containedin=cxxStlLibrary cout cin clog cerr contained
@@ -69,7 +74,7 @@ syn keyword cxxStlConstant containedin=cxxStlLibrary endl flush contained
 " Smart pointers
 syn keyword cxxStlFunctions containedin=cxxStlLibrary,cxxBoostLibrary make_shared make_tuple contained
 syn keyword cxxStlKeywords containedin=cxxBoostLibrary scoped_ptr contained
-syn keyword cxxStlKeywords containedin=cxxStlLibrary,cxxBoostLibrary shared_ptr weak_ptr contained
+syn keyword cxxStlKeywords containedin=cxxStlLibrary,cxxBoostLibrary shared_ptr weak_ptr optional contained
 syn keyword cxxStlFunctions containedin=cxxStlLibrary make_unique contained
 syn keyword cxxStlKeywords containedin=cxxStlLibrary unique_ptr nullptr_t contained
 
@@ -78,7 +83,7 @@ syn keyword cxxStlFunctions containedin=cxxStlLibrary make_pair tie addressof co
 syn keyword cxxStlFunctions containedin=cxxStlLibrary copy copy_n copy_if copy_backward replace_copy_if replace_copy contained
 syn keyword cxxStlFunctions containedin=cxxStlLibrary find find_if find_first_of find_end contained
 syn keyword cxxStlFunctions containedin=cxxStlLibrary count count_if search search_n contained
-syn keyword cxxStlFunctions containedin=cxxStlLibrary transform mismatch equal accumulate move contained
+syn keyword cxxStlFunctions containedin=cxxStlLibrary transform mismatch equal accumulate move forward contained
 syn keyword cxxStlFunctions containedin=cxxStlLibrary generate generate_n fill fill_n contained
 syn keyword cxxStlFunctions containedin=cxxStlLibrary unique reverse rotate contained
 syn keyword cxxStlFunctions containedin=cxxStlLibrary unique_copy reverse_copy rotate_copy contained
@@ -92,15 +97,22 @@ syn keyword cxxStlFunctions containedin=cxxStlLibrary min max min_element max_el
 
 syn keyword cxxStlFunctions containedin=cxxStlLibrary getline contained
 
+" RTTI
+syn keyword cxxStlKeywords contained containedin=cxxStlLibrary type_info type_index
+
 
 " Metafunctions/Traits
 syn keyword cxxLibStatement contained containedin=cxxStlLibrary decay_t
 syn keyword cxxStlTypes contained containedin=cxxStlLibrary type_identity type_identity_t
 syn keyword cxxStlTraits contained containedin=cxxStlLibrary is_convertible is_base_of
 syn keyword cxxStlTraits contained containedin=cxxStlLibrary is_constructible is_default_constructible is_same
-syn keyword cxxStlTraits contained containedin=cxxStlLibrary,cxxBoostLibrary enable_if enable_if_t
+syn keyword cxxStlTraits contained containedin=cxxStlLibrary enable_if enable_if_t
+syn keyword cxxStlTraits contained containedin=cxxBoostLibrary enable_if enable_if_t
+syn keyword cxxStlTraits contained containedin=cxxStlLibrary,cxxBoostLibrary is_rvalue_reference
 syn keyword cxxStlConstant contained containedin=cxxStlLibrary bool_constant is_same_v is_convertible_v is_constructible_v
 syn keyword cxxStlConstant contained containedin=cxxStlLibrary,cxxBoostLibrary bool_constant true_type false_type is_base_of_v
+syn keyword cxxStlConstant contained containedin=cxxStlLibrary,cxxBoostLibrary is_rvalue_reference_v
+syn keyword cxxLibStatement contained containedin=cxxStlLibrary void_t
 
 " Free floating STL functions
 syn keyword cxxStlFreeFunctions back_inserter front_inserter inserter begin end
@@ -126,6 +138,8 @@ syn keyword cxxStlExceptionNames containedin=cxxStlLibrary underflow_error conta
 syn keyword cxxStlKeywords contained containedin=cxxBoostLibrary 
 syn keyword cxxLibStatement contained containedin=cxxBoostLibrary lexical_cast noncopyable
 
+syn keyword cxxLibStatement contained containedin=cxxStlLibrary as_const
+
 " Highlight dangerous things
 syn match cxxStlDangerousFunction "\(\.\)\@<=release()"
 
@@ -164,6 +178,8 @@ if version >= 508 || !exists("did_cxx_syntax_inits")
   HiLink cxxStlFreeFunctions       cppStatement
   HiLink cxxLibStatement      cppStatement
 
+ HiLink cxxAttributeBracing cppStatement
+
   HiLink cxxLibPrefix      Caller
 
   HiLink cxxExportNamespace cppModule
diff --git a/vim/colors/adam.vim b/vim/colors/adam.vim
index 818b78d..866eabc 100644
--- a/vim/colors/adam.vim
+++ b/vim/colors/adam.vim
@@ -89,6 +89,7 @@ hi cIf0			ctermfg=gray term=none start=<esc>[38;2;100;100;100m stop=<esc>[0m
 "hi StatusUnwrap ctermfg=brown ctermbg=none cterm=none
 "hi StatusUnwrap ctermfg=236 ctermbg=none cterm=none
 hi StatusUnwrap ctermfg=58 ctermbg=none cterm=none
+hi MetaFunction ctermfg=darkcyan start=<esc>[36m stop=<esc>[0m
 hi Comment ctermfg=darkgrey cterm=none term=NONE term=none start=<esc>[38;5;242m stop=<esc>[0m
 hi Identifier ctermfg=cyan cterm=none term=none start=<esc>[96m stop=<esc>[0m
 hi Object ctermfg=red term=none start=<esc>[91m stop=<esc>[0m
@@ -99,7 +100,6 @@ hi Caller ctermfg=cyan term=NONE start=<esc>[96m stop=<esc>[0m
 hi Target ctermfg=green ctermbg=red
 hi Sync ctermfg=green ctermbg=red
 hi Debug ctermfg=darkgreen
-hi MetaFunction ctermfg=darkcyan
 hi Dangerous term=none start=<esc>[1;7;97;101;3;4;6m stop=<esc>[0m ctermfg=white ctermbg=red cterm=reverse,bold,underline,italic
 "hi Dangerous ctermfg=red ctermbg=white cterm=bold,underline,italic start=<esc>[31;47;1;5m stop=<esc>[0m
 "hi Type ctermfg=lightgreen