updated for version 7.0e02v7.0e02

author: Bram Moolenaar <Bram@vim.org> 2006-04-18 21:55:01 +0000
committer: Bram Moolenaar <Bram@vim.org> 2006-04-18 21:55:01 +0000
commit: c1e37901fc8486c9960d7290e521ba51e292e94b (patch)
tree: 5367e8f83d9d313dd73c0499fd310f57df5e605f /runtime/syntax
parent: a93fa7ee7856b54d3778e613c7b7e4b76aaeb2af (diff)
6 files changed, 540 insertions, 15 deletions
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index 49feceea98..b852f48a9a 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,6 +1,6 @@
 " Vim syntax support file
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2005 Dec 04
+" Last Change: 2006 Apr 18
 "	       (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>)
 "	       (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>)
 
@@ -224,14 +224,16 @@ else
 endif
 
 let s:HtmlSpace = ' '
+let s:LeadingSpace = ' '
 let s:HtmlEndline = ''
 if exists("html_no_pre")
   let s:HtmlEndline = '<br' . s:tag_close
   if exists("use_xhtml")
-    let s:HtmlSpace = '\&#x20;'
+    let s:LeadingSpace = '&#x20;'
   else
-    let s:HtmlSpace = '\&nbsp;'
+    let s:LeadingSpace = '&nbsp;'
   endif
+  let s:HtmlSpace = '\' . s:LeadingSpace
 endif
 
 " HTML header, with the title and generator ;-). Left free space for the CSS,
@@ -246,9 +248,17 @@ if exists("html_use_css")
   exe "normal! a<style type=\"text/css\">\n<!--\n-->\n</style>\n\e"
 endif
 if exists("html_no_pre")
-  exe "normal! a</head>\n<body>\n\e"
+  if exists("use_xhtml")
+    exe "normal! a</head>\n<body>\n<p>\n\e"
+  else
+    exe "normal! a</head>\n<body>\n\e"
+  endif
 else
-  exe "normal! a</head>\n<body>\n<pre>\n\e"
+  if exists("use_xhtml")
+    exe "normal! a</head>\n<body>\n<p>\n<pre>\n\e"
+  else
+    exe "normal! a</head>\n<body>\n<pre>\n\e"
+  endif
 endif
 
 exe s:orgwin . "wincmd w"
@@ -296,7 +306,7 @@ while s:lnum <= s:end
     while s:n > 0
       if s:numblines
         " Indent if line numbering is on
-        let s:new = repeat(' ', strlen(s:end) + 1) . repeat(s:difffillchar, 3)
+        let s:new = repeat(s:LeadingSpace, strlen(s:end) + 1) . repeat(s:difffillchar, 3)
       else
         let s:new = repeat(s:difffillchar, 3)
       endif
@@ -406,9 +416,17 @@ endwhile
 " Finish with the last line
 exe s:newwin . "wincmd w"
 if exists("html_no_pre")
-  exe "normal! a\n</body>\n</html>\e"
+  if exists("use_xhtml")
+    exe "normal! a</p>\n</body>\n</html>\e"
+  else
+    exe "normal! a\n</body>\n</html>\e"
+  endif
 else
-  exe "normal! a</pre>\n</body>\n</html>\e"
+  if exists("use_xhtml")
+    exe "normal! a</pre>\n</p>\n</body>\n</html>\e"
+  else
+    exe "normal! a</pre>\n</body>\n</html>\e"
+  endif
 endif
 
 
@@ -525,4 +543,4 @@ if !v:profiling
     delfunc s:HtmlClosing
   endif
 endif
