[Caml-list] revised syntax vim file

[Issac Trotts <ijtrotts@ucdavis.edu>]

Here's a patch to Markus Mottl's 
and Karl-Heinz Sylla's vim syntax file so it will work 
a bit better with the revised syntax.  

Issac 



--- ocaml.vim	2002-10-30 02:24:10.000000000 -0800
+++ ocamlrev.vim	2002-10-30 02:34:41.000000000 -0800
@@ -1,14 +1,17 @@
 " Vim syntax file
-" Language:     OCaml
+" Language:     ocaml revised syntax
 " Filenames:    *.ml *.mli *.mll *.mly
 " Maintainers:  Markus Mottl      <markus@oefai.at>
 "               Karl-Heinz Sylla  <Karl-Heinz.Sylla@gmd.de>
 " URL:          http://www.ai.univie.ac.at/~markus/vim/syntax/ocaml.vim
-" Last Change:  2001 Nov 20 - Fixed small bug with modules  (MM)
+" Last Change:  
+"               2002 Oct 30 - Small tweaks for revised syntax (IT)
+"               2001 Nov 20 - Fixed small bug with modules  (MM)
 "               2001 Sep 01 - Fixed small bug with '\''  (MM)
 "               2001 Aug 29 - Added rules for scripting directives  (MM)
 "               2001 Aug 28 - Upgraded URL & mail address  (MM)
 "               2001 Apr 26 - upgraded for new Vim version  (MM)
+"
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -33,8 +36,6 @@
 syn match    ocamlKeyChar    "|"
 
 " Errors
-syn match    ocamlBraceErr   "}"
-syn match    ocamlBrackErr   "\]"
 syn match    ocamlParenErr   ")"
 syn match    ocamlArrErr     "|]"
 
@@ -55,17 +56,15 @@
 endif
 
 " Some convenient clusters
-syn cluster  ocamlAllErrs contains=ocamlBraceErr,ocamlBrackErr,ocamlParenErr,ocamlCommentErr,ocamlCountErr,ocamlDoErr,ocamlDoneErr,ocamlEndErr,ocamlThenErr
+syn cluster  ocamlAllErrs contains=ocamlParenErr,ocamlCommentErr,ocamlCountErr,ocamlDoErr,ocamlDoneErr,ocamlEndErr,ocamlThenErr
 
-syn cluster  ocamlAENoParen contains=ocamlBraceErr,ocamlBrackErr,ocamlCommentErr,ocamlCountErr,ocamlDoErr,ocamlDoneErr,ocamlEndErr,ocamlThenErr
+syn cluster  ocamlAENoParen contains=ocamlCommentErr,ocamlCountErr,ocamlDoErr,ocamlDoneErr,ocamlEndErr,ocamlThenErr
 
 syn cluster  ocamlContained contains=ocamlTodo,ocamlPreDef,ocamlModParam,ocamlModParam1,ocamlPreMPRestr,ocamlMPRestr,ocamlMPRestr1,ocamlMPRestr2,ocamlMPRestr3,ocamlModRHS,ocamlFuncWith,ocamlFuncStruct,ocamlModTypeRestr,ocamlModTRWith,ocamlWith,ocamlWithRest,ocamlModType,ocamlFullMod
 
 
 " Enclosing delimiters
 syn region   ocamlEncl transparent matchgroup=ocamlKeyword start="(" matchgroup=ocamlKeyword end=")" contains=ALLBUT,@ocamlContained,ocamlParenErr
-syn region   ocamlEncl transparent matchgroup=ocamlKeyword start="{" matchgroup=ocamlKeyword end="}"  contains=ALLBUT,@ocamlContained,ocamlBraceErr
-syn region   ocamlEncl transparent matchgroup=ocamlKeyword start="\[" matchgroup=ocamlKeyword end="\]" contains=ALLBUT,@ocamlContained,ocamlBrackErr
 syn region   ocamlEncl transparent matchgroup=ocamlKeyword start="\[|" matchgroup=ocamlKeyword end="|\]" contains=ALLBUT,@ocamlContained,ocamlArrErr
 
 
@@ -145,7 +144,7 @@
 syn keyword  ocamlKeyword  method mutable new of
 syn keyword  ocamlKeyword  parser private raise rec
 syn keyword  ocamlKeyword  try type
-syn keyword  ocamlKeyword  val virtual when while with
+syn keyword  ocamlKeyword  value virtual when while with
 
 syn keyword  ocamlType     array bool char exn float format int
 syn keyword  ocamlType     list option string unit
@@ -221,8 +220,6 @@
     command -nargs=+ HiLink hi def link <args>
   endif
 
-  HiLink ocamlBraceErr     Error
-  HiLink ocamlBrackErr     Error
   HiLink ocamlParenErr     Error
   HiLink ocamlArrErr       Error
 
@@ -282,3 +279,5 @@
 let b:current_syntax = "ocaml"
 
 " vim: ts=28
+
+



-------------------
To unsubscribe, mail caml-list-request@inria.fr Archives: http://caml.inria.fr
Bug reports: http://caml.inria.fr/bin/caml-bugs FAQ: http://caml.inria.fr/FAQ/
Beginner's list: http://groups.yahoo.com/group/ocaml_beginners