patch 8.2.2000: Vim9: dict.key assignment not implemented yet
Problem: Vim9: dict.key assignment not implemented yet.
Solution: Implement dict.key assignment. (closes #7312)
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 24f62d8..0acf6c3 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -408,6 +408,15 @@
# overwrite
dict3['key'] = 'another'
+ assert_equal(dict3, #{key: 'another'})
+ dict3.key = 'yet another'
+ assert_equal(dict3, #{key: 'yet another'})
+
+ var lines =<< trim END
+ var dd = #{one: 1}
+ dd.one) = 2
+ END
+ CheckDefFailure(lines, 'E15:', 2)
# empty key can be used
var dd = {}
@@ -418,7 +427,7 @@
var somedict = rand() > 0 ? #{a: 1, b: 2} : #{a: 'a', b: 'b'}
# assignment to script-local dict
- var lines =<< trim END
+ lines =<< trim END
vim9script
var test: dict<any> = {}
def FillDict(): dict<any>
diff --git a/src/version.c b/src/version.c
index ec1abe6..a988b21 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2000,
+/**/
1999,
/**/
1998,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 8dc9744..6b2b766 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -5384,14 +5384,14 @@
member_type = type;
if (var_end > var_start + varlen)
{
- // Something follows after the variable: "var[idx]".
+ // Something follows after the variable: "var[idx]" or "var.key".
if (is_decl)
{
emsg(_(e_cannot_use_index_when_declaring_variable));
goto theend;
}
- if (var_start[varlen] == '[')
+ if (var_start[varlen] == '[' || var_start[varlen] == '.')
{
has_index = TRUE;
if (type->tt_member == NULL)
@@ -5635,21 +5635,33 @@
{
int r;
- // Compile the "idx" in "var[idx]".
+ // Compile the "idx" in "var[idx]" or "key" in "var.key".
if (new_local)
--cctx->ctx_locals.ga_len;
- p = skipwhite(var_start + varlen + 1);
- r = compile_expr0(&p, cctx);
+ p = var_start + varlen;
+ if (*p == '[')
+ {
+ p = skipwhite(p + 1);
+ r = compile_expr0(&p, cctx);
+ if (r == OK && *skipwhite(p) != ']')
+ {
+ // this should not happen
+ emsg(_(e_missbrac));
+ r = FAIL;
+ }
+ }
+ else // if (*p == '.')
+ {
+ char_u *key_end = to_name_end(p + 1, TRUE);
+ char_u *key = vim_strnsave(p + 1, key_end - p - 1);
+
+ r = generate_PUSHS(cctx, key);
+ }
if (new_local)
++cctx->ctx_locals.ga_len;
if (r == FAIL)
goto theend;
- if (*skipwhite(p) != ']')
- {
- // this should not happen
- emsg(_(e_missbrac));
- goto theend;
- }
+
if (type == &t_any)
{
type_T *idx_type = ((type_T **)stack->ga_data)[