-silent! unlet s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace s:HtmlEndline
+silent! unlet s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace s:LeadingSpace s:HtmlEndline
diff --git a/runtime/syntax/cmake.vim b/runtime/syntax/cmake.vim
new file mode 100644
index 0000000000..8dfe3d713e
--- /dev/null
+++ b/runtime/syntax/cmake.vim
@@ -0,0 +1,85 @@
+" =============================================================================
+"
+"   Program:   CMake - Cross-Platform Makefile Generator
+"   Module:    $RCSfile$
+"   Language:  VIM
+"   Date:      $Date$
+"   Version:   $Revision$
+"
+" =============================================================================
+
+" Vim syntax file
+" Language:     CMake
+" Author:       Andy Cedilnik <andy.cedilnik@kitware.com>
+" Maintainer:   Andy Cedilnik <andy.cedilnik@kitware.com>
+" Last Change:  $Date$
+" Version:      $Revision$
+"
+" Licence:      The CMake license applies to this file. See
+"               http://www.cmake.org/HTML/Copyright.html
+"               This implies that distribution with Vim is allowed
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+syn match cmakeComment /#.*$/
+syn region cmakeRegistry start=/\[/ end=/\]/ skip=/\\[\[\]]/
+            \ contained
+syn match cmakeArgument /[^()"]+/
+            \ contained
+syn match cmakeVariableValue /\${[^}]*}/
+            \ contained oneline
+syn match cmakeEnvironment /\$ENV{.*}/
+            \ contained
+syn keyword cmakeSystemVariables
+            \ WIN32 UNIX APPLE CYGWIN BORLAND MINGW MSVC MSVC_IDE MSVC60 MSVC70 MSVC71 MSVC80
+syn keyword cmakeOperators
+            \ AND BOOL CACHE COMMAND DEFINED DOC EQUAL EXISTS FALSE GREATER INTERNAL LESS MATCHES NAME NAMES NAME_WE NOT OFF ON OR PATH PATHS PROGRAM STREQUAL STRGREATER STRING STRLESS TRUE
+"            \ contained
+syn region cmakeString start=/"/ end=/"/ skip=/\\"/
+            \ contains=ALLBUT,cmakeString
+syn region cmakeArguments start=/\s*(/ end=/)/
+           \ contains=ALLBUT,cmakeArguments
+syn keyword cmakeDeprecated ABSTRACT_FILES BUILD_NAME SOURCE_FILES SOURCE_FILES_REMOVE VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WRAP_EXCLUDE_FILES
+           \ nextgroup=cmakeArgument
+syn keyword cmakeStatement
+           \ ADD_CUSTOM_COMMAND ADD_CUSTOM_TARGET ADD_DEFINITIONS ADD_DEPENDENCIES ADD_EXECUTABLE ADD_LIBRARY ADD_SUBDIRECTORY ADD_TEST AUX_SOURCE_DIRECTORY BUILD_COMMAND BUILD_NAME CMAKE_MINIMUM_REQUIRED CONFIGURE_FILE CREATE_TEST_SOURCELIST ELSE ENABLE_LANGUAGE ENABLE_TESTING ENDFOREACH ENDIF ENDWHILE EXEC_PROGRAM EXECUTE_PROCESS EXPORT_LIBRARY_DEPENDENCIES FILE FIND_FILE FIND_LIBRARY FIND_PACKAGE FIND_PATH FIND_PROGRAM FLTK_WRAP_UI FOREACH GET_CMAKE_PROPERTY GET_DIRECTORY_PROPERTY GET_FILENAME_COMPONENT GET_SOURCE_FILE_PROPERTY GET_TARGET_PROPERTY GET_TEST_PROPERTY IF INCLUDE INCLUDE_DIRECTORIES INCLUDE_EXTERNAL_MSPROJECT INCLUDE_REGULAR_EXPRESSION INSTALL INSTALL_FILES INSTALL_PROGRAMS INSTALL_TARGETS LINK_DIRECTORIES LINK_LIBRARIES LIST LOAD_CACHE LOAD_COMMAND MACRO MAKE_DIRECTORY MARK_AS_ADVANCED MATH MESSAGE OPTION OUTPUT_REQUIRED_FILES PROJECT QT_WRAP_CPP QT_WRAP_UI REMOVE REMOVE_DEFINITIONS SEPARATE_ARGUMENTS SET SET_DIRECTORY_PROPERTIES SET_SOURCE_FILES_PROPERTIES SET_TARGET_PROPERTIES SET_TESTS_PROPERTIES SITE_NAME SOURCE_GROUP STRING SUBDIR_DEPENDS SUBDIRS TARGET_LINK_LIBRARIES TRY_COMPILE TRY_RUN USE_MANGLED_MESA UTILITY_SOURCE VARIABLE_REQUIRES VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WHILE WRITE_FILE
+           \ nextgroup=cmakeArgumnts
+
+"syn match cmakeMacro /^\s*[A-Z_]\+/ nextgroup=cmakeArgumnts
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_cmake_syntax_inits")
+  if version < 508
+    let did_cmake_syntax_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink cmakeStatement Statement
+  HiLink cmakeComment Comment
+  HiLink cmakeString String
+  HiLink cmakeVariableValue Type
+  HiLink cmakeRegistry Underlined
+  HiLink cmakeArguments Identifier
+  HiLink cmakeArgument Constant
+  HiLink cmakeEnvironment Special
+  HiLink cmakeOperators Operator
+  HiLink cmakeMacro PreProc
+  HiLink cmakeError	Error
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "cmake"
+
+"EOF"
diff --git a/runtime/syntax/rnoweb.vim b/runtime/syntax/rnoweb.vim
new file mode 100644
index 0000000000..7a106ecb9d
--- /dev/null
+++ b/runtime/syntax/rnoweb.vim
@@ -0,0 +1,55 @@
+" Vim syntax file
+" Language:    R noweb Files
+" Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
+" Last Change: 2006 Apr 18
+" Version:     0.5 
+" SVN:	       $Id$
+" Remarks:     - This file is inspired by the proposal of 
+"				 Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br>
+"			     http://www.ime.usp.br/~feferraz/en/sweavevim.html
+"			   - It extends some clusters from syntax/tex.vim (version 33,
+"			   	 March 06 2006) and therefore depends on some contents 
+"			     of this file
+"
+
+" Version Clears: {{{1
+" For version 5.x: Clear all syntax items
+" For version 6.x and 7.x: Quit when a syntax file was already loaded
+if version < 600 
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif 
+
+syn case match
+
+" Extension of Tex regions {{{1
+runtime syntax/tex.vim
+unlet b:current_syntax
+
+syn cluster texDocGroup		contains=texPartZone,@texPartGroup,@rnoweb
+syn cluster texPartGroup		contains=texChapterZone,texSectionZone,texParaZone,@rnoweb
+syn cluster texChapterGroup		contains=texSectionZone,texParaZone,@rnoweb
+syn cluster texSectionGroup		contains=texSubSectionZone,texParaZone,@rnoweb
+syn cluster texSubSectionGroup		contains=texSubSubSectionZone,texParaZone,@rnoweb
+syn cluster texSubSubSectionGroup	contains=texParaZone,@rnoweb
+syn cluster texParaGroup		contains=texSubParaZone,@rnoweb
+
+" Highlighting of R code using an existing r.vim syntax file if available {{{1
+syn include @rnowebR syntax/r.vim
+syn region rnowebChunk matchgroup=rnowebDelimiter start="^<<.*>>=" matchgroup=rnowebDelimiter end="^@" contains=@rnowebR,rnowebChunkReference,rnowebChunk keepend
+syn match rnowebChunkReference "^<<.*>>$" contained
+syn region rnowebSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter end="}" contains=@rnowebR
+
+" Sweave options command {{{1
+syn region rnowebSweaveopts matchgroup=Delimiter start="\\SweaveOpts{" matchgroup=Delimiter end="}"
+
+" rnoweb Cluster {{{1
+syn cluster rnoweb contains=rnowebChunk,rnowebChunkReference,rnowebDelimiter,rnowebSexpr,rnowebSweaveopts
+
+" Highlighting {{{1
+hi def link rnowebDelimiter	Delimiter
+hi def link rnowebSweaveOpts Statement
+
+let   b:current_syntax = "rnoweb"
+" vim: foldmethod=marker:
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index 5a5e6a2a45..6452e725eb 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	TeX
 " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrchipO@ScampbellPfamily.AbizM>
