aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 8.2.3682: Vim9: assigning to a script variable drops the type

Browse Source 
Problem:    Vim9: assigning to a script variable drops the required type.
Solution:   Lookup the type of the variable and use it. (closes #9219)
This commit is contained in:
Bram Moolenaar
2021-11-26 17:36:51 +00:00
parent bfc5786a61
commit 7824fc80f6
5 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/evalvars.c
View File

@@ -3206,13 +3206,14 @@ set_var(
void
set_var_const(
char_u *name,
type_T *type,
type_T *type_arg,
typval_T *tv_arg,
int copy, // make copy of value in "tv"
int flags_arg, // ASSIGN_CONST, ASSIGN_FINAL, etc.
int var_idx) // index for ":let [a, b] = list"
{
typval_T *tv = tv_arg;
type_T *type = type_arg;
typval_T bool_tv;
dictitem_T *di;
typval_T *dest_tv = NULL;
@@ -3334,13 +3335,18 @@ set_var_const(
if (var_in_vim9script && (flags & ASSIGN_FOR_LOOP) == 0)
{
where_T where = WHERE_INIT;
svar_T *sv = find_typval_in_script(&di->di_tv);
// check the type and adjust to bool if needed
where.wt_index = var_idx;
where.wt_variable = TRUE;
if (check_script_var_type(&di->di_tv, tv, name, where)
== FAIL)
goto failed;
if (sv != NULL)
{
// check the type and adjust to bool if needed
where.wt_index = var_idx;
where.wt_variable = TRUE;
if (check_script_var_type(sv, tv, name, where) == FAIL)
goto failed;
if (type == NULL)
type = sv->sv_type;
}
}
if ((flags & ASSIGN_FOR_LOOP) == 0