aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.1682: Vim9: const works in an unexpected way

Browse Source 
Problem:    Vim9: const works in an unexpected way.
Solution:   ":const" only disallows changing the variable, not the value.
            Make "list[0] = 9" work at the script level.
This commit is contained in:
Bram Moolenaar
2020-09-14 18:15:09 +02:00
parent 08052228a7
commit dbeecb2b6b
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/evalvars.c
View File

@@ -2945,6 +2945,7 @@ set_var_const(
char_u *varname;
hashtab_T *ht;
int is_script_local;
int vim9script = in_vim9script();
ht = find_var_ht(name, &varname);
if (ht == NULL || *varname == NUL)
@@ -2954,7 +2955,7 @@ set_var_const(
}
is_script_local = ht == get_script_local_ht();
if (in_vim9script()
if (vim9script
&& !is_script_local
&& (flags & LET_NO_COMMAND) == 0
&& name[1] == ':')
@@ -2992,7 +2993,7 @@ set_var_const(
goto failed;
}
if (is_script_local && in_vim9script())
if (is_script_local && vim9script)
{
if ((flags & LET_NO_COMMAND) == 0)
{
@@ -3088,7 +3089,7 @@ set_var_const(
if (flags & LET_IS_CONST)
di->di_flags |= DI_FLAGS_LOCK;
if (is_script_local && in_vim9script())
if (is_script_local && vim9script)
{
scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
@@ -3123,7 +3124,8 @@ set_var_const(
init_tv(tv);
}
if (flags & LET_IS_CONST)
// ":const var = val" locks the value, but not in Vim9 script
if ((flags & LET_IS_CONST) && !vim9script)
// Like :lockvar! name: lock the value and what it contains, but only
// if the reference count is up to one. That locks only literal
// values.