1
0
forked from aniani/vim

patch 8.2.0973: Vim9: type is not checked when assigning to a script variable

Problem:    Vim9: type is not checked when assigning to a script variable.
Solution:   Check the type.
This commit is contained in:
Bram Moolenaar
2020-06-13 19:00:10 +02:00
parent c82a5b5da5
commit 34db91f7a4
7 changed files with 51 additions and 8 deletions

View File

@@ -2883,12 +2883,17 @@ set_var_const(
|| var_check_lock(di->di_tv.v_lock, name, FALSE)) || var_check_lock(di->di_tv.v_lock, name, FALSE))
return; return;
if ((flags & LET_NO_COMMAND) == 0 if (is_script_local
&& is_script_local && current_sctx.sc_version == SCRIPT_VERSION_VIM9)
&& current_sctx.sc_version == SCRIPT_VERSION_VIM9)
{ {
semsg(_("E1041: Redefining script item %s"), name); if ((flags & LET_NO_COMMAND) == 0)
return; {
semsg(_("E1041: Redefining script item %s"), name);
return;
}
// check the type
check_script_var_type(&di->di_tv, tv, name);
} }
} }
else else

View File

@@ -1,5 +1,7 @@
/* vim9compile.c */ /* vim9compile.c */
int check_defined(char_u *p, int len, cctx_T *cctx); int check_defined(char_u *p, int len, cctx_T *cctx);
type_T *typval2type(typval_T *tv);
int check_type(type_T *expected, type_T *actual, int give_msg);
char_u *skip_type(char_u *start); char_u *skip_type(char_u *start);
type_T *parse_type(char_u **arg, garray_T *type_gap); type_T *parse_type(char_u **arg, garray_T *type_gap);
char *vartype_name(vartype_T type); char *vartype_name(vartype_T type);

View File

@@ -7,4 +7,5 @@ void ex_import(exarg_T *eap);
int find_exported(int sid, char_u **argp, int *name_len, ufunc_T **ufunc, type_T **type); int find_exported(int sid, char_u **argp, int *name_len, ufunc_T **ufunc, type_T **type);
char_u *handle_import(char_u *arg_start, garray_T *gap, int import_sid, void *cctx); char_u *handle_import(char_u *arg_start, garray_T *gap, int import_sid, void *cctx);
char_u *vim9_declare_scriptvar(exarg_T *eap, char_u *arg); char_u *vim9_declare_scriptvar(exarg_T *eap, char_u *arg);
void check_script_var_type(typval_T *dest, typval_T *value, char_u *name);
/* vim: set ft=c : */ /* vim: set ft=c : */

View File

@@ -1831,6 +1831,15 @@ def Test_let_declaration()
unlet g:var_test unlet g:var_test
enddef enddef
def Test_let_type_check()
let lines =<< trim END
vim9script
let var: string
var = 1234
END
CheckScriptFailure(lines, 'E1013:')
enddef
def Test_forward_declaration() def Test_forward_declaration()
let lines =<< trim END let lines =<< trim END
vim9script vim9script

View File

@@ -754,6 +754,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 */
/**/
973,
/**/ /**/
972, 972,
/**/ /**/

View File

@@ -139,7 +139,6 @@ static char e_used_as_arg[] = N_("E1006: %s is used as an argument");
static void delete_def_function_contents(dfunc_T *dfunc); static void delete_def_function_contents(dfunc_T *dfunc);
static void arg_type_mismatch(type_T *expected, type_T *actual, int argidx); static void arg_type_mismatch(type_T *expected, type_T *actual, int argidx);
static int check_type(type_T *expected, type_T *actual, int give_msg);
/* /*
* Lookup variable "name" in the local scope and return it. * Lookup variable "name" in the local scope and return it.
@@ -461,7 +460,7 @@ func_type_add_arg_types(
/* /*
* Return the type_T for a typval. Only for primitive types. * Return the type_T for a typval. Only for primitive types.
*/ */
static type_T * type_T *
typval2type(typval_T *tv) typval2type(typval_T *tv)
{ {
if (tv->v_type == VAR_NUMBER) if (tv->v_type == VAR_NUMBER)
@@ -504,7 +503,7 @@ arg_type_mismatch(type_T *expected, type_T *actual, int argidx)
* Check if the expected and actual types match. * Check if the expected and actual types match.
* Does not allow for assigning "any" to a specific type. * Does not allow for assigning "any" to a specific type.
*/ */
static int int
check_type(type_T *expected, type_T *actual, int give_msg) check_type(type_T *expected, type_T *actual, int give_msg)
{ {
int ret = OK; int ret = OK;

View File

@@ -488,5 +488,30 @@ vim9_declare_scriptvar(exarg_T *eap, char_u *arg)
return p; return p;
} }
/*
* Check if the type of script variable "dest" allows assigning "value".
*/
void
check_script_var_type(typval_T *dest, typval_T *value, char_u *name)
{
scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
int idx;
// Find the svar_T in sn_var_vals.
for (idx = 0; idx < si->sn_var_vals.ga_len; ++idx)
{
svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data) + idx;
if (sv->sv_tv == dest)
{
if (sv->sv_const)
semsg(_(e_readonlyvar), name);
else
check_type(sv->sv_type, typval2type(value), TRUE);
return;
}
}
iemsg("check_script_var_type(): not found");
}
#endif // FEAT_EVAL #endif // FEAT_EVAL