Merge pull request #62 from vim-jp/scriptish

scriptish

Author: mattn

Makefile

@@ -1,13 +1,12 @@
-VIM_COMPILER:=vim -N --cmd 'set rtp+=.' -c q -u
 COMPILED_FILES:=js/vimlparser.js py/vimlparser.py
 
 all: $(COMPILED_FILES)
 
 js/vimlparser.js: autoload/vimlparser.vim js/jscompiler.vim js/vimlfunc.js
-	$(VIM_COMPILER) js/jscompiler.vim
+	scripts/jscompile.sh $< $@
 
 py/vimlparser.py: autoload/vimlparser.vim py/pycompiler.vim py/vimlfunc.py
-	$(VIM_COMPILER) py/pycompiler.vim
+	scripts/pycompile.sh $< $@
 
 clean_compiled:
 	$(RM) $(COMPILED_FILES)

js/jscompiler.vim

@@ -841,13 +841,12 @@ endfunction
 
 let s:viml_builtin_functions = ['abs', 'acos', 'add', 'and', 'append', 'append', 'argc', 'argidx', 'argv', 'argv', 'asin', 'atan', 'atan2', 'browse', 'browsedir', 'bufexists', 'buflisted', 'bufloaded', 'bufname', 'bufnr', 'bufwinnr', 'byte2line', 'byteidx', 'call', 'ceil', 'changenr', 'char2nr', 'cindent', 'clearmatches', 'col', 'complete', 'complete_add', 'complete_check', 'confirm', 'copy', 'cos', 'cosh', 'count', 'cscope_connection', 'cursor', 'cursor', 'deepcopy', 'delete', 'did_filetype', 'diff_filler', 'diff_hlID', 'empty', 'escape', 'eval', 'eventhandler', 'executable', 'exists', 'extend', 'exp', 'expand', 'feedkeys', 'filereadable', 'filewritable', 'filter', 'finddir', 'findfile', 'float2nr', 'floor', 'fmod', 'fnameescape', 'fnamemodify', 'foldclosed', 'foldclosedend', 'foldlevel', 'foldtext', 'foldtextresult', 'foreground', 'function', 'garbagecollect', 'get', 'get', 'getbufline', 'getbufvar', 'getchar', 'getcharmod', 'getcmdline', 'getcmdpos', 'getcmdtype', 'getcwd', 'getfperm', 'getfsize', 'getfontname', 'getftime', 'getftype', 'getline', 'getline', 'getloclist', 'getmatches', 'getpid', 'getpos', 'getqflist', 'getreg', 'getregtype', 'gettabvar', 'gettabwinvar', 'getwinposx', 'getwinposy', 'getwinvar', 'glob', 'globpath', 'has', 'has_key', 'haslocaldir', 'hasmapto', 'histadd', 'histdel', 'histget', 'histnr', 'hlexists', 'hlID', 'hostname', 'iconv', 'indent', 'index', 'input', 'inputdialog', 'inputlist', 'inputrestore', 'inputsave', 'inputsecret', 'insert', 'invert', 'isdirectory', 'islocked', 'items', 'join', 'keys', 'len', 'libcall', 'libcallnr', 'line', 'line2byte', 'lispindent', 'localtime', 'log', 'log10', 'luaeval', 'map', 'maparg', 'mapcheck', 'match', 'matchadd', 'matcharg', 'matchdelete', 'matchend', 'matchlist', 'matchstr', 'max', 'min', 'mkdir', 'mode', 'mzeval', 'nextnonblank', 'nr2char', 'or', 'pathshorten', 'pow', 'prevnonblank', 'printf', 'pumvisible', 'pyeval', 'py3eval', 'range', 'readfile', 'reltime', 'reltimestr', 'remote_expr', 'remote_foreground', 'remote_peek', 'remote_read', 'remote_send', 'remove', 'remove', 'rename', 'repeat', 'resolve', 'reverse', 'round', 'screencol', 'screenrow', 'search', 'searchdecl', 'searchpair', 'searchpairpos', 'searchpos', 'server2client', 'serverlist', 'setbufvar', 'setcmdpos', 'setline', 'setloclist', 'setmatches', 'setpos', 'setqflist', 'setreg', 'settabvar', 'settabwinvar', 'setwinvar', 'sha256', 'shellescape', 'shiftwidth', 'simplify', 'sin', 'sinh', 'sort', 'soundfold', 'spellbadword', 'spellsuggest', 'split', 'sqrt', 'str2float', 'str2nr', 'strchars', 'strdisplaywidth', 'strftime', 'stridx', 'string', 'strlen', 'strpart', 'strridx', 'strtrans', 'strwidth', 'submatch', 'substitute', 'synID', 'synIDattr', 'synIDtrans', 'synconcealed', 'synstack', 'system', 'tabpagebuflist', 'tabpagenr', 'tabpagewinnr', 'taglist', 'tagfiles', 'tempname', 'tan', 'tanh', 'tolower', 'toupper', 'tr', 'trunc', 'type', 'undofile', 'undotree', 'values', 'virtcol', 'visualmode', 'wildmenumode', 'winbufnr', 'wincol', 'winheight', 'winline', 'winnr', 'winrestcmd', 'winrestview', 'winsaveview', 'winwidth', 'writefile', 'xor']
 
