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

patch 8.2.2168: Vim9: error for assigning to dict of dict

Browse Source 
Problem:    Vim9: error for assigning to dict of dict.
Solution:   Remember the destination type. (closes #7506)
This commit is contained in:
Bram Moolenaar
2020-12-20 15:20:56 +01:00
parent d88dc4d4e9
commit d24602f43c
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/test_vim9_assign.vim
View File

@@ -560,6 +560,12 @@ def Test_assignment_dict()
dict3.key = 'yet another' dict3.key = 'yet another'
assert_equal(dict3, {key: 'yet another'}) assert_equal(dict3, {key: 'yet another'})
# member "any" can also be a dict and assigned to
var anydict: dict<any> = {nest: {}, nr: 0}
anydict.nest['this'] = 123
anydict.nest.that = 456
assert_equal({nest: {this: 123, that: 456}, nr: 0}, anydict)
var lines =<< trim END var lines =<< trim END
vim9script vim9script
var dd = {} var dd = {}

2
src/version.c
View File

@@ -750,6 +750,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 */
/**/
2168,
/**/ /**/
2167, 2167,
/**/ /**/

10
src/vim9compile.c
View File

@@ -5877,6 +5877,7 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
if (has_index) if (has_index)
{ {
int r; int r;
vartype_T dest_type;
// Compile the "idx" in "var[idx]" or "key" in "var.key". // Compile the "idx" in "var[idx]" or "key" in "var.key".
p = var_start + varlen; p = var_start + varlen;
@@ -5913,10 +5914,11 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
else else
type = &t_dict_any; type = &t_dict_any;
} }
if (type->tt_type == VAR_DICT dest_type = type->tt_type;
if (dest_type == VAR_DICT
&& may_generate_2STRING(-1, cctx) == FAIL) && may_generate_2STRING(-1, cctx) == FAIL)
goto theend; goto theend;
if (type->tt_type == VAR_LIST if (dest_type == VAR_LIST
&& ((type_T **)stack->ga_data)[stack->ga_len - 1]->tt_type && ((type_T **)stack->ga_data)[stack->ga_len - 1]->tt_type
!= VAR_NUMBER) != VAR_NUMBER)
{ {
@@ -5954,12 +5956,12 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
else else
generate_loadvar(cctx, dest, name, lvar, type); generate_loadvar(cctx, dest, name, lvar, type);
if (type->tt_type == VAR_LIST) if (dest_type == VAR_LIST)
{ {
if (generate_instr_drop(cctx, ISN_STORELIST, 3) == FAIL) if (generate_instr_drop(cctx, ISN_STORELIST, 3) == FAIL)
goto theend; goto theend;
} }
else if (type->tt_type == VAR_DICT) else if (dest_type == VAR_DICT)
{ {
if (generate_instr_drop(cctx, ISN_STOREDICT, 3) == FAIL) if (generate_instr_drop(cctx, ISN_STOREDICT, 3) == FAIL)
goto theend; goto theend;