Mercurial > vim
changeset 22216:f9b4576a618b v8.2.1657
patch 8.2.1657: Vim9: no proper error for nested ":def!"
Commit: https://github.com/vim/vim/commit/8b848cafb0a88f8d8e8f46caa8d67431b4faa374
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 10 22:28:01 2020 +0200
patch 8.2.1657: Vim9: no proper error for nested ":def!"
Problem: Vim9: no proper error for nested ":def!".
Solution: Check for "!". (closes https://github.com/vim/vim/issues/6920)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 10 Sep 2020 22:30:03 +0200 |
parents | c22b939fc581 |
children | 50b1e250f302 |
files | src/errors.h src/testdir/test_vim9_func.vim src/version.c src/vim9compile.c |
diffstat | 4 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -256,4 +256,6 @@ EXTERN char e_assert_fails_fourth_argume INIT(= N_("E1115: assert_fails() fourth argument must be a number")); EXTERN char e_assert_fails_fifth_argument[] INIT(= N_("E1116: assert_fails() fifth argument must be a string")); +EXTERN char e_cannot_use_bang_with_nested_def[] + INIT(= N_("E1117: Cannot use ! with nested :def")); #endif
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -134,6 +134,23 @@ def Test_nested_function() CheckDefFailure(['func Nested()', 'endfunc'], 'E1086:') CheckDefFailure(['def s:Nested()', 'enddef'], 'E1075:') CheckDefFailure(['def b:Nested()', 'enddef'], 'E1075:') + + CheckDefFailure([ + 'def Outer()', + ' def Inner()', + ' # comment', + ' enddef', + ' def Inner()', + ' enddef', + 'enddef'], 'E1073:') + CheckDefFailure([ + 'def Outer()', + ' def Inner()', + ' # comment', + ' enddef', + ' def! Inner()', + ' enddef', + 'enddef'], 'E1117:') enddef func Test_call_default_args_from_func()
--- 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 */ /**/ + 1657, +/**/ 1656, /**/ 1655,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4320,6 +4320,12 @@ compile_nested_function(exarg_T *eap, cc ufunc_T *ufunc; int r; + if (*name_start == '!') + { + emsg(_(e_cannot_use_bang_with_nested_def)); + return NULL; + } + // Only g:Func() can use a namespace. if (name_start[1] == ':' && !is_global) {