Mercurial > vim
changeset 13002:f7b2ecaeb79c v8.0.1377
patch 8.0.1377: cannot call a dict function in autoloaded dict
commit https://github.com/vim/vim/commit/6e65d594aa33be11f6074f26e9ff81b52504c62b
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 7 22:11:27 2017 +0100
patch 8.0.1377: cannot call a dict function in autoloaded dict
Problem: Cannot call a dict function in autoloaded dict.
Solution: Call get_lval() passing the read-only flag.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 07 Dec 2017 22:15:06 +0100 |
parents | b5a93ba1f01a |
children | aa448f6b6dc5 |
files | src/Makefile src/eval.c src/testdir/Make_all.mak src/testdir/sautest/autoload/foo.vim src/testdir/sautest/autoload/globone.vim src/testdir/sautest/autoload/globtwo.vim src/testdir/test_autoload.vim src/testdir/test_escaped_glob.vim src/userfunc.c src/version.c |
diffstat | 10 files changed, 35 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2120,6 +2120,7 @@ test_arglist \ test_assign \ test_autochdir \ test_autocmd \ + test_autoload \ test_backspace_opt \ test_breakindent \ test_bufline \
--- a/src/eval.c +++ b/src/eval.c @@ -1956,7 +1956,10 @@ get_lval( cc = *p; *p = NUL; - v = find_var(lp->ll_name, &ht, flags & GLV_NO_AUTOLOAD); + /* Only pass &ht when we would write to the variable, it prevents autoload + * as well. */ + v = find_var(lp->ll_name, (flags & GLV_READ_ONLY) ? NULL : &ht, + flags & GLV_NO_AUTOLOAD); if (v == NULL && !quiet) EMSG2(_(e_undefvar), lp->ll_name); *p = cc; @@ -6610,6 +6613,8 @@ get_vim_var_nr(int idx) /* * Get string v: variable value. Uses a static buffer, can only be used once. + * If the String variable has never been set, return an empty string. + * Never returns NULL; */ char_u * get_vim_var_str(int idx)
--- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -73,6 +73,7 @@ NEW_TESTS = test_arabic.res \ test_assert.res \ test_autochdir.res \ test_autocmd.res \ + test_autoload.res \ test_backspace_opt.res \ test_breakindent.res \ test_bufwintabinfo.res \
new file mode 100644 --- /dev/null +++ b/src/testdir/sautest/autoload/foo.vim @@ -0,0 +1,7 @@ +let g:loaded_foo_vim += 1 + +let foo#bar = {} + +func foo#bar.echo() + let g:called_foo_bar_echo += 1 +endfunc
new file mode 100644 --- /dev/null +++ b/src/testdir/sautest/autoload/globone.vim @@ -0,0 +1,1 @@ +" used by Test_globpath()
new file mode 100644 --- /dev/null +++ b/src/testdir/sautest/autoload/globtwo.vim @@ -0,0 +1,1 @@ +" used by Test_globpath()
new file mode 100644 --- /dev/null +++ b/src/testdir/test_autoload.vim @@ -0,0 +1,11 @@ +" Tests for autoload + +set runtimepath=./sautest + +func! Test_autoload_dict_func() + let g:loaded_foo_vim = 0 + let g:called_foo_bar_echo = 0 + call g:foo#bar.echo() + call assert_equal(1, g:loaded_foo_vim) + call assert_equal(1, g:called_foo_bar_echo) +endfunc
--- a/src/testdir/test_escaped_glob.vim +++ b/src/testdir/test_escaped_glob.vim @@ -25,8 +25,8 @@ function Test_glob() endfunction function Test_globpath() - call assert_equal("sautest/autoload/Test104.vim\nsautest/autoload/footest.vim", - \ globpath('sautest/autoload', '*.vim')) - call assert_equal(['sautest/autoload/Test104.vim', 'sautest/autoload/footest.vim'], - \ globpath('sautest/autoload', '*.vim', 0, 1)) + call assert_equal("sautest/autoload/globone.vim\nsautest/autoload/globtwo.vim", + \ globpath('sautest/autoload', 'glob*.vim')) + call assert_equal(['sautest/autoload/globone.vim', 'sautest/autoload/globtwo.vim'], + \ globpath('sautest/autoload', 'glob*.vim', 0, 1)) endfunction
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -1594,7 +1594,7 @@ trans_function_name( start += lead; /* Note that TFN_ flags use the same values as GLV_ flags. */ - end = get_lval(start, NULL, &lv, FALSE, skip, flags, + end = get_lval(start, NULL, &lv, FALSE, skip, flags | GLV_READ_ONLY, lead > 2 ? 0 : FNE_CHECK_START); if (end == start) {