diff options
Diffstat (limited to 'src/nvim/strings.c')
| -rw-r--r-- | src/nvim/strings.c | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/src/nvim/strings.c b/src/nvim/strings.c index acbff51e49..4e521b14f7 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -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) { + 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; } } |