-" Last Change:	Apr 12, 2006
-" Version:	34
+" Last Change:	Apr 18, 2006
+" Version:	35
 " URL:		http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
 "
 " Notes: {{{1
@@ -391,6 +391,12 @@ endif
 " will appropriately terminate.  Ideally vim would let me save a
 " character from the start pattern and re-use it in the end-pattern.
 syn region texZone		start="\\begin{verbatim}"		end="\\end{verbatim}\|%stopzone\>"	contains=@Spell
+" listings package:
+syn region texZone		start="\\begin{lstlisting}"		end="\\end{lstlisting}\|%stopzone\>"	contains=@Spell
+" moreverb package:
+syn region texZone		start="\\begin{verbatimtab}"		end="\\end{verbatimtab}\|%stopzone\>"	contains=@Spell
+syn region texZone		start="\\begin{verbatimwrite}"		end="\\end{verbatimwrite}\|%stopzone\>"	contains=@Spell
+syn region texZone		start="\\begin{boxedverbatim}"		end="\\end{boxedverbatim}\|%stopzone\>"	contains=@Spell
 if version < 600
  syn region texZone		start="\\verb\*\=`"			end="`\|%stopzone\>"
  syn region texZone		start="\\verb\*\=#"			end="#\|%stopzone\>"