-function! s:test()
-  let vimfile = 'autoload/vimlparser.vim'
-  let jsfile = 'js/vimlparser.js'
-  let vimlfunc = 'js/vimlfunc.js'
+let s:script_dir = expand('<sfile>:h')
+function! s:convert(in, out) abort
+  let vimlfunc = fnamemodify(s:script_dir . '/vimlfunc.js', ':p')
   let head = readfile(vimlfunc)
   try
-    let r = s:StringReader.new(readfile(vimfile))
+    let r = s:StringReader.new(readfile(a:in))
     let p = s:VimLParser.new()
     let c = s:JavascriptCompiler.new()
     let lines = c.compile(p.parse(r))
@@ -864,9 +863,9 @@ function! s:test()
       \   '  };',
       \   '}',
       \ ]
-    call writefile(head + lines + tail, jsfile)
+    call writefile(head + lines + tail, a:out)
   catch
-    echoerr substitute(v:throwpoint, '\.\.\zs\d\+', '\=s:numtoname(submatch(0))', 'g') . "\n" . v:exception
+    throw substitute(v:throwpoint, '\.\.\zs\d\+', '\=s:numtoname(submatch(0))', 'g') . "\n" . v:exception
   endtry
 endfunction
 
@@ -884,4 +883,30 @@ function! s:numtoname(num)
   return a:num
 endfunction
 
-call s:test()
+function! s:parse_args() abort
+  let v = [
+  \  fnamemodify(s:script_dir . '/../autoload/vimlparser.vim', ':p'),
+  \  fnamemodify(s:script_dir . '/vimlparser.js', ':p')
+  \]
+  let args = argv()[1:]
+  %argdel
+  if len(args) != 0
+    if len(args) != 2
+      throw 'invalid argument: ' . string(args)
+    endif
+	let v = args
+  endif
+  return v
+endfunction:
+
+function! s:main() abort
+  try
+    let args = s:parse_args()
+    call s:convert(args[0], args[1])
+  catch
+    call writefile([v:exception], has('win32') ? 'conout$' : '/dev/stderr')
+    cquit
+  endtry
+endfunction
+
+call s:main()

py/pycompiler.vim

@@ -821,13 +821,12 @@ endfunction
 
 let s:viml_builtin_functions = ['abs', 'acos', 'add', 'and', 'append', 'append', 'argc', 'argidx', 'argv', 'argv', 'asin', 'atan', 'atan2', 'browse', 'browsedir', 'bufexists', 'buflisted', 'bufloaded', 'bufname', 'bufnr', 'bufwinnr', 'byte2line', 'byteidx', 'call', 'ceil', 'changenr', 'char2nr', 'cindent', 'clearmatches', 'col', 'complete', 'complete_add', 'complete_check', 'confirm', 'copy', 'cos', 'cosh', 'count', 'cscope_connection', 'cursor', 'cursor', 'deepcopy', 'delete', 'did_filetype', 'diff_filler', 'diff_hlID', 'empty', 'escape', 'eval', 'eventhandler', 'executable', 'exists', 'extend', 'exp', 'expand', 'feedkeys', 'filereadable', 'filewritable', 'filter', 'finddir', 'findfile', 'float2nr', 'floor', 'fmod', 'fnameescape', 'fnamemodify', 'foldclosed', 'foldclosedend', 'foldlevel', 'foldtext', 'foldtextresult', 'foreground', 'function', 'garbagecollect', 'get', 'get', 'getbufline', 'getbufvar', 'getchar', 'getcharmod', 'getcmdline', 'getcmdpos', 'getcmdtype', 'getcwd', 'getfperm', 'getfsize', 'getfontname', 'getftime', 'getftype', 'getline', 'getline', 'getloclist', 'getmatches', 'getpid', 'getpos', 'getqflist', 'getreg', 'getregtype', 'gettabvar', 'gettabwinvar', 'getwinposx', 'getwinposy', 'getwinvar', 'glob', 'globpath', 'has', 'has_key', 'haslocaldir', 'hasmapto', 'histadd', 'histdel', 'histget', 'histnr', 'hlexists', 'hlID', 'hostname', 'iconv', 'indent', 'index', 'input', 'inputdialog', 'inputlist', 'inputrestore', 'inputsave', 'inputsecret', 'insert', 'invert', 'isdirectory', 'islocked', 'items', 'join', 'keys', 'len', 'libcall', 'libcallnr', 'line', 'line2byte', 'lispindent', 'localtime', 'log', 'log10', 'luaeval', 'map', 'maparg', 'mapcheck', 'match', 'matchadd', 'matcharg', 'matchdelete', 'matchend', 'matchlist', 'matchstr', 'max', 'min', 'mkdir', 'mode', 'mzeval', 'nextnonblank', 'nr2char', 'or', 'pathshorten', 'pow', 'prevnonblank', 'printf', 'pumvisible', 'pyeval', 'py3eval', 'range', 'readfile', 'reltime', 'reltimestr', 'remote_expr', 'remote_foreground', 'remote_peek', 'remote_read', 'remote_send', 'remove', 'remove', 'rename', 'repeat', 'resolve', 'reverse', 'round', 'screencol', 'screenrow', 'search', 'searchdecl', 'searchpair', 'searchpairpos', 'searchpos', 'server2client', 'serverlist', 'setbufvar', 'setcmdpos', 'setline', 'setloclist', 'setmatches', 'setpos', 'setqflist', 'setreg', 'settabvar', 'settabwinvar', 'setwinvar', 'sha256', 'shellescape', 'shiftwidth', 'simplify', 'sin', 'sinh', 'sort', 'soundfold', 'spellbadword', 'spellsuggest', 'split', 'sqrt', 'str2float', 'str2nr', 'strchars', 'strdisplaywidth', 'strftime', 'stridx', 'string', 'strlen', 'strpart', 'strridx', 'strtrans', 'strwidth', 'submatch', 'substitute', 'synID', 'synIDattr', 'synIDtrans', 'synconcealed', 'synstack', 'system', 'tabpagebuflist', 'tabpagenr', 'tabpagewinnr', 'taglist', 'tagfiles', 'tempname', 'tan', 'tanh', 'tolower', 'toupper', 'tr', 'trunc', 'type', 'undofile', 'undotree', 'values', 'virtcol', 'visualmode', 'wildmenumode', 'winbufnr', 'wincol', 'winheight', 'winline', 'winnr', 'winrestcmd', 'winrestview', 'winsaveview', 'winwidth', 'writefile', 'xor']
 
