diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-06-27 15:35:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-06-27 15:35:40 +0200 |
| commit | 577dc93da9ec78684576bff71328d40f24bd6dd8 (patch) | |
| tree | 0caf73aff66f09b216dab3ccb3828536b2bd33f4 | |
| parent | 4d8f476176eadfc745bcb8e143460029048f858d (diff) | |
patch 8.2.3065: Vim9: error when sourcing script twice and reusing functionv8.2.3065
Problem: Vim9: error when sourcing script twice and reusing a function
name.
Solution: Check if the function is dead. (closes #8463)
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 21 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 5 |
3 files changed, 26 insertions, 2 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 84bf907cd7..3ff34a2475 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1519,6 +1519,27 @@ def Test_vim9script_reload_noclear() delete('XExportReload') delfunc g:Values unlet g:loadCount + + lines =<< trim END + vim9script + def Inner() + enddef + END + lines->writefile('XreloadScript.vim') + source XreloadScript.vim + + lines =<< trim END + vim9script + def Outer() + def Inner() + enddef + enddef + defcompile + END + lines->writefile('XreloadScript.vim') + source XreloadScript.vim + + delete('XreloadScript.vim') enddef def Test_vim9script_reload_import() diff --git a/src/version.c b/src/version.c index 12f6648195..d07a320856 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3065, +/**/ 3064, /**/ 3063, diff --git a/src/vim9compile.c b/src/vim9compile.c index 46f543284a..e746ea9d3d 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -498,8 +498,9 @@ check_defined(char_u *p, size_t len, cctx_T *cctx, int is_arg) || (ufunc = find_func_even_dead(p, FALSE, cctx)) != NULL) { // A local or script-local function can shadow a global function. - if (ufunc == NULL || !func_is_global(ufunc) - || (p[0] == 'g' && p[1] == ':')) + if (ufunc == NULL || ((ufunc->uf_flags & FC_DEAD) == 0 + && (!func_is_global(ufunc) + || (p[0] == 'g' && p[1] == ':')))) { if (is_arg) semsg(_(e_argument_name_shadows_existing_variable_str), p); |