diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-11-05 15:02:54 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-11-05 18:06:00 +0800 |
| commit | d857569dbdc0a9374b2cf661b9a7d49b38aad966 (patch) | |
| tree | 717cd562f5007157d939ab3891e3b96bd2eb31cb /src/nvim/eval/funcs.c | |
| parent | 38c113ae842aa8c42ad66bba15f16cf401637ab8 (diff) | |
| download | rneovim-d857569dbdc0a9374b2cf661b9a7d49b38aad966.tar.gz rneovim-d857569dbdc0a9374b2cf661b9a7d49b38aad966.tar.bz2 rneovim-d857569dbdc0a9374b2cf661b9a7d49b38aad966.zip | |
vim-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 vim/vim#6884, closes vim/vim#6885, closes vim/vim#6886)
https://github.com/vim/vim/commit/3986b94b090ea258109630008611230a599999ab
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim/eval/funcs.c')
| -rw-r--r-- | src/nvim/eval/funcs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 553a377d21..4939c5ef5d 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -8162,7 +8162,7 @@ static void f_split(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) typeerr = true; } if (argvars[2].v_type != VAR_UNKNOWN) { - keepempty = (bool)tv_get_number_chk(&argvars[2], &typeerr); + keepempty = (bool)tv_get_bool_chk(&argvars[2], &typeerr); } } if (pat == NULL || *pat == NUL) { @@ -8292,7 +8292,7 @@ static void f_str2nr(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) 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; } } @@ -8451,12 +8451,12 @@ static void f_strlen(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) static void f_strchars(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) { const char *s = tv_get_string(&argvars[0]); - int skipcc = 0; + int skipcc = false; varnumber_T len = 0; int (*func_mb_ptr2char_adv)(const 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) { semsg(_(e_using_number_as_bool_nr), skipcc); |