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

patch 9.0.2072: Vim9: no nr2str conversion in list-unpack

Browse Source 
Problem:  Vim9: no nr2str conversion in list-unpack
Solution: Generate 2STRING instruction to convert dict index to string

Generate instruction to convert dict index to a string

fixes:  #13417
closes: #13424

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
Yegappan Lakshmanan
2023-10-26 23:05:07 +02:00
committed by Christian Brabandt
parent 10407df7a9
commit c229a6ac07
5 changed files with 161 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vim9compile.c
View File

@@ -2040,9 +2040,7 @@ compile_lhs(
lhs->lhs_member_type = m->ocm_type;
}
else
{
lhs->lhs_member_type = lhs->lhs_type->tt_member;
}
}
return OK;
}
@@ -2220,16 +2218,27 @@ compile_load_lhs(
return FAIL;
}
if (lhs->lhs_type->tt_type == VAR_DICT && var_start[varlen] == '[')
{
// If the lhs is a Dict variable and an item is accessed by "[",
// then need to convert the key into a string. The top item in the
// type stack is the Dict and the second last item is the key.
if (may_generate_2STRING(-2, FALSE, cctx) == FAIL)
return FAIL;
}
// Now we can properly check the type. The variable is indexed, thus
// we need the member type. For a class or object we don't know the
// type yet, it depends on what member is used.
// The top item in the stack is the Dict, followed by the key and then
// the type of the value.
vartype_T vartype = lhs->lhs_type->tt_type;
type_T *member_type = lhs->lhs_type->tt_member;
if (rhs_type != NULL && member_type != NULL
&& vartype != VAR_OBJECT && vartype != VAR_CLASS
&& rhs_type != &t_void
&& need_type(rhs_type, member_type, FALSE,
-2, 0, cctx, FALSE, FALSE) == FAIL)
-3, 0, cctx, FALSE, FALSE) == FAIL)
return FAIL;
}
else