changeset 27235:6b80d4acac8e v8.2.4146

patch 8.2.4146: Vim9: shadowed function can be used in compiled function Commit: https://github.com/vim/vim/commit/f67c717e34e5553ab1c3b02b1861274cbcb78935 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jan 19 17:23:05 2022 +0000 patch 8.2.4146: Vim9: shadowed function can be used in compiled function Problem: Vim9: shadowed function can be used in compiled function but not at script level. Solution: Also give an error in a compiled function. (closes #9563)
author Bram Moolenaar <Bram@vim.org>
date Wed, 19 Jan 2022 18:30:07 +0100
parents 01767caa86b2
children 6cf6cf88dc33
files src/version.c src/vim9expr.c
diffstat 2 files changed, 17 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4146,
+/**/
     4145,
 /**/
     4144,
--- a/src/vim9expr.c
+++ b/src/vim9expr.c
@@ -668,6 +668,21 @@ compile_call(
     int		res = FAIL;
     int		is_autoload;
     int		is_searchpair;
+    imported_T	*import;
+
+    if (varlen >= sizeof(namebuf))
+    {
+	semsg(_(e_name_too_long_str), name);
+	return FAIL;
+    }
+    vim_strncpy(namebuf, *arg, varlen);
+
+    import = find_imported(name, varlen, FALSE, cctx);
+    if (import != NULL)
+    {
+	semsg(_(e_cannot_use_str_itself_it_is_imported), namebuf);
+	return FAIL;
+    }
 
     // We can evaluate "has('name')" at compile time.
     // We always evaluate "exists_compiled()" at compile time.
@@ -713,12 +728,6 @@ compile_call(
     if (generate_ppconst(cctx, ppconst) == FAIL)
 	return FAIL;
 
-    if (varlen >= sizeof(namebuf))
-    {
-	semsg(_(e_name_too_long_str), name);
-	return FAIL;
-    }
-    vim_strncpy(namebuf, *arg, varlen);
     name = fname_trans_sid(namebuf, fname_buf, &tofree, &error);
 
     // We handle the "skip" argument of searchpair() and searchpairpos()