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

patch 8.2.3128: Vim9: uninitialzed list does not get type checked

Browse Source 
Problem:    Vim9: uninitialzed list does not get type checked.
Solution:   Set the type when initializing the variable. (closes #8529)
This commit is contained in:
Bram Moolenaar
2021-07-08 20:57:24 +02:00
parent f32f099761
commit f055d45023
7 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/evalvars.c
View File

@@ -2565,6 +2565,7 @@ eval_variable(
typval_T *tv = NULL;
int found = FALSE;
dictitem_T *v;
hashtab_T *ht = NULL;
int cc;
// truncate the name, so that we can use strcmp()
@@ -2575,7 +2576,7 @@ eval_variable(
if ((tv = lookup_debug_var(name)) == NULL)
{
// Check for user-defined variables.
v = find_var(name, NULL, flags & EVAL_VAR_NOAUTOLOAD);
v = find_var(name, &ht, flags & EVAL_VAR_NOAUTOLOAD);
if (v != NULL)
{
tv = &v->di_tv;
@@ -2655,18 +2656,35 @@ eval_variable(
}
else if (rettv != NULL)
{
type_T *type = NULL;
if (ht != NULL && ht == get_script_local_ht())
{
svar_T *sv = find_typval_in_script(tv, FALSE);
// TODO: check imported variable
if (sv != NULL)
type = sv->sv_type;
}
// If a list or dict variable wasn't initialized, do it now.
if (tv->v_type == VAR_DICT && tv->vval.v_dict == NULL)
{
tv->vval.v_dict = dict_alloc();
if (tv->vval.v_dict != NULL)
{
++tv->vval.v_dict->dv_refcount;
tv->vval.v_dict->dv_type = alloc_type(type);
}
}
else if (tv->v_type == VAR_LIST && tv->vval.v_list == NULL)
{
tv->vval.v_list = list_alloc();
if (tv->vval.v_list != NULL)
{
++tv->vval.v_list->lv_refcount;
tv->vval.v_list->lv_type = alloc_type(type);
}
}
else if (tv->v_type == VAR_BLOB && tv->vval.v_blob == NULL)
{