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

patch 8.2.3200: Vim9: hard to guess where a type error is given

Browse Source 
Problem:    Vim9: hard to guess where a type error is given.
Solution:   Add the function name where possible. (closes #8608)
This commit is contained in:
Bram Moolenaar
2021-07-22 14:58:47 +02:00
parent a74901929e
commit 7a3fe3e180
13 changed files with 78 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/vim9type.c
View File

@@ -428,12 +428,16 @@ typval2type_vimvar(typval_T *tv, garray_T *type_gap)
}
int
check_typval_arg_type(type_T *expected, typval_T *actual_tv, int arg_idx)
check_typval_arg_type(
type_T *expected,
typval_T *actual_tv,
char *func_name,
int arg_idx)
{
where_T where;
where_T where = WHERE_INIT;
where.wt_index = arg_idx;
where.wt_variable = FALSE;
where.wt_func_name = func_name;
return check_typval_type(expected, actual_tv, where);
}
@@ -465,10 +469,9 @@ type_mismatch(type_T *expected, type_T *actual)
void
arg_type_mismatch(type_T *expected, type_T *actual, int arg_idx)
{
where_T where;
where_T where = WHERE_INIT;
where.wt_index = arg_idx;
where.wt_variable = FALSE;
type_mismatch_where(expected, actual, where);
}
@@ -481,14 +484,23 @@ type_mismatch_where(type_T *expected, type_T *actual, where_T where)
if (where.wt_index > 0)
{
semsg(_(where.wt_variable
? e_variable_nr_type_mismatch_expected_str_but_got_str
: e_argument_nr_type_mismatch_expected_str_but_got_str),
if (where.wt_func_name == NULL)
semsg(_(where.wt_variable
? e_variable_nr_type_mismatch_expected_str_but_got_str
: e_argument_nr_type_mismatch_expected_str_but_got_str),
where.wt_index, typename1, typename2);
else
semsg(_(where.wt_variable
? e_variable_nr_type_mismatch_expected_str_but_got_str_in_str
: e_argument_nr_type_mismatch_expected_str_but_got_str_in_str),
where.wt_index, typename1, typename2, where.wt_func_name);
}
else
else if (where.wt_func_name == NULL)
semsg(_(e_type_mismatch_expected_str_but_got_str),
typename1, typename2);
else
semsg(_(e_type_mismatch_expected_str_but_got_str_in_str),
typename1, typename2, where.wt_func_name);
vim_free(tofree1);
vim_free(tofree2);
}
@@ -604,7 +616,7 @@ check_argument_types(
expected = type->tt_args[type->tt_argcount - 1]->tt_member;
else
expected = type->tt_args[i];
if (check_typval_arg_type(expected, &argvars[i], i + 1) == FAIL)
if (check_typval_arg_type(expected, &argvars[i], NULL, i + 1) == FAIL)
return FAIL;
}
return OK;