-function! s:test()
-  let vimfile = 'autoload/vimlparser.vim'
-  let pyfile = 'py/vimlparser.py'
-  let vimlfunc = 'py/vimlfunc.py'
+let s:script_dir = expand('<sfile>:h')
+function! s:convert(in, out)
+  let vimlfunc = fnamemodify(s:script_dir . '/vimlfunc.py', ':p')
   let head = readfile(vimlfunc)
   try
-    let r = s:StringReader.new(readfile(vimfile))
+    let r = s:StringReader.new(readfile(a:in))
     let p = s:VimLParser.new()
     let c = s:PythonCompiler.new()
     let lines = c.compile(p.parse(r))
@@ -836,7 +835,7 @@ function! s:test()
     \   'if __name__ == ''__main__'':',
     \   '    main()',
     \ ]
-    call writefile(head + lines + tail, pyfile)
+    call writefile(head + lines + tail, a:out)
   catch
     echoerr substitute(v:throwpoint, '\.\.\zs\d\+', '\=s:numtoname(submatch(0))', 'g') . "\n" . v:exception
   endtry
@@ -856,4 +855,30 @@ function! s:numtoname(num)
   return a:num
 endfunction
 
-call s:test()
+function! s:parse_args() abort
+  let v = [
+  \  fnamemodify(s:script_dir . '/../autoload/vimlparser.vim', ':p'),
+  \  fnamemodify(s:script_dir . '/vimlparser.py', ':p')
+  \]
+  let args = argv()[1:]
+  %argdel
+  if len(args) != 0
+    if len(args) != 2
+      throw 'invalid argument: ' . string(args)
+    endif
+	let v = args
+  endif
+  return v
+endfunction:
+
+function! s:main() abort
+  try
+    let args = s:parse_args()
+    call s:convert(args[0], args[1])
+  catch
+    call writefile([v:exception], has('win32') ? 'conout$' : '/dev/stderr')
+    cquit
+  endtry
+endfunction
+
+call s:main()

scripts/jscompile.bat

@@ -0,0 +1,2 @@
+@echo off
+vim -E -s -N --cmd "set rtp+=." -c "exe 'so' argv()[0]" -c q -- js/jscompiler.vim %*

scripts/jscompile.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+vim -E -s -N --cmd 'set rtp+=.' -c 'exe "so" argv()[0]' -c q -- js/jscompiler.vim $*

scripts/pycompile.bat

@@ -0,0 +1,2 @@
+@echo off
+vim -E -s -N --cmd "set rtp+=." -c "exe 'so' argv()[0]" -c q -- py/pycompiler.vim %*

scripts/pycompile.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+vim -E -s -N --cmd 'set rtp+=.' -c 'exe "so" argv()[0]' -c q -- py/pycompiler.vim $*