aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.3840: useless test for negative index in check functions

Browse Source 
Problem:    Useless test for negative index in check functions.
Solution:   Remove the test for negative index. (Naruhiko Nishino,
            closes #9364)
This commit is contained in:
rbtnn
2021-12-17 18:01:31 +00:00
committed by Bram Moolenaar
parent 354b23a9f8
commit ddc80aff57
2 changed files with 19 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/typval.c
View File

@@ -359,10 +359,7 @@ check_for_string_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_STRING) if (args[idx].v_type != VAR_STRING)
{ {
if (idx >= 0) semsg(_(e_string_required_for_argument_nr), idx + 1);
semsg(_(e_string_required_for_argument_nr), idx + 1);
else
emsg(_(e_stringreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -402,10 +399,7 @@ check_for_number_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_NUMBER) if (args[idx].v_type != VAR_NUMBER)
{ {
if (idx >= 0) semsg(_(e_number_required_for_argument_nr), idx + 1);
semsg(_(e_number_required_for_argument_nr), idx + 1);
else
emsg(_(e_numberreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -429,10 +423,7 @@ check_for_float_or_nr_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_FLOAT && args[idx].v_type != VAR_NUMBER) if (args[idx].v_type != VAR_FLOAT && args[idx].v_type != VAR_NUMBER)
{ {
if (idx >= 0) semsg(_(e_float_or_number_required_for_argument_nr), idx + 1);
semsg(_(e_float_or_number_required_for_argument_nr), idx + 1);
else
emsg(_(e_numberreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -449,10 +440,7 @@ check_for_bool_arg(typval_T *args, int idx)
&& (args[idx].vval.v_number == 0 && (args[idx].vval.v_number == 0
|| args[idx].vval.v_number == 1))) || args[idx].vval.v_number == 1)))
{ {
if (idx >= 0) semsg(_(e_bool_required_for_argument_nr), idx + 1);
semsg(_(e_bool_required_for_argument_nr), idx + 1);
else
emsg(_(e_boolreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -478,10 +466,7 @@ check_for_blob_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_BLOB) if (args[idx].v_type != VAR_BLOB)
{ {
if (idx >= 0) semsg(_(e_blob_required_for_argument_nr), idx + 1);
semsg(_(e_blob_required_for_argument_nr), idx + 1);
else
emsg(_(e_blob_required));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -495,10 +480,7 @@ check_for_list_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_LIST) if (args[idx].v_type != VAR_LIST)
{ {
if (idx >= 0)
semsg(_(e_list_required_for_argument_nr), idx + 1); semsg(_(e_list_required_for_argument_nr), idx + 1);
else
emsg(_(e_listreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -522,10 +504,7 @@ check_for_dict_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_DICT) if (args[idx].v_type != VAR_DICT)
{ {
if (idx >= 0) semsg(_(e_dict_required_for_argument_nr), idx + 1);
semsg(_(e_dict_required_for_argument_nr), idx + 1);
else
emsg(_(e_dictreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -549,10 +528,7 @@ check_for_chan_or_job_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_CHANNEL && args[idx].v_type != VAR_JOB) if (args[idx].v_type != VAR_CHANNEL && args[idx].v_type != VAR_JOB)
{ {
if (idx >= 0) semsg(_(e_chan_or_job_required_for_argument_nr), idx + 1);
semsg(_(e_chan_or_job_required_for_argument_nr), idx + 1);
else
emsg(_(e_chan_or_job_req));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -577,10 +553,7 @@ check_for_job_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_JOB) if (args[idx].v_type != VAR_JOB)
{ {
if (idx >= 0) semsg(_(e_job_required_for_argument_nr), idx + 1);
semsg(_(e_job_required_for_argument_nr), idx + 1);
else
emsg(_(e_jobreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -605,10 +578,7 @@ check_for_string_or_number_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_STRING && args[idx].v_type != VAR_NUMBER) if (args[idx].v_type != VAR_STRING && args[idx].v_type != VAR_NUMBER)
{ {
if (idx >= 0) semsg(_(e_string_or_number_required_for_argument_nr), idx + 1);
semsg(_(e_string_or_number_required_for_argument_nr), idx + 1);
else
emsg(_(e_stringreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -672,10 +642,7 @@ check_for_string_or_blob_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_STRING && args[idx].v_type != VAR_BLOB) if (args[idx].v_type != VAR_STRING && args[idx].v_type != VAR_BLOB)
{ {
if (idx >= 0) semsg(_(e_string_or_blob_required_for_argument_nr), idx + 1);
semsg(_(e_string_or_blob_required_for_argument_nr), idx + 1);
else
emsg(_(e_stringreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -689,10 +656,7 @@ check_for_string_or_list_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_STRING && args[idx].v_type != VAR_LIST) if (args[idx].v_type != VAR_STRING && args[idx].v_type != VAR_LIST)
{ {
if (idx >= 0) semsg(_(e_string_or_list_required_for_argument_nr), idx + 1);
semsg(_(e_string_or_list_required_for_argument_nr), idx + 1);
else
emsg(_(e_stringreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -716,10 +680,7 @@ check_for_string_or_dict_arg(typval_T *args, int idx)
{ {
if (args[idx].v_type != VAR_STRING && args[idx].v_type != VAR_DICT) if (args[idx].v_type != VAR_STRING && args[idx].v_type != VAR_DICT)
{ {
if (idx >= 0) semsg(_(e_string_or_dict_required_for_argument_nr), idx + 1);
semsg(_(e_string_or_dict_required_for_argument_nr), idx + 1);
else
emsg(_(e_stringreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -767,10 +728,7 @@ check_for_string_or_list_or_dict_arg(typval_T *args, int idx)
&& args[idx].v_type != VAR_LIST && args[idx].v_type != VAR_LIST
&& args[idx].v_type != VAR_DICT) && args[idx].v_type != VAR_DICT)
{ {
if (idx >= 0) semsg(_(e_string_list_or_dict_required_for_argument_nr), idx + 1);
semsg(_(e_string_list_or_dict_required_for_argument_nr), idx + 1);
else
emsg(_(e_stringreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -802,10 +760,7 @@ check_for_list_or_dict_arg(typval_T *args, int idx)
if (args[idx].v_type != VAR_LIST if (args[idx].v_type != VAR_LIST
&& args[idx].v_type != VAR_DICT) && args[idx].v_type != VAR_DICT)
{ {
if (idx >= 0) semsg(_(e_list_or_dict_required_for_argument_nr), idx + 1);
semsg(_(e_list_or_dict_required_for_argument_nr), idx + 1);
else
emsg(_(e_listreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -822,10 +777,7 @@ check_for_list_or_dict_or_blob_arg(typval_T *args, int idx)
&& args[idx].v_type != VAR_DICT && args[idx].v_type != VAR_DICT
&& args[idx].v_type != VAR_BLOB) && args[idx].v_type != VAR_BLOB)
{ {
if (idx >= 0) semsg(_(e_list_dict_or_blob_required_for_argument_nr), idx + 1);
semsg(_(e_list_dict_or_blob_required_for_argument_nr), idx + 1);
else
emsg(_(e_listreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -843,11 +795,7 @@ check_for_list_or_dict_or_blob_or_string_arg(typval_T *args, int idx)
&& args[idx].v_type != VAR_BLOB && args[idx].v_type != VAR_BLOB
&& args[idx].v_type != VAR_STRING) && args[idx].v_type != VAR_STRING)
{ {
if (idx >= 0) semsg(_(e_list_dict_blob_or_string_required_for_argument_nr), idx + 1);
semsg(_(e_list_dict_blob_or_string_required_for_argument_nr),
idx + 1);
else
emsg(_(e_listreq));
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -865,10 +813,7 @@ check_for_opt_buffer_or_dict_arg(typval_T *args, int idx)
&& args[idx].v_type != VAR_NUMBER && args[idx].v_type != VAR_NUMBER
&& args[idx].v_type != VAR_DICT) && args[idx].v_type != VAR_DICT)
{ {
if (idx >= 0) semsg(_(e_string_required_for_argument_nr), idx + 1);
semsg(_(e_string_required_for_argument_nr), idx + 1);
else
emsg(_(e_stringreq));
return FAIL; return FAIL;
} }
return OK; return OK;

2
src/version.c
View File

@@ -749,6 +749,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 */
/**/
3840,
/**/ /**/
3839, 3839,
/**/ /**/