Merge pull request #59 from haya14busa/add-usercmd-regex

Fix USERCMD regex and py/js support

Author: mattn

autoload/vimlparser.vim

@@ -746,7 +746,7 @@ function! s:VimLParser.parse_command()
     let self.ea.forceit = s:FALSE
   endif
 
-  if self.ea.cmd.flags !~# '\<BANG\>' && self.ea.forceit && self.ea.cmd.flags !~# 'USERCMD'
+  if self.ea.cmd.flags !~# '\<BANG\>' && self.ea.forceit && self.ea.cmd.flags !~# '\<USERCMD\>'
     throw s:Err('E477: No ! allowed', self.ea.cmdpos)
   endif
 

js/vimlfunc.js

@@ -35,6 +35,7 @@ var pat_vim2js = {
   "\\<NOTRLCOM\\>" : "\\bNOTRLCOM\\b",
   "\\<TRLBAR\\>" : "\\bTRLBAR\\b",
   "\\<USECTRLV\\>" : "\\bUSECTRLV\\b",
+  "\\<USERCMD\\>" : "\\bUSERCMD\\b",
   "\\<\\(XFILE\\|FILES\\|FILE1\\)\\>" : "\\b(XFILE|FILES|FILE1)\\b",
   "\\S" : "\\S",
   "\\a" : "[A-Za-z]",

js/vimlparser.js

@@ -35,6 +35,7 @@ var pat_vim2js = {
   "\\<NOTRLCOM\\>" : "\\bNOTRLCOM\\b",
   "\\<TRLBAR\\>" : "\\bTRLBAR\\b",
   "\\<USECTRLV\\>" : "\\bUSECTRLV\\b",
+  "\\<USERCMD\\>" : "\\bUSERCMD\\b",
   "\\<\\(XFILE\\|FILES\\|FILE1\\)\\>" : "\\b(XFILE|FILES|FILE1)\\b",
   "\\S" : "\\S",
   "\\a" : "[A-Za-z]",
@@ -969,7 +970,7 @@ VimLParser.prototype.parse_command = function() {
     else {
         this.ea.forceit = FALSE;
     }
-    if (!viml_eqregh(this.ea.cmd.flags, "\\<BANG\\>") && this.ea.forceit && !viml_eqregh(this.ea.cmd.flags, "USERCMD")) {
+    if (!viml_eqregh(this.ea.cmd.flags, "\\<BANG\\>") && this.ea.forceit && !viml_eqregh(this.ea.cmd.flags, "\\<USERCMD\\>")) {
         throw Err("E477: No ! allowed", this.ea.cmdpos);
     }
     if (this.ea.cmd.name != "!") {

py/vimlfunc.py

@@ -31,6 +31,7 @@ class AttributeDict(dict):
   "\\<NOTRLCOM\\>" : "\\bNOTRLCOM\\b",
   "\\<TRLBAR\\>" : "\\bTRLBAR\\b",
   "\\<USECTRLV\\>" : "\\bUSECTRLV\\b",
+  "\\<USERCMD\\>" : "\\bUSERCMD\\b",
   "\\<\\(XFILE\\|FILES\\|FILE1\\)\\>" : "\\b(XFILE|FILES|FILE1)\\b",
   "\\S" : "\\S",
   "\\a" : "[A-Za-z]",

py/vimlparser.py

@@ -31,6 +31,7 @@ class AttributeDict(dict):
   "\\<NOTRLCOM\\>" : "\\bNOTRLCOM\\b",
   "\\<TRLBAR\\>" : "\\bTRLBAR\\b",
   "\\<USECTRLV\\>" : "\\bUSECTRLV\\b",
+  "\\<USERCMD\\>" : "\\bUSERCMD\\b",
   "\\<\\(XFILE\\|FILES\\|FILE1\\)\\>" : "\\b(XFILE|FILES|FILE1)\\b",
   "\\S" : "\\S",
   "\\a" : "[A-Za-z]",
@@ -805,7 +806,7 @@ def parse_command(self):
             self.ea.forceit = TRUE
         else:
             self.ea.forceit = FALSE
-        if not viml_eqregh(self.ea.cmd.flags, "\\<BANG\\>") and self.ea.forceit and not viml_eqregh(self.ea.cmd.flags, "USERCMD"):
+        if not viml_eqregh(self.ea.cmd.flags, "\\<BANG\\>") and self.ea.forceit and not viml_eqregh(self.ea.cmd.flags, "\\<USERCMD\\>"):
             raise VimLParserException(Err("E477: No ! allowed", self.ea.cmdpos))
         if self.ea.cmd.name != "!":
             self.reader.skip_white()