summaryrefslogtreecommitdiffstats
path: root/runtime/syntax/d.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-03-11 22:46:48 +0000
committerBram Moolenaar <Bram@vim.org>2005-03-11 22:46:48 +0000
commitcd71fa3c1e5749285c3aa08dd9b3aa7b33e9a7fb (patch)
tree36a1983ed08c957e293e17942ab742ce77cdf942 /runtime/syntax/d.vim
parentdf7b1ffe999e87cc67e23dc423f995cb56bc6fee (diff)
updated for version 7.0059
Diffstat (limited to 'runtime/syntax/d.vim')
-rw-r--r--runtime/syntax/d.vim16
1 files changed, 10 insertions, 6 deletions
diff --git a/runtime/syntax/d.vim b/runtime/syntax/d.vim
index bfb6a03443..1b4995ed53 100644
--- a/runtime/syntax/d.vim
+++ b/runtime/syntax/d.vim
@@ -1,9 +1,9 @@
-" Vim syntax file for the D programming language (version 0.95).
+" Vim syntax file for the D programming language (version 0.116).
"
" Language: D
" Maintainer: Jason Mills<jmills@cs.mun.ca>
-" Last Change: 2004 Jul 15
-" Version: 0.10
+" Last Change: 2005 Mar 09
+" Version: 0.12
"
" Options:
" d_comment_strings - set to highlight strings and numbers in comments
@@ -35,6 +35,7 @@ syn keyword dBranch goto break continue
syn keyword dRepeat while for do foreach
syn keyword dBoolean true false
syn keyword dConstant null
+syn keyword dConstant __FILE__ __LINE__ __DATE__ __TIME__ __TIMESTAMP__
syn keyword dTypedef alias typedef
syn keyword dStructure template interface class enum struct union
syn keyword dOperator new delete typeof typeid cast align is
@@ -47,7 +48,7 @@ if exists("d_hl_operator_overload")
syn keyword dOpOverload opAddAssign opSubAssign opMulAssign opDivAssign
syn keyword dOpOverload opModAssign opAndAssign opOrAssign opXorAssign
syn keyword dOpOverload opShlAssign opShrAssign opUShrAssign opCatAssign
- syn keyword dOpOverload opIndex opIndexAssign opCall opSlice
+ syn keyword dOpOverload opIndex opIndexAssign opCall opSlice opPos
syn keyword dOpOverload opAdd_r opMul_r opAnd_r opOr_r opXor_r
endif
syn keyword dType ushort int uint long ulong float
@@ -116,9 +117,10 @@ syn sync minlines=25
"
syn match dSpecialCharError contained "[^']"
-" Escape sequences (oct,specal char,hex,wchar). These are not contained
-" because they are considered string litterals
+" Escape sequences (oct,specal char,hex,wchar, character entities \&xxx;)
+" These are not contained because they are considered string litterals
syn match dEscSequence "\\\(\o\{1,3}\|[\"\\'\\?ntbrfva]\|u\x\{4}\|U\x\{8}\|x\x\x\)"
+syn match dEscSequence "\\&[^;& \t]\+;"
syn match dCharacter "'[^']*'" contains=dEscSequence,dSpecialCharError
syn match dCharacter "'\\''" contains=dEscSequence
syn match dCharacter "'[^\\]'"
@@ -127,6 +129,8 @@ syn match dCharacter "'[^\\]'"
"
syn match dUnicode "\\u\d\{4\}"
+
+
" String.
"
syn region dString start=+"+ end=+"+ contains=dEscSequence,@Spell