diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-12-31 14:06:45 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-12-31 14:06:45 +0000 |
commit | 9a015111a56d0011ced40d98f46a9841d1457b51 (patch) | |
tree | cff90a781fffeb1df2a23b9146b548084f4008ce | |
parent | 6ad84ab3e48d9490e4139df04f2c55b136f5501d (diff) | |
download | vim-git-9a015111a56d0011ced40d98f46a9841d1457b51.tar.gz |
patch 8.2.3954: Vim9: no error for shadowing if script var is declared laterv8.2.3954
Problem: Vim9: no error for shadowing if script var is declared later.
Solution: Check argument names when compiling a function.
-rw-r--r-- | src/testdir/test_vim9_assign.vim | 6 | ||||
-rw-r--r-- | src/testdir/test_vim9_func.vim | 12 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9compile.c | 31 |
4 files changed, 48 insertions, 3 deletions
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index f02da7fe4..683180995 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -853,8 +853,8 @@ def Test_assignment_partial() var nres: any var sres: any - def Func(n: number, s = '') - nres = n + def Func(nr: number, s = '') + nres = nr sres = s enddef @@ -869,7 +869,7 @@ def Test_assignment_partial() lines =<< trim END vim9script - def Func(n: number, s = '') + def Func(nr: number, s = '') enddef var n: number diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 7b2f5016c..1cdf7d480 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -951,6 +951,7 @@ def Test_call_wrong_args() END CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected string but got list<unknown>', 5) + # argument name declared earlier is found when declaring a function lines =<< trim END vim9script var name = 'piet' @@ -960,6 +961,17 @@ def Test_call_wrong_args() END CheckScriptFailure(lines, 'E1168:') + # argument name declared later is only found when compiling + lines =<< trim END + vim9script + def FuncOne(name: string) + echo nr + enddef + var name = 'piet' + END + CheckScriptSuccess(lines) + CheckScriptFailure(lines + ['defcompile'], 'E1168:') + lines =<< trim END vim9script def FuncOne(nr: number) diff --git a/src/version.c b/src/version.c index 1e955c41d..9c1725240 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3954, +/**/ 3953, /**/ 3952, diff --git a/src/vim9compile.c b/src/vim9compile.c index 272368e76..041837830 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -2393,6 +2393,34 @@ may_compile_assignment(exarg_T *eap, char_u **line, cctx_T *cctx) return NOTDONE; } +/* + * Check if arguments of "ufunc" shadow variables in "cctx". + * Return OK or FAIL. + */ + static int +check_args_shadowing(ufunc_T *ufunc, cctx_T *cctx) +{ + int i; + char_u *arg; + int r = OK; + + // Make sure arguments are not found when compiling a second time. + ufunc->uf_args_visible = 0; + + // Check for arguments shadowing variables from the context. + for (i = 0; i < ufunc->uf_args.ga_len; ++i) + { + arg = ((char_u **)(ufunc->uf_args.ga_data))[i]; + if (check_defined(arg, STRLEN(arg), cctx, TRUE) == FAIL) + { + r = FAIL; + break; + } + } + ufunc->uf_args_visible = ufunc->uf_args.ga_len; + return r; +} + /* * Add a function to the list of :def functions. @@ -2525,6 +2553,9 @@ compile_def_function( estack_push_ufunc(ufunc, 1); estack_compiling = TRUE; + if (check_args_shadowing(ufunc, &cctx) == FAIL) + goto erret; + if (ufunc->uf_def_args.ga_len > 0) { int count = ufunc->uf_def_args.ga_len; |