aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.1813: Vim9: can assign wrong type to script dict

Browse Source 
Problem:    Vim9: can assign wrong type to script dict. (Christian J.  Robinson)
Solution:   Check the type if known.
This commit is contained in:
Bram Moolenaar
2020-10-08 21:16:42 +02:00
parent 0876c78527
commit 10c65860f8
7 changed files with 77 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/eval.c
View File

@@ -887,6 +887,17 @@ get_lval(
return NULL;
}
if (in_vim9script() && lp->ll_valtype == NULL
&& lp->ll_tv == &v->di_tv
&& ht != NULL && ht == get_script_local_ht())
{
svar_T *sv = find_typval_in_script(lp->ll_tv);
// Vim9 script local variable: get the type
if (sv != NULL)
lp->ll_valtype = sv->sv_type;
}
len = -1;
if (*p == '.')
{
@@ -1037,6 +1048,10 @@ get_lval(
}
}
if (lp->ll_valtype != NULL)
// use the type of the member
lp->ll_valtype = lp->ll_valtype->tt_member;
if (lp->ll_di == NULL)
{
// Can't add "v:" or "a:" variable.
@@ -1148,6 +1163,10 @@ get_lval(
return NULL;
}
if (lp->ll_valtype != NULL)
// use the type of the member
lp->ll_valtype = lp->ll_valtype->tt_member;
/*
* May need to find the item or absolute index for the second
* index of a range.
@@ -1383,6 +1402,11 @@ set_var_lval(
emsg(_("E996: Cannot lock a list or dict"));
return;
}
if (lp->ll_valtype != NULL
&& check_typval_type(lp->ll_valtype, rettv, 0) == FAIL)
return;
if (lp->ll_newkey != NULL)
{
if (op != NULL && *op != '=')