aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-15 07:14:09 -04:00
Code Activity

patch 8.2.1624: Vim9: cannot pass "true" to split(), str2nr() and strchars()

Browse Source 
Problem:    Vim9: cannot pass "true" to split(), str2nr() and strchars().
Solution:   Use tv_get_bool_chk(). (closes #6884, closes #6885, closes #6886)
This commit is contained in:
Bram Moolenaar
2020-09-06 16:09:04 +02:00
parent d2c617055a
commit 3986b94b09
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/evalfunc.c
View File

@@ -7884,7 +7884,7 @@ f_split(typval_T *argvars, typval_T *rettv)
if (pat == NULL) if (pat == NULL)
typeerr = TRUE; typeerr = TRUE;
if (argvars[2].v_type != VAR_UNKNOWN) 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) if (pat == NULL || *pat == NUL)
pat = (char_u *)"[\\x01- ]\\+"; pat = (char_u *)"[\\x01- ]\\+";
@@ -8030,7 +8030,7 @@ f_str2nr(typval_T *argvars, typval_T *rettv)
emsg(_(e_invarg)); emsg(_(e_invarg));
return; 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; what |= STR2NR_QUOTE;
} }
@@ -8155,12 +8155,12 @@ f_strlen(typval_T *argvars, typval_T *rettv)
f_strchars(typval_T *argvars, typval_T *rettv) f_strchars(typval_T *argvars, typval_T *rettv)
{ {
char_u *s = tv_get_string(&argvars[0]); char_u *s = tv_get_string(&argvars[0]);
int skipcc = 0; int skipcc = FALSE;
varnumber_T len = 0; varnumber_T len = 0;
int (*func_mb_ptr2char_adv)(char_u **pp); int (*func_mb_ptr2char_adv)(char_u **pp);
if (argvars[1].v_type != VAR_UNKNOWN) 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) if (skipcc < 0 || skipcc > 1)
emsg(_(e_invarg)); emsg(_(e_invarg));
else else

12
src/testdir/test_vim9_func.vim
View File

@@ -1636,6 +1636,18 @@ def Test_spellsuggest()
endif endif
enddef 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() def Test_synID()
new new
setline(1, "text") setline(1, "text")

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1624,
/**/ /**/
1623, 1623,
/**/ /**/