thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3162: Vim9: argument types are not checked at compile time

Browse Source 
Problem:    Vim9: argument types are not checked at compile time.
Solution:   Add more type checks. (Yegappan Lakshmanan, closes #8560)
This commit is contained in:
Yegappan Lakshmanan
2021-07-15 12:49:58 +02:00
committed by Bram Moolenaar
parent c816a2c226
commit 1a71d31bf3
22 changed files with 780 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/strings.c
View File

@@ -795,9 +795,15 @@ byteidx(typval_T *argvars, typval_T *rettv, int comp UNUSED)
char_u *str;
varnumber_T idx;
rettv->vval.v_number = -1;
if (in_vim9script()
&& (check_for_string_arg(argvars, 0) == FAIL
|| check_for_number_arg(argvars, 1) == FAIL))
return;
str = tv_get_string_chk(&argvars[0]);
idx = tv_get_number_chk(&argvars[1], NULL);
rettv->vval.v_number = -1;
if (str == NULL || idx < 0)
return;
@@ -981,6 +987,12 @@ f_strgetchar(typval_T *argvars, typval_T *rettv)
int byteidx = 0;
rettv->vval.v_number = -1;
if (in_vim9script()
&& (check_for_string_arg(argvars, 0) == FAIL
|| check_for_number_arg(argvars, 1) == FAIL))
return;
str = tv_get_string_chk(&argvars[0]);
if (str == NULL)
return;
@@ -1110,9 +1122,18 @@ f_strchars(typval_T *argvars, typval_T *rettv)
void
f_strdisplaywidth(typval_T *argvars, typval_T *rettv)
{
char_u *s = tv_get_string(&argvars[0]);
char_u *s;
int col = 0;
rettv->vval.v_number = -1;
if (in_vim9script()
&& (check_for_string_arg(argvars, 0) == FAIL
|| (argvars[1].v_type != VAR_UNKNOWN
&& check_for_number_arg(argvars, 1) == FAIL)))
return;
s = tv_get_string(&argvars[0]);
if (argvars[1].v_type != VAR_UNKNOWN)
col = (int)tv_get_number(&argvars[1]);