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

patch 8.2.1352: Vim9: no error for shadowing a script-local function

Browse Source 
Problem:    Vim9: no error for shadowing a script-local function by a nested
            function.
Solution:   Check for script-local function. (closes #6586)
This commit is contained in:
Bram Moolenaar
2020-08-01 23:22:18 +02:00
parent bcbf41395f
commit ad486a0f0d
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vim9compile.c
View File

@@ -291,15 +291,21 @@ lookup_script(char_u *name, size_t len)
int
check_defined(char_u *p, size_t len, cctx_T *cctx)
{
int c = p[len];
p[len] = NUL;
if (lookup_script(p, len) == OK
|| (cctx != NULL
&& (lookup_local(p, len, cctx) != NULL
|| lookup_arg(p, len, NULL, NULL, NULL, cctx) == OK))
|| find_imported(p, len, cctx) != NULL)
|| find_imported(p, len, cctx) != NULL
|| find_func_even_dead(p, FALSE, cctx) != NULL)
{
p[len] = c;
semsg(_(e_already_defined), p);
return FAIL;
}
p[len] = c;
return OK;
}