diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-08-23 15:21:55 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-08-23 15:21:55 +0200 |
commit | 8436773fad285215481c4ce2b32692e66fca599f (patch) | |
tree | 06e0f314b50b1051d747101adeee5c269fe6585f /src | |
parent | dc0cf1db3e8e0de349e4cc5b0a7ab6c8b7dc2ebb (diff) |
patch 8.2.1515: Vim9: can create s:var in legacy script but cannot unletv8.2.1515
Problem: Vim9: can create s:var in legacy script but cannot unlet.
Solution: Allow :unlet for legacy script var.
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_vim9_script.vim | 7 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9compile.c | 15 |
3 files changed, 22 insertions, 2 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 5a251473cd..05b4e9f022 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -608,6 +608,13 @@ def Test_unlet() assert_false(exists('g:somevar')) unlet! g:somevar + # also works for script-local variable in legacy Vim script + s:somevar = 'legacy' + assert_true(exists('s:somevar')) + unlet s:somevar + assert_false(exists('s:somevar')) + unlet! s:somevar + call CheckScriptFailure([ 'vim9script', 'let svar = 123', diff --git a/src/version.c b/src/version.c index 02457eb5e9..65b9d0fd72 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1515, +/**/ 1514, /**/ 1513, diff --git a/src/vim9compile.c b/src/vim9compile.c index e4b7d44adb..c0cea2992c 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -259,6 +259,15 @@ lookup_arg( } /* + * Returnd TRUE if the script context is Vim9 script. + */ + static int +script_is_vim9() +{ + return SCRIPT_ITEM(current_sctx.sc_sid)->sn_version == SCRIPT_VERSION_VIM9; +} + +/* * Lookup a variable in the current script. * If "vim9script" is TRUE the script must be Vim9 script. Used for "var" * without "s:". @@ -271,8 +280,7 @@ lookup_script(char_u *name, size_t len, int vim9script) hashtab_T *ht = &SCRIPT_VARS(current_sctx.sc_sid); dictitem_T *di; - if (vim9script && SCRIPT_ITEM(current_sctx.sc_sid)->sn_version - != SCRIPT_VERSION_VIM9) + if (vim9script && !script_is_vim9()) return FAIL; cc = name[len]; name[len] = NUL; @@ -5234,6 +5242,9 @@ check_vim9_unlet(char_u *name) { if (name[1] != ':' || vim_strchr((char_u *)"gwtb", *name) == NULL) { + // "unlet s:var" is allowed in legacy script. + if (*name == 's' && !script_is_vim9()) + return OK; semsg(_(e_cannot_unlet_str), name); return FAIL; } |