IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1524: passing -1 for bool is not always rejected

Browse Source 
Problem:    Passing -1 for bool is not always rejected.
Solution:   Check for error in a better way. (closes vim/vim#12358)

8cf51376b8
This commit is contained in:
zeertzjq 2023-05-08 22:49:53 +08:00
parent d745433817
commit 625926f729
4 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/nvim/strings.c
View File

@ -1515,11 +1515,13 @@ static void byteidx_common(typval_T *argvars, typval_T *rettv, int comp)
varnumber_T utf16idx = false;
if (argvars[2].v_type != VAR_UNKNOWN) {
utf16idx = tv_get_bool(&argvars[2]);
bool error = false;
utf16idx = tv_get_bool_chk(&argvars[2], &error);
if (error) {
return;
}
if (utf16idx < 0 || utf16idx > 1) {
if (utf16idx != -1) {
semsg(_(e_using_number_as_bool_nr), utf16idx);
}
semsg(_(e_using_number_as_bool_nr), utf16idx);
return;
}
}
@ -1767,18 +1769,21 @@ void f_strcharlen(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
/// "strchars()" function
void f_strchars(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{
int skipcc = false;
varnumber_T skipcc = false;
if (argvars[1].v_type != VAR_UNKNOWN) {
skipcc = (int)tv_get_bool(&argvars[1]);
}
if (skipcc < 0 || skipcc > 1) {
if (skipcc != -1) {
semsg(_(e_using_number_as_bool_nr), skipcc);
bool error = false;
skipcc = tv_get_bool_chk(&argvars[1], &error);
if (error) {
return;
}
if (skipcc < 0 || skipcc > 1) {
semsg(_(e_using_number_as_bool_nr), skipcc);
return;
}
} else {
strchar_common(argvars, rettv, skipcc);
}
strchar_common(argvars, rettv, skipcc);
}
/// "strutf16len()" function
@ -1845,11 +1850,12 @@ void f_strcharpart(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
if (!error) {
if (argvars[2].v_type != VAR_UNKNOWN
&& argvars[3].v_type != VAR_UNKNOWN) {
skipcc = tv_get_bool(&argvars[3]);
skipcc = tv_get_bool_chk(&argvars[3], &error);
if (error) {
return;
}
if (skipcc < 0 || skipcc > 1) {
if (skipcc != -1) {
semsg(_(e_using_number_as_bool_nr), skipcc);
}
semsg(_(e_using_number_as_bool_nr), skipcc);
return;
}
}

3
test/old/testdir/test_expr.vim
View File

@ -155,7 +155,8 @@ func Test_strcharpart()
END
call CheckLegacyAndVim9Success(lines)
call assert_fails('echo strcharpart("", 0, 0, {})', ['E728:', 'E728:'])
call assert_fails('call strcharpart("", 0, 0, {})', ['E728:', 'E728:'])
call assert_fails('call strcharpart("", 0, 0, -1)', ['E1023:', 'E1023:'])
endfunc
func Test_getreg_empty_list()

3
test/old/testdir/test_functions.vim
View File

@ -1097,6 +1097,7 @@ func Test_byteidx()
call assert_fails("call byteidx([], 0)", 'E730:')
call assert_fails("call byteidx('abc', [])", 'E745:')
call assert_fails("call byteidx('abc', 0, {})", ['E728:', 'E728:'])
call assert_fails("call byteidx('abc', 0, -1)", ['E1023:', 'E1023:'])
endfunc
" Test for byteidxcomp() using a character index
@ -1137,6 +1138,7 @@ func Test_byteidxcomp()
call assert_fails("call byteidxcomp([], 0)", 'E730:')
call assert_fails("call byteidxcomp('abc', [])", 'E745:')
call assert_fails("call byteidxcomp('abc', 0, {})", ['E728:', 'E728:'])
call assert_fails("call byteidxcomp('abc', 0, -1)", ['E1023:', 'E1023:'])
endfunc
" Test for byteidx() using a UTF-16 index
@ -1497,7 +1499,6 @@ func Test_utf16idx_from_charidx()
" error cases
call assert_equal(-1, utf16idx(v:_null_string, 0, v:true, v:true))
call assert_fails('let l = utf16idx("ab", 0, v:false, [])', 'E1212:')
call assert_fails('echo strchars("", {})', ['E728:', 'E728:'])
endfunc
" Test for strutf16len()

6
test/old/testdir/test_utf8.vim
View File

@ -29,8 +29,10 @@ func Test_strchars()
call assert_equal(exp[i], strcharlen(inp[i]))
endfor
call assert_fails("let v=strchars('abc', [])", 'E745:')
call assert_fails("let v=strchars('abc', 2)", 'E1023:')
call assert_fails("call strchars('abc', 2)", ['E1023:', 'E1023:'])
call assert_fails("call strchars('abc', -1)", ['E1023:', 'E1023:'])
call assert_fails("call strchars('abc', {})", ['E728:', 'E728:'])
call assert_fails("call strchars('abc', [])", ['E745:', 'E745:'])
endfunc
" Test for customlist completion