diff --git a/runtime/syntax/vera.vim b/runtime/syntax/vera.vim
new file mode 100644
index 0000000000..b8e25cf346
--- /dev/null
+++ b/runtime/syntax/vera.vim
@@ -0,0 +1,361 @@
+" Vim syntax file
+" Language:	Vera
+" Maintainer:	Dave Eggum (opine at bluebottle dOt com)
+" Last Change:	2005 Dec 19
+
+" NOTE: extra white space at the end of the line will be highlighted if you
+" add this line to your colorscheme:
+
+" highlight SpaceError    guibg=#204050
+
+" (change the value for guibg to any color you like)
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+" A bunch of useful Vera keywords
+syn keyword	veraStatement	break return continue fork join terminate
+syn keyword	veraStatement	breakpoint proceed
+
+syn keyword	veraLabel	bad_state bad_trans bind constraint coverage_group
+syn keyword	veraLabel	class CLOCK default function interface m_bad_state
+syn keyword	veraLabel	m_bad_trans m_state m_trans program randseq state
+syn keyword	veraLabel	task trans
+
+syn keyword	veraConditional	if else case casex casez randcase
+syn keyword 	veraRepeat      repeat while for do foreach
+syn keyword 	veraModifier	after all any around assoc_size async
+syn keyword 	veraModifier	before big_endian bit_normal bit_reverse export
+syn keyword 	veraModifier	extends extern little_endian local hdl_node hdl_task
+syn keyword 	veraModifier	negedge none packed protected posedge public rules
+syn keyword 	veraModifier	shadow soft static super this typedef unpacked var
+syn keyword 	veraModifier	vca virtual virtuals wildcard with
+
+syn keyword 	veraType	reg string enum event bit
+syn keyword 	veraType	rand randc integer port prod
+
+syn keyword     veraDeprecated	call_func call_task close_conn get_bind get_bind_id
+syn keyword     veraDeprecated	get_conn_err mailbox_receive mailbox_send make_client
+syn keyword     veraDeprecated	make_server simwave_plot up_connections
+
+" predefined tasks and functions
+syn keyword 	veraTask	alloc assoc_index cast_assign cm_coverage
+syn keyword 	veraTask	cm_get_coverage cm_get_limit delay error error_mode
+syn keyword 	veraTask	exit fclose feof ferror fflush flag fopen fprintf
+syn keyword 	veraTask	freadb freadh freadstr get_cycle get_env get_memsize
+syn keyword 	veraTask	get_plus_arg getstate get_systime get_time get_time_unit
+syn keyword 	veraTask	initstate lock_file mailbox_get mailbox_put os_command
+syn keyword 	veraTask	printf prodget prodset psprintf query query_str query_x
+syn keyword 	veraTask	rand48 random region_enter region_exit rewind
+syn keyword 	veraTask	semaphore_get semaphore_put setstate signal_connect
+syn keyword 	veraTask	sprintf srandom sscanf stop suspend_thread sync
+syn keyword 	veraTask	timeout trace trigger unit_delay unlock_file urand48
+syn keyword 	veraTask	urandom urandom_range vera_bit_reverse vera_crc
+syn keyword 	veraTask	vera_pack vera_pack_big_endian vera_plot
+syn keyword 	veraTask	vera_report_profile vera_unpack vera_unpack_big_endian
+syn keyword 	veraTask	vsv_call_func vsv_call_task vsv_get_conn_err
+syn keyword 	veraTask	vsv_make_client vsv_make_server vsv_up_connections
+syn keyword 	veraTask	vsv_wait_for_done vsv_wait_for_input wait_child wait_var
+
+syn cluster	veraOperGroup	contains=veraOperator,veraOperParen,veraNumber,veraString,veraOperOk,veraType
+" syn match	veraOperator	"++\|--\|&\|\~&\||\|\~|\|^\|\~^\|\~\|><"
+" syn match	veraOperator	"*\|/\|%\|+\|-\|<<\|>>\|<\|<=\|>\|>=\|!in"
+" syn match	veraOperator	"=?=\|!?=\|==\|!=\|===\|!==\|&\~\|^\~\||\~"
+" syn match	veraOperator	"&&\|||\|=\|+=\|-=\|*=\|/=\|%=\|<<=\|>>=\|&="
+" syn match	veraOperator	"|=\|^=\|\~&=\|\~|=\|\~^="
+
+syn match	veraOperator	"[&|\~><!*@+/=,.\^\-]"
+syn keyword	veraOperator	or in dist not
+
+" open vera class methods
+syn keyword	veraMethods	atobin atohex atoi atooct backref bittostr capacity
+syn keyword	veraMethods	compare Configure constraint_mode delete DisableTrigger
+syn keyword	veraMethods	DoAction empty EnableCount EnableTrigger Event find
+syn keyword	veraMethods	find_index first first_index GetAssert get_at_least
+syn keyword	veraMethods	get_auto_bin getc GetCount get_coverage_goal get_cov_weight
+syn keyword	veraMethods	get_cross_bin_max GetFirstAssert GetName GetNextAssert
+syn keyword	veraMethods	get_status get_status_msg hide hash icompare insert
+syn keyword	veraMethods	inst_get_at_least inst_get_auto_bin_max inst_get_collect
+syn keyword	veraMethods	inst_get_coverage_goal inst_get_cov_weight inst_getcross_bin_max
+syn keyword	veraMethods	inst_query inst_set_at_least inst_set_auto_bin_max
+syn keyword	veraMethods	inst_set_bin_activiation inst_set_collect inst_set_coverage_goal
+syn keyword	veraMethods	inst_set_cov_weight inst_set_cross_bin_max itoa last last_index
+syn keyword	veraMethods	len load match max max_index min min_index new object_compare
+syn keyword	veraMethods	object_compare object_copy object_print pack pick_index
+syn keyword	veraMethods	pop_back pop_front post_boundary postmatch post_pack post_pack
+syn keyword	veraMethods	post_randomize post_randomize post_unpack post_unpack
+syn keyword	veraMethods	pre_boundary prematch pre_pack pre_pack pre_randomize
+syn keyword	veraMethods	pre-randomize pre_unpack push_back push_front putc query
+syn keyword	veraMethods	query_str rand_mode randomize reserve reverse rsort search
+syn keyword	veraMethods	set_at_least set_auto_bin_max set_bin_activiation
+syn keyword	veraMethods	set_coverage_goal set_cov_weight set_cross_bin_max set_name
+syn keyword	veraMethods	size sort substr sum thismatch tolower toupper unique_index
+syn keyword	veraMethods	unpack Wait
+
+" interface keywords
+syn keyword	veraInterface	ASYNC CLOCK gnr gr0 gr1 grx grz NHOLD nr NR0 NR1
+syn keyword	veraInterface	NRZ NRZ NSAMPLE PHOLD PR0 PR1 PRX PRZ r0 r1 rx snr
+syn keyword	veraInterface	sr0 sr1 srx srz depth inout input output
+syn match       veraInterface   "\$\w\+"
+
+
+syn keyword	veraTodo	contained TODO FIXME XXX FINISH
+
+" veraCommentGroup allows adding matches for special things in comments
+syn cluster	veraCommentGroup	contains=veraTodo
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match	veraSpecial	display contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)"
+syn match	veraFormat	display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpnm]\|\[\^\=.[^]]*\]\)" contained
+syn match	veraFormat	display "%%" contained
+syn region	veraString	start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=veraSpecial,veraFormat,@Spell
+syn region	veraConcat	contained transparent oneline start='{' end='}'
+
+" veraCppString: same as veraString, but ends at end of line
+syn region	veraCppString	start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=veraSpecial,veraFormat,@Spell
+
+syn match	veraCharacter	"'[^\\]'"
+syn match	veraCharacter	"L'[^']*'" contains=veraSpecial
+syn match	veraSpecialError	"'\\[^'\"?\\abefnrtv]'"
+syn match	veraSpecialCharacter	"'\\['\"?\\abefnrtv]'"
+syn match	veraSpecialCharacter	display	"'\\\o\{1,3}'"
+syn match	veraSpecialCharacter	display	"'\\x\x\{1,2}'"
+syn match	veraSpecialCharacter	display	"L'\\x\x\+'"
+
+" highlight trailing white space
+syn match	veraSpaceError	display	excludenl "\s\+$"
+syn match	veraSpaceError	display	" \+\t"me=e-1
+
+"catch errors caused by wrong parenthesis and brackets
+syn cluster	veraParenGroup	contains=veraParenError,veraIncluded,veraSpecial,veraCommentSkip,veraCommentString,veraComment2String,@veraCommentGroup,veraCommentStartError,veraUserCont,veraUserLabel,veraBitField,veraCommentSkip,veraOctalZero,veraCppOut,veraCppOut2,veraCppSkip,veraFormat,veraNumber,veraFloat,veraOctal,veraOctalError,veraNumbersCom
+
+syn region	veraParen	transparent start='(' end=')' contains=ALLBUT,@veraParenGroup,veraCppParen,veraErrInBracket,veraCppBracket,veraCppString,@Spell
+" veraCppParen: same as veraParen but ends at end-of-line; used in veraDefine
+syn region	veraCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@veraParenGroup,veraErrInBracket,veraParen,veraBracket,veraString,@Spell
+syn match	veraParenError	display "[\])]"
+" syn match	veraErrInParen	display contained "[\]{}]"
+syn match	veraErrInParen	display contained "[\]]"
+syn region	veraBracket	transparent start='\[' end=']' contains=ALLBUT,@veraParenGroup,veraErrInParen,veraCppParen,veraCppBracket,veraCppString,@Spell
+
+" veraCppBracket: same as veraParen but ends at end-of-line; used in veraDefine
+syn region	veraCppBracket	transparent start='\[' skip='\\$' excludenl end=']' end='$' contained contains=ALLBUT,@veraParenGroup,veraErrInParen,veraParen,veraBracket,veraString,@Spell
+syn match	veraErrInBracket	display contained "[);{}]"
+
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match	veraNumbers	display transparent "\<\d\|\.\d" contains=veraNumber,veraFloat,veraOctalError,veraOctal
+" Same, but without octal error (for comments)
+syn match	veraNumbersCom	display contained transparent "\<\d\|\.\d" contains=veraNumber,veraFloat,veraOctal
+" syn match	veraNumber	display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>"
+" "hex number
+" syn match	veraNumber	display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
+" syn match   veraNumber "\(\<[0-9]\+\|\)'[bdoh][0-9a-fxzA-FXZ_]\+\>"
+syn match	veraNumber "\<\(\<[0-9]\+\)\?\('[bdoh]\)\?[0-9a-fxz_]\+\>"
+" syn match   veraNumber "\<[+-]\=[0-9]\+\>"
+" Flag the first zero of an octal number as something special
+syn match	veraOctal	display contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=veraOctalZero
+syn match	veraOctalZero	display contained "\<0"
+syn match	veraFloat	display contained "\d\+f"
+"floating point number, with dot, optional exponent
+syn match	veraFloat	display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\="
+"floating point number, starting with a dot, optional exponent
+syn match	veraFloat	display contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match	veraFloat	display contained "\d\+e[-+]\=\d\+[fl]\=\>"
+"hexadecimal floating point number, optional leading digits, with dot, with exponent
+syn match	veraFloat	display contained "0x\x*\.\x\+p[-+]\=\d\+[fl]\=\>"
+"hexadecimal floating point number, with leading digits, optional dot, with exponent
+syn match	veraFloat	display contained "0x\x\+\.\=p[-+]\=\d\+[fl]\=\>"
+
+" flag an octal number with wrong digits
+syn match	veraOctalError	display contained "0\o*[89]\d*"
+syn case match
+
+let vera_comment_strings = 1
+
+if exists("vera_comment_strings")
+  " A comment can contain veraString, veraCharacter and veraNumber.
+  " But a "*/" inside a veraString in a veraComment DOES end the comment!  So we
+  " need to use a special type of veraString: veraCommentString, which also ends on
+  " "*/", and sees a "*" at the start of the line as comment again.
+  " Unfortunately this doesn't work very well for // type of comments :-(
+  syntax match	veraCommentSkip	contained "^\s*\*\($\|\s\+\)"
+  syntax region veraCommentString	contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=veraSpecial,veraCommentSkip
+  syntax region veraComment2String	contained start=+\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=veraSpecial
+  syntax region  veraCommentL	start="//" skip="\\$" end="$" keepend contains=@veraCommentGroup,veraComment2String,veraCharacter,veraNumbersCom,veraSpaceError,@Spell
+  if exists("vera_no_comment_fold")
+    syntax region veraComment	matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraCommentString,veraCharacter,veraNumbersCom,veraSpaceError,@Spell
+  else
+    syntax region veraComment	matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraCommentString,veraCharacter,veraNumbersCom,veraSpaceError,@Spell fold
+  endif
+else
+  syn region	veraCommentL	start="//" skip="\\$" end="$" keepend contains=@veraCommentGroup,veraSpaceError,@Spell
+  if exists("vera_no_comment_fold")
+    syn region	veraComment	matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraSpaceError,@Spell
+  else
+    syn region	veraComment	matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraSpaceError,@Spell fold
+  endif
+endif
+" keep a // comment separately, it terminates a preproc. conditional
+syntax match	veraCommentError	display "\*/"
+syntax match	veraCommentStartError display "/\*"me=e-1 contained
+
+syntax region	veraBlock		start="{" end="}" transparent fold
+
+" open vera pre-defined constants
+syn keyword veraConstant	ALL ANY BAD_STATE BAD_TRANS CALL CHECK CHGEDGE
+syn keyword veraConstant	CLEAR COPY_NO_WAIT COPY_WAIT CROSS CROSS_TRANS
+syn keyword veraConstant	DEBUG DELETE EC_ARRAYX EC_CODE_END EC_CONFLICT
+syn keyword veraConstant	EC_EVNTIMOUT EC_EXPECT EC_FULLEXPECT EC_MBXTMOUT
+syn keyword veraConstant	EC_NEXPECT EC_RETURN EC_RGNTMOUT EC_SCONFLICT
+syn keyword veraConstant	EC_SEMTMOUT EC_SEXPECT EC_SFULLEXPECT EC_SNEXTPECT
+syn keyword veraConstant	EC_USERSET EQ EVENT FAIL FIRST FORK GE GOAL GT
+syn keyword veraConstant	HAND_SHAKE HI HIGH HNUM LE LIC_EXIT LIC_PRERR
+syn keyword veraConstant	LIC_PRWARN LIC_WAIT LO LOAD LOW LT MAILBOX MAX_COM
+syn keyword veraConstant	NAME NE NEGEDGE NEXT NO_OVERLAP NO_OVERLAP_STATE
+syn keyword veraConstant	NO_OVERLAP_TRANS NO_VARS NO_WAIT NUM NUM_BIN
+syn keyword veraConstant	NUM_DET null OFF OK OK_LAST ON ONE_BLAST ONE_SHOT ORDER
+syn keyword veraConstant	PAST_IT PERCENT POSEDGE PROGRAM RAWIN REGION REPORT
+syn keyword veraConstant	SAMPLE SAVE SEMAPHORE SET SILENT STATE stderr
+syn keyword veraConstant	stdin stdout STR STR_ERR_OUT_OF_RANGE
+syn keyword veraConstant	STR_ERR_REGEXP_SYNTAX SUM TRANS VERBOSE void WAIT
+syn keyword veraConstant	__LINE__ __FILE__ __DATE__ __TIME__ __VERA__
+syn keyword veraConstant	__VERSION__ __VERA_VERSION__ __VERA_MINOR__
+syn keyword veraConstant	__VERA_PATCH__ __VERA_VMC__ __VERA_VMC_MINOR__
+
+syn match   veraUserConstant "\<[A-Z][A-Z0-9_]\+\>"
+
+syn match veraClass "\zs\w\+\ze::"
+syn match veraClass "\zs\w\+\ze\s\+\w\+\s*[=;,)\[]" contains=veraConstant,veraUserConstant
+syn match veraClass "\zs\w\+\ze\s\+\w\+\s*$" contains=veraConstant,veraUserConstant
+syn match veraUserMethod "\zs\w\+\ze\s*(" contains=veraConstant,veraUserConstant
+syn match veraObject "\zs\w\+\ze\.\w"
+syn match veraObject "\zs\w\+\ze\.\$\w"
+
+" Accept ` for # (Verilog)
+syn region	veraPreCondit	start="^\s*\(`\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" end="//"me=s-1 contains=veraComment,veraCppString,veraCharacter,veraCppParen,veraParenError,veraNumbers,veraCommentError,veraSpaceError
+syn match	veraPreCondit	display "^\s*\(`\|#\)\s*\(else\|endif\)\>"
+if !exists("vera_no_if0")
+  syn region	veraCppOut		start="^\s*\(`\|#\)\s*if\s\+0\+\>" end=".\@=\|$" contains=veraCppOut2
+  syn region	veraCppOut2	contained start="0" end="^\s*\(`\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=veraSpaceError,veraCppSkip
+  syn region	veraCppSkip	contained start="^\s*\(`\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(`\|#\)\s*endif\>" contains=veraSpaceError,veraCppSkip
+endif
+syn region	veraIncluded	display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match	veraIncluded	display contained "<[^>]*>"
+syn match	veraInclude	display "^\s*\(`\|#\)\s*include\>\s*["<]" contains=veraIncluded
+"syn match veraLineSkip	"\\$"
+syn cluster	veraPreProcGroup	contains=veraPreCondit,veraIncluded,veraInclude,veraDefine,veraErrInParen,veraErrInBracket,veraUserLabel,veraSpecial,veraOctalZero,veraCppOut,veraCppOut2,veraCppSkip,veraFormat,veraNumber,veraFloat,veraOctal,veraOctalError,veraNumbersCom,veraString,veraCommentSkip,veraCommentString,veraComment2String,@veraCommentGroup,veraCommentStartError,veraParen,veraBracket,veraMulti
+syn region	veraDefine		start="^\s*\(`\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" end="//"me=s-1 contains=ALLBUT,@veraPreProcGroup,@Spell
+syn region	veraPreProc	start="^\s*\(`\|#\)\s*\(pragma\>\|line\>\|warning\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@veraPreProcGroup,@Spell
+
+" Highlight User Labels
+syn cluster	veraMultiGroup	contains=veraIncluded,veraSpecial,veraCommentSkip,veraCommentString,veraComment2String,@veraCommentGroup,veraCommentStartError,veraUserCont,veraUserLabel,veraBitField,veraOctalZero,veraCppOut,veraCppOut2,veraCppSkip,veraFormat,veraNumber,veraFloat,veraOctal,veraOctalError,veraNumbersCom,veraCppParen,veraCppBracket,veraCppString
+syn region	veraMulti		transparent start='?' skip='::' end=':' contains=ALLBUT,@veraMultiGroup,@Spell
+" syn region	veraMulti		transparent start='?' skip='::' end=':' contains=ALL
+" The above causes veraCppOut2 to catch on:
+"    i = (isTrue) ? 0 : 1;
+" which ends up commenting the rest of the file
+
+" Avoid matching foo::bar() by requiring that the next char is not ':'
+syn cluster	veraLabelGroup	contains=veraUserLabel
+syn match	veraUserCont	display "^\s*\I\i*\s*:$" contains=@veraLabelGroup
+syn match	veraUserCont	display ";\s*\I\i*\s*:$" contains=@veraLabelGroup
+syn match	veraUserCont	display "^\s*\I\i*\s*:[^:]"me=e-1 contains=@veraLabelGroup
+syn match	veraUserCont	display ";\s*\I\i*\s*:[^:]"me=e-1 contains=@veraLabelGroup
+
+syn match	veraUserLabel	display "\I\i*" contained
+
+" Avoid recognizing most bitfields as labels
+syn match	veraBitField	display "^\s*\I\i*\s*:\s*[1-9]"me=e-1
+syn match	veraBitField	display ";\s*\I\i*\s*:\s*[1-9]"me=e-1
+
+if exists("vera_minlines")
+  let b:vera_minlines = vera_minlines
+else
+  if !exists("vera_no_if0")
+    let b:vera_minlines = 50	" #if 0 constructs can be long
+  else
+    let b:vera_minlines = 15	" mostly for () constructs
+  endif
+endif
+exec "syn sync ccomment veraComment minlines=" . b:vera_minlines
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_vera_syn_inits")
+  if version < 508
+    let did_vera_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink veraClass		Identifier
+  HiLink veraObject		Identifier
+  HiLink veraUserMethod		Function
+  HiLink veraTask		Keyword
+  HiLink veraModifier		Tag
+  HiLink veraDeprecated		veraError
+  HiLink veraMethods		Statement
+  " HiLink veraInterface		Label
+  HiLink veraInterface		Function
+
+  HiLink veraFormat		veraSpecial
+  HiLink veraCppString		veraString
+  HiLink veraCommentL		veraComment
+  HiLink veraCommentStart		veraComment
+  HiLink veraLabel			Label
+  HiLink veraUserLabel		Label
+  HiLink veraConditional		Conditional
+  HiLink veraRepeat		Repeat
+  HiLink veraCharacter		Character
+  HiLink veraSpecialCharacter	veraSpecial
+  HiLink veraNumber		Number
+  HiLink veraOctal			Number
+  HiLink veraOctalZero		PreProc	 " link this to Error if you want
+  HiLink veraFloat			Float
+  HiLink veraOctalError		veraError
+  HiLink veraParenError		veraError
+  HiLink veraErrInParen		veraError
+  HiLink veraErrInBracket		veraError
+  HiLink veraCommentError		veraError
+  HiLink veraCommentStartError	veraError
+  HiLink veraSpaceError         SpaceError
+  HiLink veraSpecialError		veraError
+  HiLink veraOperator		Operator
+  HiLink veraStructure		Structure
+  HiLink veraInclude		Include
+  HiLink veraPreProc		PreProc
+  HiLink veraDefine		Macro
+  HiLink veraIncluded		veraString
+  HiLink veraError			Error
+  HiLink veraStatement		Statement
+  HiLink veraPreCondit		PreCondit
+  HiLink veraType			Type
+  " HiLink veraConstant		Constant
+  HiLink veraConstant		Keyword
+  HiLink veraUserConstant		Constant
+  HiLink veraCommentString		veraString
+  HiLink veraComment2String	veraString
+  HiLink veraCommentSkip		veraComment
+  HiLink veraString		String
+  HiLink veraComment		Comment
+  HiLink veraSpecial		SpecialChar
+  HiLink veraTodo			Todo
+  HiLink veraCppSkip		veraCppOut
+  HiLink veraCppOut2		veraCppOut
+  HiLink veraCppOut		Comment
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "vera"
+
+" vim: ts=8
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index f5e654af5e..5b8b32edb9 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Vim 7.0 script
 " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Apr 12, 2006
