diff options
author | Bram Moolenaar <Bram@vim.org> | 2014-06-12 21:46:14 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2014-06-12 21:46:14 +0200 |
commit | 822ff866bd6558be993d4455a22454ae53db0eca (patch) | |
tree | 3993d806cfe837d1796d8007d39be4526f00f0e0 /runtime/syntax | |
parent | 2d54ec92d42a659aca4ec9e16521cd32767a7faa (diff) | |
download | vim-git-822ff866bd6558be993d4455a22454ae53db0eca.tar.gz |
Update runtime files.
Diffstat (limited to 'runtime/syntax')
-rw-r--r-- | runtime/syntax/c.vim | 5 | ||||
-rw-r--r-- | runtime/syntax/j.vim | 20 | ||||
-rw-r--r-- | runtime/syntax/kivy.vim | 36 | ||||
-rw-r--r-- | runtime/syntax/ninja.vim | 8 |
4 files changed, 58 insertions, 11 deletions
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim index 7a58ae712..d99154048 100644 --- a/runtime/syntax/c.vim +++ b/runtime/syntax/c.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: C " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2013 Jul 05 +" Last Change: 2014 May 26 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -322,6 +322,9 @@ if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu") syn keyword cConstant SEEK_CUR SEEK_END SEEK_SET syn keyword cConstant TMP_MAX stderr stdin stdout syn keyword cConstant EXIT_FAILURE EXIT_SUCCESS RAND_MAX + " POSIX 2001 + syn keyword cConstant SIGBUS SIGPOLL SIGPROF SIGSYS SIGURG + syn keyword cConstant SIGVTALRM SIGXCPU SIGXFSZ " Add POSIX errors as well syn keyword cConstant E2BIG EACCES EAGAIN EBADF EBADMSG EBUSY syn keyword cConstant ECANCELED ECHILD EDEADLK EDOM EEXIST EFAULT diff --git a/runtime/syntax/j.vim b/runtime/syntax/j.vim index 20063a255..bde954506 100644 --- a/runtime/syntax/j.vim +++ b/runtime/syntax/j.vim @@ -2,7 +2,7 @@ " Language: J " Maintainer: David Bürgin <676c7473@gmail.com> " URL: https://github.com/glts/vim-j -" Last Change: 2014-04-05 +" Last Change: 2014-05-25 if exists('b:current_syntax') finish @@ -46,7 +46,7 @@ syntax match jStdlibVerb /\<\%(assert\|break\|do\)\>\.\@!/ " All in all, a compromise between correctness and practicality had to be " made. See http://www.jsoftware.com/help/dictionary/dcons.htm for reference. syntax match jNumber /\<_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(r_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(r_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\=\)\|\%(\%(j\|a[dr]\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(j\|a[dr]\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\=\)\|\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(j\|a[dr]\|r\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\)\=/ -syntax match jNumber /\<_\=\d\+\%([eE]\d\+\)\=b_\=[0-9a-z]\+/ +syntax match jNumber /\<_\=\d\+\%([eE]\d\+\)\=b_\=[0-9a-z]\+\%(\.[0-9a-z]\+\)\=/ syntax match jNumber /\<__\=\>/ syntax match jNumber /\<_\./ syntax match jNumber /\<_\=\d\+x\>/ @@ -64,15 +64,20 @@ syntax match jVerb /[=!\]]\|[\^?]\.\=\|[;[]:\=\|{\.\|[_/\\]:\|[<>+*\-%$|,#][.:]\ syntax match jCopula /=[.:]/ syntax match jConjunction /;\.\|\^:\|![.:]/ -" Explicit noun definition. The difficulty is that the define expression -" "0 : 0" can occur in the middle of a line but the jNounDefine region must -" only start on the next line. The trick is to split the problem into two -" regions and link them with "nextgroup=". +" Explicit noun definition. The difficulty is that the define expression can +" occur in the middle of a line but the jNounDefine region must only start on +" the next line. The trick is to split the problem into two regions and link +" them with "nextgroup=". The fold wrapper provides syntax folding. +syntax region jNounDefineFold + \ matchgroup=NONE start=/\<\%(\%(0\|noun\)\s\+\%(\:\s*0\|def\s\+0\|define\)\>\)\@=/ + \ keepend matchgroup=NONE end=/^\s*)\s*$/ + \ contains=jNounDefineStart + \ fold syntax region jNounDefineStart \ matchgroup=jDefineExpression start=/\<\%(0\|noun\)\s\+\%(\:\s*0\|def\s\+0\|define\)\>/ \ keepend matchgroup=NONE end=/$/ \ contains=@jStdlibItems,@jPrimitiveItems,jNumber,jString,jParenGroup,jParen,jComment - \ oneline skipempty nextgroup=jDefineEnd,jNounDefine + \ contained oneline skipempty nextgroup=jDefineEnd,jNounDefine " These two items must have "contained", which allows them to match only after " jNounDefineStart thanks to the "nextgroup=" above. syntax region jNounDefine @@ -87,6 +92,7 @@ syntax region jDefine \ matchgroup=jDefineExpression start=/\<\%([1-4]\|13\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\>/ \ matchgroup=jDefineEnd end=/^\s*)\s*$/ \ contains=jControl,@jStdlibItems,@jPrimitiveItems,jNumber,jString,jArgument,jParenGroup,jParen,jComment,jDefineMonadDyad + \ fold syntax match jDefineMonadDyad contained /^\s*:\s*$/ " Paired parentheses. When a jDefineExpression such as "3 : 0" is diff --git a/runtime/syntax/kivy.vim b/runtime/syntax/kivy.vim new file mode 100644 index 000000000..b14550347 --- /dev/null +++ b/runtime/syntax/kivy.vim @@ -0,0 +1,36 @@ +" Vim syntax file +" Language: Kivy +" Maintainer: Corey Prophitt <prophitt.corey@gmail.com> +" Last Change: May 29th, 2014 +" Version: 1 +" URL: http://kivy.org/ + +if exists("b:current_syntax") + finish +endif + +" Load Python syntax first (Python can be used within Kivy) +syn include @pyth $VIMRUNTIME/syntax/python.vim + +" Kivy language rules can be found here +" http://kivy.org/docs/guide/lang.html + +" Define Kivy syntax +syn match kivyPreProc /#:.*/ +syn match kivyComment /#.*/ +syn match kivyRule /<\I\i*\(,\s*\I\i*\)*>:/ +syn match kivyAttribute /\<\I\i*\>/ nextgroup=kivyValue + +syn region kivyValue start=":" end=/$/ contains=@pyth skipwhite + +syn region kivyAttribute matchgroup=kivyIdent start=/[\a_][\a\d_]*:/ end=/$/ contains=@pyth skipwhite + +hi def link kivyPreproc PreProc +hi def link kivyComment Comment +hi def link kivyRule Function +hi def link kivyIdent Statement +hi def link kivyAttribute Label + +let b:current_syntax = "kivy" + +" vim: ts=8 diff --git a/runtime/syntax/ninja.vim b/runtime/syntax/ninja.vim index d81326781..f34588f60 100644 --- a/runtime/syntax/ninja.vim +++ b/runtime/syntax/ninja.vim @@ -1,10 +1,10 @@ " ninja build file syntax. " Language: ninja build file as described at " http://martine.github.com/ninja/manual.html -" Version: 1.3 -" Last Change: 2013/04/16 +" Version: 1.4 +" Last Change: 2014/05/13 " Maintainer: Nicolas Weber <nicolasweber@gmx.de> -" Version 1.3 of this script is in the upstream vim repository and will be +" Version 1.4 of this script is in the upstream vim repository and will be " included in the next vim release. If you change this, please send your change " upstream. @@ -55,6 +55,7 @@ syn keyword ninjaPoolCommand contained depth " $simple_varname -> variable " ${varname} -> variable +syn match ninjaDollar "\$\$" syn match ninjaWrapLineOperator "\$$" syn match ninjaSimpleVar "\$[a-zA-Z0-9_-]\+" syn match ninjaVar "\${[a-zA-Z0-9_.-]\+}" @@ -70,6 +71,7 @@ hi def link ninjaComment Comment hi def link ninjaKeyword Keyword hi def link ninjaRuleCommand Statement hi def link ninjaPoolCommand Statement +hi def link ninjaDollar ninjaOperator hi def link ninjaWrapLineOperator ninjaOperator hi def link ninjaOperator Operator hi def link ninjaSimpleVar ninjaVar |