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

patch 8.2.3015: Vim9: Assigning to @# requires a string

Browse Source 
Problem:    Vim9: Assigning to @# requires a string. (Naohiro Ono)
Solution:   Accent a number or a string. (closes #8396)
This commit is contained in:
Bram Moolenaar
2021-06-17 21:03:07 +02:00
parent 6e9695525e
commit 74f4a965bc
5 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vim9compile.c
View File

@@ -5852,7 +5852,7 @@ get_var_dest(
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 @@ generate_store_var(
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 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
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)
{