|
 |
dea496 |
diff -up vim74/runtime/syntax/cpp.vim.c++11 vim74/runtime/syntax/cpp.vim
|
|
|
dea496 |
--- vim74/runtime/syntax/cpp.vim.c++11 2017-08-23 17:49:00.722250142 +0200
|
|
|
dea496 |
+++ vim74/runtime/syntax/cpp.vim 2017-08-23 17:49:29.132979711 +0200
|
|
|
dea496 |
@@ -1,29 +1,23 @@
|
|
|
dea496 |
" Vim syntax file
|
|
|
dea496 |
" Language: C++
|
|
|
dea496 |
-" Current Maintainer: vim-jp (https://github.com/vim-jp/cpp-vim)
|
|
|
dea496 |
+" Current Maintainer: vim-jp (https://github.com/vim-jp/vim-cpp)
|
|
|
dea496 |
" Previous Maintainer: Ken Shan <ccshan@post.harvard.edu>
|
|
|
dea496 |
-" Last Change: 2012 Jun 14
|
|
|
dea496 |
+" Last Change: 2017 Jun 05
|
|
|
dea496 |
|
|
|
dea496 |
-" For version 5.x: Clear all syntax items
|
|
|
dea496 |
-" For version 6.x: Quit when a syntax file was already loaded
|
|
|
dea496 |
-if version < 600
|
|
|
dea496 |
- syntax clear
|
|
|
dea496 |
-elseif exists("b:current_syntax")
|
|
|
dea496 |
+" quit when a syntax file was already loaded
|
|
|
dea496 |
+if exists("b:current_syntax")
|
|
|
dea496 |
finish
|
|
|
dea496 |
endif
|
|
|
dea496 |
|
|
|
dea496 |
" Read the C syntax to start with
|
|
|
dea496 |
-if version < 600
|
|
|
dea496 |
- so <sfile>:p:h/c.vim
|
|
|
dea496 |
-else
|
|
|
dea496 |
- runtime! syntax/c.vim
|
|
|
dea496 |
- unlet b:current_syntax
|
|
|
dea496 |
-endif
|
|
|
dea496 |
+runtime! syntax/c.vim
|
|
|
dea496 |
+unlet b:current_syntax
|
|
|
dea496 |
|
|
|
dea496 |
" C++ extensions
|
|
|
dea496 |
syn keyword cppStatement new delete this friend using
|
|
|
dea496 |
syn keyword cppAccess public protected private
|
|
|
dea496 |
-syn keyword cppType inline virtual explicit export bool wchar_t
|
|
|
dea496 |
+syn keyword cppModifier inline virtual explicit export
|
|
|
dea496 |
+syn keyword cppType bool wchar_t
|
|
|
dea496 |
syn keyword cppExceptions throw try catch
|
|
|
dea496 |
syn keyword cppOperator operator typeid
|
|
|
dea496 |
syn keyword cppOperator and bitor or xor compl bitand and_eq or_eq xor_eq not not_eq
|
|
|
dea496 |
@@ -32,38 +26,51 @@ syn match cppCast "\<\(const\|static\|d
|
|
|
dea496 |
syn keyword cppStorageClass mutable
|
|
|
dea496 |
syn keyword cppStructure class typename template namespace
|
|
|
dea496 |
syn keyword cppBoolean true false
|
|
|
dea496 |
+syn keyword cppConstant __cplusplus
|
|
|
dea496 |
|
|
|
dea496 |
" C++ 11 extensions
|
|
|
dea496 |
if !exists("cpp_no_cpp11")
|
|
|
dea496 |
- syn keyword cppType override final
|
|
|
dea496 |
+ syn keyword cppModifier override final
|
|
|
dea496 |
+ syn keyword cppType nullptr_t auto
|
|
|
dea496 |
syn keyword cppExceptions noexcept
|
|
|
dea496 |
- syn keyword cppStorageClass constexpr decltype
|
|
|
dea496 |
+ syn keyword cppStorageClass constexpr decltype thread_local
|
|
|
dea496 |
syn keyword cppConstant nullptr
|
|
|
dea496 |
+ syn keyword cppConstant ATOMIC_FLAG_INIT ATOMIC_VAR_INIT
|
|
|
dea496 |
+ syn keyword cppConstant ATOMIC_BOOL_LOCK_FREE ATOMIC_CHAR_LOCK_FREE
|
|
|
dea496 |
+ syn keyword cppConstant ATOMIC_CHAR16_T_LOCK_FREE ATOMIC_CHAR32_T_LOCK_FREE
|
|
|
dea496 |
+ syn keyword cppConstant ATOMIC_WCHAR_T_LOCK_FREE ATOMIC_SHORT_LOCK_FREE
|
|
|
dea496 |
+ syn keyword cppConstant ATOMIC_INT_LOCK_FREE ATOMIC_LONG_LOCK_FREE
|
|
|
dea496 |
+ syn keyword cppConstant ATOMIC_LLONG_LOCK_FREE ATOMIC_POINTER_LOCK_FREE
|
|
|
dea496 |
+ syn region cppRawString matchgroup=cppRawStringDelimiter start=+\%(u8\|[uLU]\)\=R"\z([[:alnum:]_{}[\]#<>%:;.?*\+\-/\^&|~!=,"']\{,16}\)(+ end=+)\z1"+ contains=@Spell
|
|
|
dea496 |
+endif
|
|
|
dea496 |
+
|
|
|
dea496 |
+" C++ 14 extensions
|
|
|
dea496 |
+if !exists("cpp_no_cpp14")
|
|
|
dea496 |
+ syn case ignore
|
|
|
dea496 |
+ syn match cppNumber display "\<0b[01]\('\=[01]\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
|
|
|
dea496 |
+ syn match cppNumber display "\<[1-9]\('\=\d\+\)*\(u\=l\{0,2}\|ll\=u\)\>" contains=cFloat
|
|
|
dea496 |
+ syn match cppNumber display "\<0x\x\('\=\x\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
|
|
|
dea496 |
+ syn case match
|
|
|
dea496 |
endif
|
|
|
dea496 |
|
|
|
dea496 |
" The minimum and maximum operators in GNU C++
|
|
|
dea496 |
syn match cppMinMax "[<>]?"
|
|
|
dea496 |
|
|
|
dea496 |
" Default highlighting
|
|
|
dea496 |
-if version >= 508 || !exists("did_cpp_syntax_inits")
|
|
|
dea496 |
- if version < 508
|
|
|
dea496 |
- let did_cpp_syntax_inits = 1
|
|
|
dea496 |
- command -nargs=+ HiLink hi link <args>
|
|
|
dea496 |
- else
|
|
|
dea496 |
- command -nargs=+ HiLink hi def link <args>
|
|
|
dea496 |
- endif
|
|
|
dea496 |
- HiLink cppAccess cppStatement
|
|
|
dea496 |
- HiLink cppCast cppStatement
|
|
|
dea496 |
- HiLink cppExceptions Exception
|
|
|
dea496 |
- HiLink cppOperator Operator
|
|
|
dea496 |
- HiLink cppStatement Statement
|
|
|
dea496 |
- HiLink cppType Type
|
|
|
dea496 |
- HiLink cppStorageClass StorageClass
|
|
|
dea496 |
- HiLink cppStructure Structure
|
|
|
dea496 |
- HiLink cppBoolean Boolean
|
|
|
dea496 |
- HiLink cppConstant Constant
|
|
|
dea496 |
- delcommand HiLink
|
|
|
dea496 |
-endif
|
|
|
dea496 |
+hi def link cppAccess cppStatement
|
|
|
dea496 |
+hi def link cppCast cppStatement
|
|
|
dea496 |
+hi def link cppExceptions Exception
|
|
|
dea496 |
+hi def link cppOperator Operator
|
|
|
dea496 |
+hi def link cppStatement Statement
|
|
|
dea496 |
+hi def link cppModifier Type
|
|
|
dea496 |
+hi def link cppType Type
|
|
|
dea496 |
+hi def link cppStorageClass StorageClass
|
|
|
dea496 |
+hi def link cppStructure Structure
|
|
|
dea496 |
+hi def link cppBoolean Boolean
|
|
|
dea496 |
+hi def link cppConstant Constant
|
|
|
dea496 |
+hi def link cppRawStringDelimiter Delimiter
|
|
|
dea496 |
+hi def link cppRawString String
|
|
|
dea496 |
+hi def link cppNumber Number
|
|
|
dea496 |
|
|
|
dea496 |
let b:current_syntax = "cpp"
|
|
|
dea496 |
|