Merge pull request #19 from RianFuro/master

Added neovim support.

Author: ynkdir

autoload/vimlparser.vim

@@ -11,11 +11,16 @@ endfunction
 " @brief Read input as VimScript and return stringified AST.
 " @param input Input filename or string of VimScript.
 " @return Stringified AST.
-function! vimlparser#test(input)
+function! vimlparser#test(input, ...)
   try
+    if a:0 > 0
+      let l:neovim = a:1
+    else
+      let l:neovim = 0
+    endif
     let i = type(a:input) == 1 && filereadable(a:input) ? readfile(a:input) : a:input
     let r = s:StringReader.new(i)
-    let p = s:VimLParser.new()
+    let p = s:VimLParser.new(l:neovim)
     let c = s:Compiler.new()
     echo join(c.compile(p.parse(r)), "\n")
   catch
@@ -409,7 +414,13 @@ function! s:VimLParser.new(...)
   return obj
 endfunction
 
-function! s:VimLParser.__init__()
+function! s:VimLParser.__init__(...)
+  if len(a:000) > 0
+    let self.neovim = a:000[0]
+  else
+    let self.neovim = 0
+  endif
+
   let self.find_command_cache = {}
 endfunction
 
@@ -823,6 +834,24 @@ function! s:VimLParser.find_command()
     endif
   endfor
 
+  if self.neovim  
+    for x in self.neovim_additional_commands
+      if stridx(x.name, name) == 0 && len(name) >= x.minlen
+        unlet cmd
+        let cmd = x
+        break
+      endif
+    endfor
+
+    for x in self.neovim_removed_commands
+      if stridx(x.name, name) == 0 && len(name) >= x.minlen
+        unlet cmd
+        let cmd = s:NIL
+        break
+      endif
+    endfor
+  endif
+  
   " FIXME: user defined command
   if (cmd is s:NIL || cmd.name ==# 'Print') && name =~# '^[A-Z]'
     let name .= self.reader.read_alnum()
@@ -1789,6 +1818,18 @@ function! s:VimLParser.parse_wincmd()
   call self.add_node(node)
 endfunction
 
+let s:VimLParser.neovim_additional_commands = [
+      \ {'name': 'tnoremap', 'minlen': 8, 'flags': 'EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN', 'parser': 'parse_cmd_common'}]
+
+let s:VimLParser.neovim_removed_commands = [
+      \ {"name":"Print", "minlen":1, "flags":"RANGE|WHOLEFOLD|COUNT|EXFLAGS|TRLBAR|CMDWIN", "parser":"parse_cmd_common"},
+      \ {"name":"fixdel", "minlen":3, "flags":"TRLBAR|CMDWIN", "parser":"parse_cmd_common"},
+      \ {"name":"helpfind", "minlen":5, "flags":"EXTRA|NOTRLCOM", "parser":"parse_cmd_common"},
+      \ {"name":"open", "minlen":1, "flags":"RANGE|BANG|EXTRA", "parser":"parse_cmd_common"},
+      \ {"name":"shell", "minlen":2, "flags":"TRLBAR|CMDWIN", "parser":"parse_cmd_common"},
+      \ {"name":"tearoff", "minlen":2, "flags":"NEEDARG|EXTRA|TRLBAR|NOTRLCOM|CMDWIN", "parser":"parse_cmd_common"},
+      \ {"name":"gvim", "minlen":2, "flags":"BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN", "parser":"parse_cmd_common"}]
+
 let s:VimLParser.builtin_commands = [
       \ {'name': 'append', 'minlen': 1, 'flags': 'BANG|RANGE|ZEROR|TRLBAR|CMDWIN|MODIFY', 'parser': 'parse_cmd_append'},
       \ {'name': 'abbreviate', 'minlen': 2, 'flags': 'EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN', 'parser': 'parse_cmd_common'},

js/vimlfunc.js

@@ -1,12 +1,24 @@
 //!/usr/bin/env nodejs
-// usage: nodejs vimlparser.js foo.vim
+// usage: nodejs vimlparser.js [--neovim] foo.vim
 
 var fs = require('fs');
 var util = require('util');
 
 function main() {
-    var r = new StringReader(viml_readfile(process.argv[2]));
-    var p = new VimLParser();
+    var neovim = false;
+    var fpath = ''
+    var args = process.argv;
+    if (args.length == 4) {
+        if (args[2] == '--neovim') {
+            neovim = true;
+        }
+        fpath = args[3];
+    } else if (args.length == 3) {
+        neovim = false;
+        fpath = args[2]
+    }
+    var r = new StringReader(viml_readfile(fpath));
+    var p = new VimLParser(neovim);
     var c = new Compiler();
     var lines = c.compile(p.parse(r))
     for (var i in lines) {

js/vimlparser.js

@@ -1,13 +1,15 @@
 #!/usr/bin/env python3
-# usage: python3 vimlparser.py foo.vim
+# usage: python3 vimlparser.py [--neovim] foo.vim
 
 import sys
 import re
 import inspect
 
 def main():
-    r = StringReader(viml_readfile(sys.argv[1]))
-    p = VimLParser()
+    use_neovim = sys.argv[1] == '--neovim'
+     
+    r = StringReader(viml_readfile(sys.argv[-1]))
+    p = VimLParser(use_neovim)
     c = Compiler()
     for line in c.compile(p.parse(r)):
         print(line)

py/vimlfunc.py

@@ -10,7 +10,12 @@ function! s:run()
     let outfile = fnamemodify(vimfile, ':r') . '.out'
     let src = readfile(vimfile)
     let r = s:vimlparser.StringReader.new(src)
-    let p = s:vimlparser.VimLParser.new()
+    if vimfile =~# 'test_neo'
+        let l:neovim = 1
+    else
+        let l:neovim = 0
+    endif
+    let p = s:vimlparser.VimLParser.new(l:neovim)
     let c = s:vimlparser.Compiler.new()
     try
       let out = c.compile(p.parse(r))

py/vimlparser.py

@@ -0,0 +1 @@
+vimlparser: E492: Not an editor command: helpfind: line 1 col 1

test/run.sh

@@ -0,0 +1 @@
+helpfind

test/run.vim

@@ -0,0 +1 @@
+(excmd "tnoremap <Esc> <C-\\><C-N>")