-" Version:	7.0-42
+" Last Change:	Apr 18, 2006
+" Version:	7.0-44
 " Automatically generated keyword lists: {{{1
 
 " Quit when a syntax file was already loaded {{{2
@@ -129,7 +129,7 @@ syn cluster vimOperGroup	contains=vimOper,vimOperParen,vimNumber,vimString,vimRe
 syn match  vimOper	"\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}"	skipwhite nextgroup=vimString,vimSpecFile
 syn match  vimOper	"||\|&&\|[-+.]"	skipwhite nextgroup=vimString,vimSpecFile
 syn region vimOperParen 	oneline matchgroup=vimOper start="(" end=")" contains=@vimOperGroup
-syn region vimOperParen	matchgroup=vimSep  start="{" end="}" contains=@vimOperGroup nextgroup=vimVar
+syn region vimOperParen	oneline matchgroup=vimSep  start="{" end="}" contains=@vimOperGroup nextgroup=vimVar
 if !exists("g:vimsyntax_noerror")
  syn match  vimOperError	")"
 endif
@@ -252,7 +252,7 @@ syn match  vimFilter contained	"\A!.\{-}\(|\|$\)"ms=s+1	contains=vimSpecFile
 "syn match  vimCmplxRepeat	'@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\)'
 
 " Set command and associated set-options (vimOptions) with comment {{{2
-syn region vimSet		matchgroup=vimCommand start="\<setlocal\|set\>" skip="\%(\\\\\)*\\." end="$" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod
+syn region vimSet		matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|set\)\>" skip="\%(\\\\\)*\\." end="$" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod
 syn region vimSetEqual  contained	start="="	skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1 contains=vimCtrlChar,vimSetSep,vimNotation oneline
 syn region vimSetString contained	start=+="+hs=s+1	skip=+\\\\\|\\"+  end=+"+	contains=vimCtrlChar
 syn match  vimSetSep    contained	"[,:]"
author	Bram Moolenaar <Bram@vim.org>	2006-04-18 21:55:01 +0000
committer	Bram Moolenaar <Bram@vim.org>	2006-04-18 21:55:01 +0000
commit	c1e37901fc8486c9960d7290e521ba51e292e94b (patch)
tree	5367e8f83d9d313dd73c0499fd310f57df5e605f /runtime/syntax
parent	a93fa7ee7856b54d3778e613c7b7e4b76aaeb2af (diff)