Mercurial > vim
diff src/vim9compile.c @ 25057:ffc3e1164652 v8.2.3065
patch 8.2.3065: Vim9: error when sourcing script twice and reusing function
Commit: https://github.com/vim/vim/commit/577dc93da9ec78684576bff71328d40f24bd6dd8
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jun 27 15:35:40 2021 +0200
patch 8.2.3065: Vim9: error when sourcing script twice and reusing function
Problem: Vim9: error when sourcing script twice and reusing a function
name.
Solution: Check if the function is dead. (closes #8463)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 27 Jun 2021 15:45:03 +0200 |
| parents | 8d660d1cca8d |
| children | 671ded1facd5 |
line wrap: on
line diff
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -498,8 +498,9 @@ check_defined(char_u *p, size_t len, cct || (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);