From 3dc8498fd2c6bdfd93a46811203f545970bda065 Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Fri, 24 Nov 2017 12:38:13 +0000
Subject: [PATCH 01/13] git mv autoload/vimlparser.vim
autoload/vital/__vimlparser__/VimlParser.vim
---
autoload/{vimlparser.vim => vital/__vimlparser__/VimlParser.vim} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename autoload/{vimlparser.vim => vital/__vimlparser__/VimlParser.vim} (100%)
diff --git a/autoload/vimlparser.vim b/autoload/vital/__vimlparser__/VimlParser.vim
similarity index 100%
rename from autoload/vimlparser.vim
rename to autoload/vital/__vimlparser__/VimlParser.vim
From cd27075b7b4eebc6ec8d3efc28207baf57b4f919 Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Fri, 24 Nov 2017 12:41:48 +0000
Subject: [PATCH 02/13] make VimlParser vital module
---
autoload/vimlparser.vim | 26 ++
autoload/vital.vim | 12 +
autoload/vital/__vimlparser__/VimlParser.vim | 22 +-
autoload/vital/_vimlparser.vim | 9 +
autoload/vital/vimlparser.vim | 328 +++++++++++++++++++
autoload/vital/vimlparser.vital | 3 +
6 files changed, 379 insertions(+), 21 deletions(-)
create mode 100644 autoload/vimlparser.vim
create mode 100644 autoload/vital.vim
create mode 100644 autoload/vital/_vimlparser.vim
create mode 100644 autoload/vital/vimlparser.vim
create mode 100644 autoload/vital/vimlparser.vital
diff --git a/autoload/vimlparser.vim b/autoload/vimlparser.vim
new file mode 100644
index 00000000..315b5725
--- /dev/null
+++ b/autoload/vimlparser.vim
@@ -0,0 +1,26 @@
+let s:VimLParser = vital#vimlparser#import('VimlParser')
+
+function! vimlparser#import()
+ return s:VimLParser.import()
+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, ...)
+ 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) : split(a:input, "\n")
+ let r = s:StringReader.new(i)
+ let p = s:VimLParser.new(l:neovim)
+ let c = s:Compiler.new()
+ echo join(c.compile(p.parse(r)), "\n")
+ catch
+ echoerr substitute(v:throwpoint, '\.\.\zs\d\+', '\=s:numtoname(submatch(0))', 'g') . "\n" . v:exception
+ endtry
+endfunction
+
diff --git a/autoload/vital.vim b/autoload/vital.vim
new file mode 100644
index 00000000..f1ba849a
--- /dev/null
+++ b/autoload/vital.vim
@@ -0,0 +1,12 @@
+function! vital#of(name) abort
+ let files = globpath(&runtimepath, 'autoload/vital/' . a:name . '.vital', 1)
+ let file = split(files, "\n")
+ if empty(file)
+ throw 'vital: version file not found: ' . a:name
+ endif
+ let ver = readfile(file[0], 'b')
+ if empty(ver)
+ throw 'vital: invalid version file: ' . a:name
+ endif
+ return vital#_{substitute(ver[0], '\W', '', 'g')}#new()
+endfunction
diff --git a/autoload/vital/__vimlparser__/VimlParser.vim b/autoload/vital/__vimlparser__/VimlParser.vim
index 40a633bb..277f8325 100644
--- a/autoload/vital/__vimlparser__/VimlParser.vim
+++ b/autoload/vital/__vimlparser__/VimlParser.vim
@@ -4,30 +4,10 @@
"
" License: This file is placed in the public domain.
-function! vimlparser#import()
+function! s:import() abort
return s:
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, ...)
- 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) : split(a:input, "\n")
- let r = s:StringReader.new(i)
- let p = s:VimLParser.new(l:neovim)
- let c = s:Compiler.new()
- echo join(c.compile(p.parse(r)), "\n")
- catch
- echoerr substitute(v:throwpoint, '\.\.\zs\d\+', '\=s:numtoname(submatch(0))', 'g') . "\n" . v:exception
- endtry
-endfunction
-
function! s:numtoname(num)
let sig = printf("function('%s')", a:num)
for k in keys(s:)
diff --git a/autoload/vital/_vimlparser.vim b/autoload/vital/_vimlparser.vim
new file mode 100644
index 00000000..55104952
--- /dev/null
+++ b/autoload/vital/_vimlparser.vim
@@ -0,0 +1,9 @@
+let s:_plugin_name = expand('<sfile>:t:r')
+
+function! vital#{s:_plugin_name}#new() abort
+ return vital#{s:_plugin_name[1:]}#new()
+endfunction
+
+function! vital#{s:_plugin_name}#function(funcname) abort
+ silent! return function(a:funcname)
+endfunction
diff --git a/autoload/vital/vimlparser.vim b/autoload/vital/vimlparser.vim
new file mode 100644
index 00000000..b622a97e
--- /dev/null
+++ b/autoload/vital/vimlparser.vim
@@ -0,0 +1,328 @@
+let s:plugin_name = expand('<sfile>:t:r')
+let s:vital_base_dir = expand('<sfile>:h')
+let s:project_root = expand('<sfile>:h:h:h')
+let s:is_vital_vim = s:plugin_name is# 'vital'
+
+let s:loaded = {}
+let s:cache_sid = {}
+
+" function() wrapper
+if v:version > 703 || v:version == 703 && has('patch1170')
+ function! s:_function(fstr) abort
+ return function(a:fstr)
+ endfunction
+else
+ function! s:_SID() abort
+ return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+ endfunction
+ let s:_s = '<SNR>' . s:_SID() . '_'
+ function! s:_function(fstr) abort
+ return function(substitute(a:fstr, 's:', s:_s, 'g'))
+ endfunction
+endif
+
+function! vital#{s:plugin_name}#new() abort
+ return s:new(s:plugin_name)
+endfunction
+
+function! vital#{s:plugin_name}#import(...) abort
+ if !exists('s:V')
+ let s:V = s:new(s:plugin_name)
+ endif
+ return call(s:V.import, a:000, s:V)
+endfunction
+
+let s:Vital = {}
+
+function! s:new(plugin_name) abort
+ let base = deepcopy(s:Vital)
+ let base._plugin_name = a:plugin_name
+ return base
+endfunction
+
+function! s:vital_files() abort
+ if !exists('s:vital_files')
+ let s:vital_files = map(
+ \ s:is_vital_vim ? s:_global_vital_files() : s:_self_vital_files(),
+ \ 'fnamemodify(v:val, ":p:gs?[\\\\/]?/?")')
+ endif
+ return copy(s:vital_files)
+endfunction
+let s:Vital.vital_files = s:_function('s:vital_files')
+
+function! s:import(name, ...) abort dict
+ let target = {}
+ let functions = []
+ for a in a:000
+ if type(a) == type({})
+ let target = a
+ elseif type(a) == type([])
+ let functions = a
+ endif
+ unlet a
+ endfor
+ let module = self._import(a:name)
+ if empty(functions)
+ call extend(target, module, 'keep')
+ else
+ for f in functions
+ if has_key(module, f) && !has_key(target, f)
+ let target[f] = module[f]
+ endif
+ endfor
+ endif
+ return target
+endfunction
+let s:Vital.import = s:_function('s:import')
+
+function! s:load(...) abort dict
+ for arg in a:000
+ let [name; as] = type(arg) == type([]) ? arg[: 1] : [arg, arg]
+ let target = split(join(as, ''), '\W\+')
+ let dict = self
+ let dict_type = type({})
+ while !empty(target)
+ let ns = remove(target, 0)
+ if !has_key(dict, ns)
+ let dict[ns] = {}
+ endif
+ if type(dict[ns]) == dict_type
+ let dict = dict[ns]
+ else
+ unlet dict
+ break
+ endif
+ endwhile
+ if exists('dict')
+ call extend(dict, self._import(name))
+ endif
+ unlet arg
+ endfor
+ return self
+endfunction
+let s:Vital.load = s:_function('s:load')
+
+function! s:unload() abort dict
+ let s:loaded = {}
+ let s:cache_sid = {}
+ unlet! s:vital_files
+endfunction
+let s:Vital.unload = s:_function('s:unload')
+
+function! s:exists(name) abort dict
+ if a:name !~# '\v^\u\w*%(\.\u\w*)*$'
+ throw 'vital: Invalid module name: ' . a:name
+ endif
+ return s:_module_path(a:name) isnot# ''
+endfunction
+let s:Vital.exists = s:_function('s:exists')
+
+function! s:search(pattern) abort dict
+ let paths = s:_extract_files(a:pattern, self.vital_files())
+ let modules = sort(map(paths, 's:_file2module(v:val)'))
+ return s:_uniq(modules)
+endfunction
+let s:Vital.search = s:_function('s:search')
+
+function! s:plugin_name() abort dict
+ return self._plugin_name
+endfunction
+let s:Vital.plugin_name = s:_function('s:plugin_name')
+
+function! s:_self_vital_files() abort
+ let builtin = printf('%s/__%s__/', s:vital_base_dir, s:plugin_name)
+ let installed = printf('%s/_%s/', s:vital_base_dir, s:plugin_name)
+ let base = builtin . ',' . installed
+ return split(globpath(base, '**/*.vim', 1), "\n")
+endfunction
+
+function! s:_global_vital_files() abort
+ let pattern = 'autoload/vital/__*__/**/*.vim'
+ return split(globpath(&runtimepath, pattern, 1), "\n")
+endfunction
+
+function! s:_extract_files(pattern, files) abort
+ let tr = {'.': '/', '*': '[^/]*', '**': '.*'}
+ let target = substitute(a:pattern, '\.\|\*\*\?', '\=tr[submatch(0)]', 'g')
+ let regexp = printf('autoload/vital/[^/]\+/%s.vim$', target)
+ return filter(a:files, 'v:val =~# regexp')
+endfunction
+
+function! s:_file2module(file) abort
+ let filename = fnamemodify(a:file, ':p:gs?[\\/]?/?')
+ let tail = matchstr(filename, 'autoload/vital/_\w\+/\zs.*\ze\.vim$')
+ return join(split(tail, '[\\/]\+'), '.')
+endfunction
+
+" @param {string} name e.g. Data.List
+function! s:_import(name) abort dict
+ if has_key(s:loaded, a:name)
+ return copy(s:loaded[a:name])
+ endif
+ let module = self._get_module(a:name)
+ if has_key(module, '_vital_created')
+ call module._vital_created(module)
+ endif
+ let export_module = filter(copy(module), 'v:key =~# "^\\a"')
+ " Cache module before calling module.vital_loaded() to avoid cyclic
+ " dependences but remove the cache if module._vital_loaded() fails.
+ " let s:loaded[a:name] = export_module
+ let s:loaded[a:name] = export_module
+ if has_key(module, '_vital_loaded')
+ try
+ call module._vital_loaded(vital#{s:plugin_name}#new())
+ catch
+ unlet s:loaded[a:name]
+ throw 'vital: fail to call ._vital_loaded(): ' . v:exception
+ endtry
+ endif
+ return copy(s:loaded[a:name])
+endfunction
+let s:Vital._import = s:_function('s:_import')
+
+" s:_get_module() returns module object wihch has all script local functions.
+function! s:_get_module(name) abort dict
+ let funcname = s:_import_func_name(self.plugin_name(), a:name)
+ try
+ return call(funcname, [])
+ catch /^Vim\%((\a\+)\)\?:E117/
+ return s:_get_builtin_module(a:name)
+ endtry
+endfunction
+
+function! s:_get_builtin_module(name) abort
+ return s:sid2sfuncs(s:_module_sid(a:name))
+endfunction
+
+if s:is_vital_vim
+ " For vital.vim, we can use s:_get_builtin_module directly
+ let s:Vital._get_module = s:_function('s:_get_builtin_module')
+else
+ let s:Vital._get_module = s:_function('s:_get_module')
+endif
+
+function! s:_import_func_name(plugin_name, module_name) abort
+ return printf('vital#_%s#%s#import', a:plugin_name, s:_dot_to_sharp(a:module_name))
+endfunction
+
+function! s:_module_sid(name) abort
+ let path = s:_module_path(a:name)
+ if !filereadable(path)
+ throw 'vital: module not found: ' . a:name
+ endif
+ let vital_dir = s:is_vital_vim ? '__\w\+__' : printf('_\{1,2}%s\%%(__\)\?', s:plugin_name)
+ let base = join([vital_dir, ''], '[/\\]\+')
+ let p = base . substitute('' . a:name, '\.', '[/\\\\]\\+', 'g')
+ let sid = s:_sid(path, p)
+ if !sid
+ call s:_source(path)
+ let sid = s:_sid(path, p)
+ if !sid
+ throw printf('vital: cannot get <SID> from path: %s', path)
+ endif
+ endif
+ return sid
+endfunction
+
+function! s:_module_path(name) abort
+ return get(s:_extract_files(a:name, s:vital_files()), 0, '')
+endfunction
+
+function! s:_module_sid_base_dir() abort
+ return s:is_vital_vim ? &rtp : s:project_root
+endfunction
+
+function! s:_dot_to_sharp(name) abort
+ return substitute(a:name, '\.', '#', 'g')
+endfunction
+
+function! s:_source(path) abort
+ execute 'source' fnameescape(a:path)
+endfunction
+
+" @vimlint(EVL102, 1, l:_)
+" @vimlint(EVL102, 1, l:__)
+function! s:_sid(path, filter_pattern) abort
+ let unified_path = s:_unify_path(a:path)
+ if has_key(s:cache_sid, unified_path)
+ return s:cache_sid[unified_path]
+ endif
+ for line in filter(split(s:_execute(':scriptnames'), "\n"), 'v:val =~# a:filter_pattern')
+ let [_, sid, path; __] = matchlist(line, '^\s*\(\d\+\):\s\+\(.\+\)\s*$')
+ if s:_unify_path(path) is# unified_path
+ let s:cache_sid[unified_path] = sid
+ return s:cache_sid[unified_path]
+ endif
+ endfor
+ return 0
+endfunction
+
+" A bug of execute() is fixed in Vim 8.0.0264
+if has('patch-8.0.0264')
+ let s:_execute = function('execute')
+else
+ function! s:_execute(cmd) abort
+ let [save_verbose, save_verbosefile] = [&verbose, &verbosefile]
+ set verbose=0 verbosefile=
+ redir => res
+ silent! execute a:cmd
+ redir END
+ let [&verbose, &verbosefile] = [save_verbose, save_verbosefile]
+ return res
+ endfunction
+endif
+
+if filereadable(expand('<sfile>:r') . '.VIM') " is case-insensitive or not
+ let s:_unify_path_cache = {}
+ " resolve() is slow, so we cache results.
+ " Note: On windows, vim can't expand path names from 8.3 formats.
+ " So if getting full path via <sfile> and $HOME was set as 8.3 format,
+ " vital load duplicated scripts. Below's :~ avoid this issue.
+ function! s:_unify_path(path) abort
+ if has_key(s:_unify_path_cache, a:path)
+ return s:_unify_path_cache[a:path]
+ endif
+ let value = tolower(fnamemodify(resolve(fnamemodify(
+ \ a:path, ':p')), ':~:gs?[\\/]?/?'))
+ let s:_unify_path_cache[a:path] = value
+ return value
+ endfunction
+else
+ function! s:_unify_path(path) abort
+ return resolve(fnamemodify(a:path, ':p:gs?[\\/]?/?'))
+ endfunction
+endif
+
+" copied and modified from Vim.ScriptLocal
+let s:SNR = join(map(range(len("\<SNR>")), '"[\\x" . printf("%0x", char2nr("\<SNR>"[v:val])) . "]"'), '')
+function! s:sid2sfuncs(sid) abort
+ let fs = split(s:_execute(printf(':function /^%s%s_', s:SNR, a:sid)), "\n")
+ let r = {}
+ let pattern = printf('\m^function\s<SNR>%d_\zs\w\{-}\ze(', a:sid)
+ for fname in map(fs, 'matchstr(v:val, pattern)')
+ let r[fname] = function(s:_sfuncname(a:sid, fname))
+ endfor
+ return r
+endfunction
+
+"" Return funcname of script local functions with SID
+function! s:_sfuncname(sid, funcname) abort
+ return printf('<SNR>%s_%s', a:sid, a:funcname)
+endfunction
+
+if exists('*uniq')
+ function! s:_uniq(list) abort
+ return uniq(a:list)
+ endfunction
+else
+ function! s:_uniq(list) abort
+ let i = len(a:list) - 1
+ while 0 < i
+ if a:list[i] ==# a:list[i - 1]
+ call remove(a:list, i)
+ endif
+ let i -= 1
+ endwhile
+ return a:list
+ endfunction
+endif
diff --git a/autoload/vital/vimlparser.vital b/autoload/vital/vimlparser.vital
new file mode 100644
index 00000000..d8f2701e
--- /dev/null
+++ b/autoload/vital/vimlparser.vital
@@ -0,0 +1,3 @@
+vimlparser
+982e0bf3a5c181c0fa9d37bab784412f941f6b80
+
From 01518952ad2244fc0df3cf56bd5b30e98acf90d5 Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Fri, 24 Nov 2017 12:46:49 +0000
Subject: [PATCH 03/13] fix vimlparser#test()
---
autoload/vimlparser.vim | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/autoload/vimlparser.vim b/autoload/vimlparser.vim
index 315b5725..d8aee269 100644
--- a/autoload/vimlparser.vim
+++ b/autoload/vimlparser.vim
@@ -1,5 +1,7 @@
let s:VimLParser = vital#vimlparser#import('VimlParser')
+call extend(s:, s:VimLParser.import())
+
function! vimlparser#import()
return s:VimLParser.import()
endfunction
@@ -23,4 +25,3 @@ function! vimlparser#test(input, ...)
echoerr substitute(v:throwpoint, '\.\.\zs\d\+', '\=s:numtoname(submatch(0))', 'g') . "\n" . v:exception
endtry
endfunction
-
From 64653fba14ce67881535354ca8f9c059e9b42bbc Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Fri, 24 Nov 2017 12:54:54 +0000
Subject: [PATCH 04/13] Add comment for vital module
---
autoload/vimlparser.vim | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/autoload/vimlparser.vim b/autoload/vimlparser.vim
index d8aee269..bd02a8f0 100644
--- a/autoload/vimlparser.vim
+++ b/autoload/vimlparser.vim
@@ -1,7 +1,15 @@
+" The main code was moved to autoload/vital/__vimlparser__/VimlParser.vim to
+" make vim-vimlparser.vim vital-module.
+"
+" See https://github.com/vim-jp/vital.vim for vital module.
+
let s:VimLParser = vital#vimlparser#import('VimlParser')
call extend(s:, s:VimLParser.import())
+" To Vim plugin developer who want to depend on vim-vimlparser:
+" Please use vimlparser as vital-module instead of this autoload function.
+" We do not ensure that future changes are backward compatible.
function! vimlparser#import()
return s:VimLParser.import()
endfunction
From bb0dbdbcce3d37d0d29875ffb0cf2d0cc3a662a2 Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Fri, 24 Nov 2017 13:40:58 +0000
Subject: [PATCH 05/13] fix extend broke s:VimlParser
---
autoload/vimlparser.vim | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/autoload/vimlparser.vim b/autoload/vimlparser.vim
index bd02a8f0..9c0929ad 100644
--- a/autoload/vimlparser.vim
+++ b/autoload/vimlparser.vim
@@ -3,15 +3,13 @@
"
" See https://github.com/vim-jp/vital.vim for vital module.
-let s:VimLParser = vital#vimlparser#import('VimlParser')
-
-call extend(s:, s:VimLParser.import())
+let s:VimLParser = vital#vimlparser#import('VimlParser').import()
" To Vim plugin developer who want to depend on vim-vimlparser:
" Please use vimlparser as vital-module instead of this autoload function.
" We do not ensure that future changes are backward compatible.
function! vimlparser#import()
- return s:VimLParser.import()
+ return s:VimLParser
endfunction
" @brief Read input as VimScript and return stringified AST.
From 02306efc7bb4926539197a91fa396bbc45c85d83 Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Fri, 24 Nov 2017 14:00:25 +0000
Subject: [PATCH 06/13] fix vimlparser path
---
Makefile | 4 ++--
js/jscompiler.vim | 4 ++--
py/pycompiler.vim | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 1676b4d9..7e56a851 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@ COMPILED_FILES:=js/vimlparser.js py/vimlparser.py
all: $(COMPILED_FILES)
-js/vimlparser.js: autoload/vimlparser.vim js/jscompiler.vim js/vimlfunc.js
+js/vimlparser.js: autoload/vital/__vimlparser__/VimlParser.vim js/jscompiler.vim js/vimlfunc.js
scripts/jscompile.sh $< $@
-py/vimlparser.py: autoload/vimlparser.vim py/pycompiler.vim py/vimlfunc.py
+py/vimlparser.py: autoload/vital/__vimlparser__/VimlParser.vim py/pycompiler.vim py/vimlfunc.py
scripts/pycompile.sh $< $@
clean_compiled:
diff --git a/js/jscompiler.vim b/js/jscompiler.vim
index da90892b..29d91a5c 100644
--- a/js/jscompiler.vim
+++ b/js/jscompiler.vim
@@ -885,7 +885,7 @@ endfunction
function! s:parse_args() abort
let v = [
- \ fnamemodify(s:script_dir . '/../autoload/vimlparser.vim', ':p'),
+ \ fnamemodify(s:script_dir . '/../autoload/vital/__vimlparser__/VimlParser.vim', ':p'),
\ fnamemodify(s:script_dir . '/vimlparser.js', ':p')
\]
let args = argv()[1:]
@@ -894,7 +894,7 @@ function! s:parse_args() abort
if len(args) != 2
throw 'invalid argument: ' . string(args)
endif
- let v = args
+ let v = args
endif
return v
endfunction:
diff --git a/py/pycompiler.vim b/py/pycompiler.vim
index 8e387d99..a0e2da9b 100644
--- a/py/pycompiler.vim
+++ b/py/pycompiler.vim
@@ -857,7 +857,7 @@ endfunction
function! s:parse_args() abort
let v = [
- \ fnamemodify(s:script_dir . '/../autoload/vimlparser.vim', ':p'),
+ \ fnamemodify(s:script_dir . '/../autoload/vital/__vimlparser__/VimlParser.vim', ':p'),
\ fnamemodify(s:script_dir . '/vimlparser.py', ':p')
\]
let args = argv()[1:]
@@ -866,7 +866,7 @@ function! s:parse_args() abort
if len(args) != 2
throw 'invalid argument: ' . string(args)
endif
- let v = args
+ let v = args
endif
return v
endfunction:
From 1bab11e0b1ad108245dd9fc6ff9b41db7f8d6ede Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Fri, 24 Nov 2017 14:28:01 +0000
Subject: [PATCH 07/13] fix s:numtoname
---
autoload/vimlparser.vim | 33 ++++++++++++++++++--
autoload/vital/__vimlparser__/VimlParser.vim | 14 ---------
2 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/autoload/vimlparser.vim b/autoload/vimlparser.vim
index 9c0929ad..c5035dcb 100644
--- a/autoload/vimlparser.vim
+++ b/autoload/vimlparser.vim
@@ -3,13 +3,13 @@
"
" See https://github.com/vim-jp/vital.vim for vital module.
-let s:VimLParser = vital#vimlparser#import('VimlParser').import()
+call extend(s:, vital#vimlparser#import('VimlParser').import())
" To Vim plugin developer who want to depend on vim-vimlparser:
" Please use vimlparser as vital-module instead of this autoload function.
" We do not ensure that future changes are backward compatible.
function! vimlparser#import()
- return s:VimLParser
+ return s:
endfunction
" @brief Read input as VimScript and return stringified AST.
@@ -31,3 +31,32 @@ function! vimlparser#test(input, ...)
echoerr substitute(v:throwpoint, '\.\.\zs\d\+', '\=s:numtoname(submatch(0))', 'g') . "\n" . v:exception
endtry
endfunction
+
+if has('patch-7.4.1842')
+ function! s:numtoname(num)
+ for k in keys(s:)
+ if type(s:[k]) == type({})
+ for name in keys(s:[k])
+ if type(s:[k][name]) == type(function('tr')) && get(s:[k][name], 'name') == a:num
+ return printf('%s.%s', k, name)
+ endif
+ endfor
+ endif
+ endfor
+ return a:num
+ endfunction
+else
+ function! s:numtoname(num)
+ let sig = printf("function('%s')", a:num)
+ for k in keys(s:)
+ if type(s:[k]) == type({})
+ for name in keys(s:[k])
+ if type(s:[k][name]) == type(function('tr')) && string(s:[k][name]) == sig
+ return printf('%s.%s', k, name)
+ endif
+ endfor
+ endif
+ endfor
+ return a:num
+ endfunction
+endif
diff --git a/autoload/vital/__vimlparser__/VimlParser.vim b/autoload/vital/__vimlparser__/VimlParser.vim
index 277f8325..a3429d81 100644
--- a/autoload/vital/__vimlparser__/VimlParser.vim
+++ b/autoload/vital/__vimlparser__/VimlParser.vim
@@ -8,20 +8,6 @@ function! s:import() abort
return s:
endfunction
-function! s:numtoname(num)
- let sig = printf("function('%s')", a:num)
- for k in keys(s:)
- if type(s:[k]) == type({})
- for name in keys(s:[k])
- if type(s:[k][name]) == type(function('tr')) && string(s:[k][name]) == sig
- return printf('%s.%s', k, name)
- endif
- endfor
- endif
- endfor
- return a:num
-endfunction
-
let s:NIL = []
let s:TRUE = 1
let s:FALSE = 0
From ff7fecb8493987f6dbccb46b8ace45afd3c07ddc Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Fri, 24 Nov 2017 14:38:11 +0000
Subject: [PATCH 08/13] make
---
js/vimlparser.js | 72 ++++++++++++++++++++++++------------------------
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/js/vimlparser.js b/js/vimlparser.js
index 58a4e15e..9b6b6410 100644
--- a/js/vimlparser.js
+++ b/js/vimlparser.js
@@ -620,9 +620,9 @@ VimLParser.prototype.pop_context = function() {
VimLParser.prototype.find_context = function(type) {
var i = 0;
- var __c3 = this.context;
- for (var __i3 = 0; __i3 < __c3.length; ++__i3) {
- var node = __c3[__i3];
+ var __c1 = this.context;
+ for (var __i1 = 0; __i1 < __c1.length; ++__i1) {
+ var node = __c1[__i1];
if (node.type == type) {
return i;
}
@@ -1200,9 +1200,9 @@ VimLParser.prototype.find_command = function() {
return this.find_command_cache[name];
}
var cmd = NIL;
- var __c4 = this.builtin_commands;
- for (var __i4 = 0; __i4 < __c4.length; ++__i4) {
- var x = __c4[__i4];
+ var __c2 = this.builtin_commands;
+ for (var __i2 = 0; __i2 < __c2.length; ++__i2) {
+ var x = __c2[__i2];
if (viml_stridx(x.name, name) == 0 && viml_len(name) >= x.minlen) {
delete cmd;
var cmd = x;
@@ -1210,18 +1210,18 @@ VimLParser.prototype.find_command = function() {
}
}
if (this.neovim) {
- var __c5 = this.neovim_additional_commands;
- for (var __i5 = 0; __i5 < __c5.length; ++__i5) {
- var x = __c5[__i5];
+ var __c3 = this.neovim_additional_commands;
+ for (var __i3 = 0; __i3 < __c3.length; ++__i3) {
+ var x = __c3[__i3];
if (viml_stridx(x.name, name) == 0 && viml_len(name) >= x.minlen) {
delete cmd;
var cmd = x;
break;
}
}
- var __c6 = this.neovim_removed_commands;
- for (var __i6 = 0; __i6 < __c6.length; ++__i6) {
- var x = __c6[__i6];
+ var __c4 = this.neovim_removed_commands;
+ for (var __i4 = 0; __i4 < __c4.length; ++__i4) {
+ var x = __c4[__i4];
if (viml_stridx(x.name, name) == 0 && viml_len(name) >= x.minlen) {
delete cmd;
var cmd = NIL;
@@ -3666,9 +3666,9 @@ StringReader.prototype.__init__ = function(lines) {
var offset = 0;
while (lnum < viml_len(lines)) {
var col = 0;
- var __c7 = viml_split(lines[lnum], "\\zs");
- for (var __i7 = 0; __i7 < __c7.length; ++__i7) {
- var c = __c7[__i7];
+ var __c5 = viml_split(lines[lnum], "\\zs");
+ for (var __i5 = 0; __i5 < __c5.length; ++__i5) {
+ var c = __c5[__i5];
viml_add(this.buf, c);
viml_add(this.pos, [lnum + 1, col + 1, offset]);
col += viml_len(c);
@@ -3677,9 +3677,9 @@ StringReader.prototype.__init__ = function(lines) {
while (lnum + 1 < viml_len(lines) && viml_eqregh(lines[lnum + 1], "^\\s*\\\\")) {
var skip = TRUE;
var col = 0;
- var __c8 = viml_split(lines[lnum + 1], "\\zs");
- for (var __i8 = 0; __i8 < __c8.length; ++__i8) {
- var c = __c8[__i8];
+ var __c6 = viml_split(lines[lnum + 1], "\\zs");
+ for (var __i6 = 0; __i6 < __c6.length; ++__i6) {
+ var c = __c6[__i6];
if (skip) {
if (c == "\\") {
var skip = FALSE;
@@ -3781,9 +3781,9 @@ StringReader.prototype.readline = function() {
StringReader.prototype.getstr = function(begin, end) {
var r = "";
- var __c9 = viml_range(begin.i, end.i - 1);
- for (var __i9 = 0; __i9 < __c9.length; ++__i9) {
- var i = __c9[__i9];
+ var __c7 = viml_range(begin.i, end.i - 1);
+ for (var __i7 = 0; __i7 < __c7.length; ++__i7) {
+ var i = __c7[__i7];
if (i >= viml_len(this.buf)) {
break;
}
@@ -4211,9 +4211,9 @@ Compiler.prototype.compile = function(node) {
}
Compiler.prototype.compile_body = function(body) {
- var __c10 = body;
- for (var __i10 = 0; __i10 < __c10.length; ++__i10) {
- var node = __c10[__i10];
+ var __c8 = body;
+ for (var __i8 = 0; __i8 < __c8.length; ++__i8) {
+ var node = __c8[__i8];
this.compile(node);
}
}
@@ -4312,9 +4312,9 @@ Compiler.prototype.compile_if = function(node) {
this.incindent(" ");
this.compile_body(node.body);
this.decindent();
- var __c11 = node.elseif;
- for (var __i11 = 0; __i11 < __c11.length; ++__i11) {
- var enode = __c11[__i11];
+ var __c9 = node.elseif;
+ for (var __i9 = 0; __i9 < __c9.length; ++__i9) {
+ var enode = __c9[__i9];
this.out(" elseif %s", this.compile(enode.cond));
this.incindent(" ");
this.compile_body(enode.body);
@@ -4371,9 +4371,9 @@ Compiler.prototype.compile_try = function(node) {
this.out("(try");
this.incindent(" ");
this.compile_body(node.body);
- var __c12 = node.catch;
- for (var __i12 = 0; __i12 < __c12.length; ++__i12) {
- var cnode = __c12[__i12];
+ var __c10 = node.catch;
+ for (var __i10 = 0; __i10 < __c10.length; ++__i10) {
+ var cnode = __c10[__i10];
if (cnode.pattern !== NIL) {
this.decindent();
this.out(" catch /%s/", cnode.pattern);
@@ -5363,9 +5363,9 @@ RegexpParser.prototype.get_token_sq_char_class = function() {
var r = this.reader.read_alpha();
if (this.reader.p(0) == ":" && this.reader.p(1) == "]") {
this.reader.seek_cur(2);
- var __c13 = class_names;
- for (var __i13 = 0; __i13 < __c13.length; ++__i13) {
- var name = __c13[__i13];
+ var __c11 = class_names;
+ for (var __i11 = 0; __i11 < __c11.length; ++__i11) {
+ var name = __c11[__i11];
if (r == name) {
return "[:" + name + ":]";
}
@@ -5498,9 +5498,9 @@ RegexpParser.prototype.getoctchrs = function() {
RegexpParser.prototype.gethexchrs = function(n) {
var r = "";
- var __c14 = viml_range(n);
- for (var __i14 = 0; __i14 < __c14.length; ++__i14) {
- var i = __c14[__i14];
+ var __c12 = viml_range(n);
+ for (var __i12 = 0; __i12 < __c12.length; ++__i12) {
+ var i = __c12[__i12];
var c = this.reader.peek();
if (!isxdigit(c)) {
break;
From b2fb2c94cc8e3bc9ec3fc94d5df0fbc0af543f46 Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Sat, 25 Nov 2017 10:30:53 +0000
Subject: [PATCH 09/13] :visual to make exit code 0
---
js/jscompiler.vim | 9 +++++++++
py/pycompiler.vim | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git a/js/jscompiler.vim b/js/jscompiler.vim
index 29d91a5c..ff805cbc 100644
--- a/js/jscompiler.vim
+++ b/js/jscompiler.vim
@@ -907,6 +907,15 @@ function! s:main() abort
call writefile([v:exception], has('win32') ? 'conout$' : '/dev/stderr')
cquit
endtry
+ if mode(1) ==# 'ce'
+ " This :visual is needed to make exit code 0 for old vim.
+ " Exit code is set to 1, Vim exit from Ex mode after an error
+ " output is performed even if the error is caught by try-catch.
+ "
+ " This problem is fixed at Vim v.8.0.0184.
+ " https://github.com/vim/vim/releases/tag/v8.0.0184
+ visual
+ endif
endfunction
call s:main()
diff --git a/py/pycompiler.vim b/py/pycompiler.vim
index a0e2da9b..0b46761d 100644
--- a/py/pycompiler.vim
+++ b/py/pycompiler.vim
@@ -879,6 +879,15 @@ function! s:main() abort
call writefile([v:exception], has('win32') ? 'conout$' : '/dev/stderr')
cquit
endtry
+ if mode(1) ==# 'ce'
+ " This :visual is needed to make exit code 0 for old vim.
+ " Exit code is set to 1, Vim exit from Ex mode after an error
+ " output is performed even if the error is caught by try-catch.
+ "
+ " This problem is fixed at Vim v.8.0.0184.
+ " https://github.com/vim/vim/releases/tag/v8.0.0184
+ visual
+ endif
endfunction
call s:main()
From d4278fdbbe7567f18b79b18510a490878b7bdebd Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Sat, 25 Nov 2017 10:45:51 +0000
Subject: [PATCH 10/13] profile only main file
---
test/vimrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/vimrc b/test/vimrc
index e98989a5..4604974e 100644
--- a/test/vimrc
+++ b/test/vimrc
@@ -2,5 +2,5 @@ let &rtp .= ',' . getcwd()
if $TEST_PROFILE != ''
execute 'profile' 'start' $TEST_PROFILE
- profile! file ./autoload/*
+ profile! file ./autoload/vital/__vimlparser__/*
endif
From 048634f44c83a92508181907e06a564c8eaa7691 Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Sat, 25 Nov 2017 12:08:42 +0000
Subject: [PATCH 11/13] update scripts/update_builtin_commands.vim
---
scripts/update_builtin_commands.vim | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/update_builtin_commands.vim b/scripts/update_builtin_commands.vim
index 213bbc3a..2bec4e40 100644
--- a/scripts/update_builtin_commands.vim
+++ b/scripts/update_builtin_commands.vim
@@ -129,9 +129,9 @@ function! g:VimLParserNewCmds(ex_cmds_h) abort
let new_cmds = s:gen_new_builtin(vimlparser#import().VimLParser.builtin_commands, latest)
let generated_text = s:gen_viml(new_cmds)
if generated_text == ''
- verbose echo 's:VimLParser.builtin_commands in autoload/vimlparser.vim is up-to-date.'
+ verbose echo 's:VimLParser.builtin_commands is up-to-date.'
else
- verbose echo "Append following lines to s:VimLParser.builtin_commands in autoload/vimlparser.vim\n"
+ verbose echo "Append following lines to s:VimLParser.builtin_commands\n"
verbose echo generated_text
endif
endfunction
From 190ad40fbf1b02bfb97e4f8b2f45224fe857720f Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Sat, 25 Nov 2017 12:10:40 +0000
Subject: [PATCH 12/13] s/VimlParser/VimLParser/
---
Makefile | 4 ++--
autoload/vimlparser.vim | 4 ++--
.../vital/__vimlparser__/{VimlParser.vim => VimLParser.vim} | 0
js/jscompiler.vim | 2 +-
py/pycompiler.vim | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
rename autoload/vital/__vimlparser__/{VimlParser.vim => VimLParser.vim} (100%)
diff --git a/Makefile b/Makefile
index 30c7a364..57aa651f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@ COMPILED_FILES:=js/vimlparser.js py/vimlparser.py
all: $(COMPILED_FILES)
-js/vimlparser.js: autoload/vital/__vimlparser__/VimlParser.vim js/jscompiler.vim js/vimlfunc.js
+js/vimlparser.js: autoload/vital/__vimlparser__/VimLParser.vim js/jscompiler.vim js/vimlfunc.js
scripts/jscompile.sh $< $@
-py/vimlparser.py: autoload/vital/__vimlparser__/VimlParser.vim py/pycompiler.vim py/vimlfunc.py
+py/vimlparser.py: autoload/vital/__vimlparser__/VimLParser.vim py/pycompiler.vim py/vimlfunc.py
scripts/pycompile.sh $< $@
clean_compiled:
diff --git a/autoload/vimlparser.vim b/autoload/vimlparser.vim
index c5035dcb..2f61271a 100644
--- a/autoload/vimlparser.vim
+++ b/autoload/vimlparser.vim
@@ -1,9 +1,9 @@
-" The main code was moved to autoload/vital/__vimlparser__/VimlParser.vim to
+" The main code was moved to autoload/vital/__vimlparser__/VimLParser.vim to
" make vim-vimlparser.vim vital-module.
"
" See https://github.com/vim-jp/vital.vim for vital module.
-call extend(s:, vital#vimlparser#import('VimlParser').import())
+call extend(s:, vital#vimlparser#import('VimLParser').import())
" To Vim plugin developer who want to depend on vim-vimlparser:
" Please use vimlparser as vital-module instead of this autoload function.
diff --git a/autoload/vital/__vimlparser__/VimlParser.vim b/autoload/vital/__vimlparser__/VimLParser.vim
similarity index 100%
rename from autoload/vital/__vimlparser__/VimlParser.vim
rename to autoload/vital/__vimlparser__/VimLParser.vim
diff --git a/js/jscompiler.vim b/js/jscompiler.vim
index ff805cbc..86521aad 100644
--- a/js/jscompiler.vim
+++ b/js/jscompiler.vim
@@ -885,7 +885,7 @@ endfunction
function! s:parse_args() abort
let v = [
- \ fnamemodify(s:script_dir . '/../autoload/vital/__vimlparser__/VimlParser.vim', ':p'),
+ \ fnamemodify(s:script_dir . '/../autoload/vital/__vimlparser__/VimLParser.vim', ':p'),
\ fnamemodify(s:script_dir . '/vimlparser.js', ':p')
\]
let args = argv()[1:]
diff --git a/py/pycompiler.vim b/py/pycompiler.vim
index 0b46761d..475f5425 100644
--- a/py/pycompiler.vim
+++ b/py/pycompiler.vim
@@ -857,7 +857,7 @@ endfunction
function! s:parse_args() abort
let v = [
- \ fnamemodify(s:script_dir . '/../autoload/vital/__vimlparser__/VimlParser.vim', ':p'),
+ \ fnamemodify(s:script_dir . '/../autoload/vital/__vimlparser__/VimLParser.vim', ':p'),
\ fnamemodify(s:script_dir . '/vimlparser.py', ':p')
\]
let args = argv()[1:]
From 67cead6b35cfbdc4ee375b1dd5fa2bde1121b50b Mon Sep 17 00:00:00 2001
From: haya14busa <haya14busa@gmail.com>
Date: Sun, 26 Nov 2017 01:03:18 +0000
Subject: [PATCH 13/13] Add comments about public API as vital-module
---
README.mkd | 2 +-
autoload/vital/__vimlparser__/VimLParser.vim | 29 ++++++++++++++++++--
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/README.mkd b/README.mkd
index 9745d3a0..29b9ccac 100644
--- a/README.mkd
+++ b/README.mkd
@@ -14,7 +14,7 @@ This parser provide same feature for following languages.
* Vim script
* Python
-* Javascript
+* JavaScript
## Example
diff --git a/autoload/vital/__vimlparser__/VimLParser.vim b/autoload/vital/__vimlparser__/VimLParser.vim
index 8dc74c1d..80df8a04 100644
--- a/autoload/vital/__vimlparser__/VimLParser.vim
+++ b/autoload/vital/__vimlparser__/VimLParser.vim
@@ -4,6 +4,31 @@
"
" License: This file is placed in the public domain.
+" s:import is only public API and you can access this script-local function via
+" vital.vim. See https://github.com/vim-jp/vital.vim for more detail.
+"
+" Historically, vimlparser.vim is not vital module and there are other exported
+" functions as vital-module, but they are not expected to be used.
+" The one reason we didn't make them as private function (add `_` prefix to
+" script local function) is that this file will be translated into other
+" languages like Python and JavaScript. Also, vimlparser developers have no
+" need to learn vital.vim convention and develop vimlparser same as before as
+" much as possible.
+"
+" Example:
+" call extend(s:, vital#vital#import('VimLParser').import())
+"
+" function! s:run() abort
+" let code = [
+" \ 'let s:message = printf("hello %d", 1+(2*3))'
+" \ ]
+" let r = s:StringReader.new(code)
+" let p = s:VimLParser.new()
+" let c = s:Compiler.new()
+" echo join(c.compile(p.parse(r)), "\n")
+" endfunction
+"
+" call s:run()
function! s:import() abort
return s:
endfunction
@@ -906,7 +931,7 @@ function! s:VimLParser.find_command()
endif
endfor
- if self.neovim
+ if self.neovim
for x in self.neovim_additional_commands
if stridx(x.name, name) == 0 && len(name) >= x.minlen
unlet cmd
@@ -923,7 +948,7 @@ function! s:VimLParser.find_command()
endif
endfor
endif
-
+
" FIXME: user defined command
if (cmd is s:NIL || cmd.name ==# 'Print') && name =~# '^[A-Z]'
let name .= self.reader.read_alnum()