patch 8.2.3015: Vim9: Assigning to @# requires a string
Problem: Vim9: Assigning to @# requires a string. (Naohiro Ono)
Solution: Accent a number or a string. (closes #8396)
diff --git a/src/globals.h b/src/globals.h
index 77ea169..07acc26 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -418,6 +418,9 @@
EXTERN type_T t_job INIT6(VAR_JOB, 0, 0, TTFLAG_STATIC, NULL, NULL);
EXTERN type_T t_channel INIT6(VAR_CHANNEL, 0, 0, TTFLAG_STATIC, NULL, NULL);
+// Special value used for @#.
+EXTERN type_T t_number_or_string INIT6(VAR_STRING, 0, 0, TTFLAG_STATIC, NULL, NULL);
+
EXTERN type_T t_func_unknown INIT6(VAR_FUNC, -1, 0, TTFLAG_STATIC, &t_unknown, NULL);
EXTERN type_T t_func_void INIT6(VAR_FUNC, -1, 0, TTFLAG_STATIC, &t_void, NULL);
EXTERN type_T t_func_any INIT6(VAR_FUNC, -1, 0, TTFLAG_STATIC, &t_any, NULL);
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 7b7b623..1cbdcfb 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -1820,6 +1820,19 @@
CheckDefAndScriptSuccess(lines)
enddef
+def Test_assign_alt_buf_register()
+ var lines =<< trim END
+ edit 'file_b1'
+ var b1 = bufnr()
+ edit 'file_b2'
+ var b2 = bufnr()
+ assert_equal(b1, bufnr('#'))
+ @# = b2
+ assert_equal(b2, bufnr('#'))
+ END
+ CheckDefAndScriptSuccess(lines)
+enddef
+
def Test_script_funcref_case()
var lines =<< trim END
var Len = (s: string): number => len(s) + 1
diff --git a/src/version.c b/src/version.c
index 99c086f..4f33d35 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3015,
+/**/
3014,
/**/
3013,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 404c819..e4656c9 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -5852,7 +5852,7 @@
return FAIL;
}
*dest = dest_reg;
- *type = &t_string;
+ *type = name[1] == '#' ? &t_number_or_string : &t_string;
}
else if (STRNCMP(name, "g:", 2) == 0)
{
@@ -5927,7 +5927,8 @@
case dest_env:
return generate_STORE(cctx, ISN_STOREENV, 0, name + 1);
case dest_reg:
- return generate_STORE(cctx, ISN_STOREREG, name[1], NULL);
+ return generate_STORE(cctx, ISN_STOREREG,
+ name[1] == '@' ? '"' : name[1], NULL);
case dest_vimvar:
return generate_STORE(cctx, ISN_STOREV, vimvaridx, NULL);
case dest_script:
@@ -6843,9 +6844,19 @@
goto theend;
}
}
- else if (*p != '=' && need_type(rhs_type, lhs.lhs_member_type,
+ else
+ {
+ type_T *lhs_type = lhs.lhs_member_type;
+
+ // Special case: assigning to @# can use a number or a
+ // string.
+ if (lhs_type == &t_number_or_string
+ && rhs_type->tt_type == VAR_NUMBER)
+ lhs_type = &t_number;
+ if (*p != '=' && need_type(rhs_type, lhs_type,
-1, 0, cctx, FALSE, FALSE) == FAIL)
goto theend;
+ }
}
else if (cmdidx == CMD_final)
{
diff --git a/src/vim9execute.c b/src/vim9execute.c
index fabce4d..2577e63 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2182,8 +2182,7 @@
--ectx->ec_stack.ga_len;
tv = STACK_TV_BOT(0);
- write_reg_contents(reg == '@' ? '"' : reg,
- tv_get_string(tv), -1, FALSE);
+ write_reg_contents(reg, tv_get_string(tv), -1, FALSE);
clear_tv(tv);
}
break;