Changeset 17699 for util

Timestamp:

09/06/07 18:59:52 (15 months ago)

Author:

moritz

Message:

vim syntax file: added 'orelse', 'andthen'

Files:

• util/perl6.vim (modified) (4 diffs)

util/perl6.vim

@@ -36 +36 @@
 syn keyword p6KeyFlow       if else elsif unless  
 syn keyword p6KeyFlow       for foreach loop while until when next last redo
-syn keyword p6KeyFlow       given not or and err xor return default
+syn keyword p6KeyFlow       given not or and andthen orelse xor return default
 syn keyword p6KeyFlow       exit
 syn keyword p6ClosureTrait  BEGIN CHECK INIT START FIRST ENTER LEAVE KEEP UNDO NEXT LAST
@@ -163 +163 @@
 " rule { }
 syn region p6Regex start="rule\(\_s\+\w\+\)\{0,1}\_s*{"hs=e end="}" contains=@p6Regexen
+"syn region p6Regex start="\(rule\|token\|regex\)\(\_s\+\w\+\)\{0,1}\_s*{"hs=e end="}" contains=@p6Regexen
 
 " Closure (FIXME: Really icky hack, also doesn't support :blah modifiers)
@@ -169 +170 @@
 " miniscule tweaking to complete redesign.  This is the only way I've found!
 syn region p6Closure start="\(\(rule\(\_s\+\w\+\)\{0,1}\|s\|rx\)\_s*\)\@<!{" end="}" matchgroup=p6Error end="[\])]"  contains=TOP   fold
+"syn region p6Closure start="\(\(\(rule\|token\|regex\)\(\_s\+\w\+\)\{0,1}\|s\|rx\)\_s*\)\@<!{" end="}" matchgroup=p6Error end="[\])]"  contains=TOP   fold
 
 
@@ -202 +204 @@
 syn match p6RegexSpecial contained ":="
 syn region p6CharClass   contained start=+<\s*!\{0,1}\s*\z(['"]\)+ skip=+\\\z1+ end=+\z1\s*>+
-syn region p6TestExpr contained start="<\s*!\{0,1}\s*(" end=")\s*>" contains=TOP
+"syn region p6TestExpr contained start="<\s*!\{0,1}\s*(" end=")\s*>" contains=TOP
+syn region p6TestExpr contained start="<\(?\|!\)?{" end="}\s*>" contains=TOP