Mercurial > vim
changeset 22149:49b3a95adf04 v8.2.1624
patch 8.2.1624: Vim9: cannot pass "true" to split(), str2nr() and strchars()
Commit: https://github.com/vim/vim/commit/3986b94b090ea258109630008611230a599999ab
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 6 16:09:04 2020 +0200
patch 8.2.1624: Vim9: cannot pass "true" to split(), str2nr() and strchars()
Problem: Vim9: cannot pass "true" to split(), str2nr() and strchars().
Solution: Use tv_get_bool_chk(). (closes https://github.com/vim/vim/issues/6884, closes https://github.com/vim/vim/issues/6885, closes https://github.com/vim/vim/issues/6886)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 06 Sep 2020 16:15:03 +0200 |
| parents | 516bce395dc4 |
| children | 9a7b86f483f3 |
| files | src/evalfunc.c src/testdir/test_vim9_func.vim src/version.c |
| diffstat | 3 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -7884,7 +7884,7 @@ f_split(typval_T *argvars, typval_T *ret if (pat == NULL) typeerr = TRUE; if (argvars[2].v_type != VAR_UNKNOWN) - keepempty = (int)tv_get_number_chk(&argvars[2], &typeerr); + keepempty = (int)tv_get_bool_chk(&argvars[2], &typeerr); } if (pat == NULL || *pat == NUL) pat = (char_u *)"[\\x01- ]\\+"; @@ -8030,7 +8030,7 @@ f_str2nr(typval_T *argvars, typval_T *re emsg(_(e_invarg)); return; } - if (argvars[2].v_type != VAR_UNKNOWN && tv_get_number(&argvars[2])) + if (argvars[2].v_type != VAR_UNKNOWN && tv_get_bool(&argvars[2])) what |= STR2NR_QUOTE; } @@ -8155,12 +8155,12 @@ f_strlen(typval_T *argvars, typval_T *re f_strchars(typval_T *argvars, typval_T *rettv) { char_u *s = tv_get_string(&argvars[0]); - int skipcc = 0; + int skipcc = FALSE; varnumber_T len = 0; int (*func_mb_ptr2char_adv)(char_u **pp); if (argvars[1].v_type != VAR_UNKNOWN) - skipcc = (int)tv_get_number_chk(&argvars[1], NULL); + skipcc = (int)tv_get_bool(&argvars[1]); if (skipcc < 0 || skipcc > 1) emsg(_(e_invarg)); else
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1636,6 +1636,18 @@ def Test_spellsuggest() endif enddef +def Test_split() + split(' aa bb ', '\W\+', true)->assert_equal(['', 'aa', 'bb', '']) +enddef + +def Test_str2nr() + str2nr("1'000'000", 10, true)->assert_equal(1000000) +enddef + +def Test_strchars() + strchars("A\u20dd", true)->assert_equal(1) +enddef + def Test_synID() new setline(1, "text")