Mercurial > vim
diff src/vim9compile.c @ 26851:15913ba6363e v8.2.3954
patch 8.2.3954: Vim9: no error for shadowing if script var is declared later
Commit: https://github.com/vim/vim/commit/9a015111a56d0011ced40d98f46a9841d1457b51
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Dec 31 14:06:45 2021 +0000
patch 8.2.3954: Vim9: no error for shadowing if script var is declared later
Problem: Vim9: no error for shadowing if script var is declared later.
Solution: Check argument names when compiling a function.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 31 Dec 2021 15:15:03 +0100 |
| parents | a6ccb6ec581c |
| children | 2aeea8611342 |
line wrap: on
line diff
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -2393,6 +2393,34 @@ may_compile_assignment(exarg_T *eap, cha 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;