Mercurial > vim

diff src/vim9compile.c @ 21604:d9c45474cac1 v8.2.1352

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1352: Vim9: no error for shadowing a script-local function Commit: https://github.com/vim/vim/commit/ad486a0f0dd194826fdb733516bf0f35382c9dd7 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 1 23:22:18 2020 +0200 patch 8.2.1352: Vim9: no error for shadowing a script-local function Problem: Vim9: no error for shadowing a script-local function by a nested function. Solution: Check for script-local function. (closes #6586)
author Bram Moolenaar <Bram@vim.org>
date Sat, 01 Aug 2020 23:30:03 +0200
parents 7028f45bf0ea
children 586241ee8096
line wrap: on
line diff
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -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;
 }