aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.1657: Vim9: no proper error for nested ":def!"

Browse Source 
Problem:    Vim9: no proper error for nested ":def!".
Solution:   Check for "!". (closes #6920)
This commit is contained in:
Bram Moolenaar
2020-09-10 22:28:01 +02:00
parent dfa3d5524e
commit 8b848cafb0
4 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/errors.h
View File

@@ -256,4 +256,6 @@ EXTERN char e_assert_fails_fourth_argument[]
INIT(= N_("E1115: assert_fails() fourth argument must be a number")); INIT(= N_("E1115: assert_fails() fourth argument must be a number"));
EXTERN char e_assert_fails_fifth_argument[] EXTERN char e_assert_fails_fifth_argument[]
INIT(= N_("E1116: assert_fails() fifth argument must be a string")); 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 #endif

17
src/testdir/test_vim9_func.vim
View File

@@ -134,6 +134,23 @@ def Test_nested_function()
CheckDefFailure(['func Nested()', 'endfunc'], 'E1086:') CheckDefFailure(['func Nested()', 'endfunc'], 'E1086:')
CheckDefFailure(['def s:Nested()', 'enddef'], 'E1075:') CheckDefFailure(['def s:Nested()', 'enddef'], 'E1075:')
CheckDefFailure(['def b: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 enddef
func Test_call_default_args_from_func() func Test_call_default_args_from_func()

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1657,
/**/ /**/
1656, 1656,
/**/ /**/

6
src/vim9compile.c
View File

@@ -4320,6 +4320,12 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx)
ufunc_T *ufunc; ufunc_T *ufunc;
int r; int r;
if (*name_start == '!')
{
emsg(_(e_cannot_use_bang_with_nested_def));
return NULL;
}
// Only g:Func() can use a namespace. // Only g:Func() can use a namespace.
if (name_start[1] == ':' && !is_global) if (name_start[1] == ':' && !is_global)
{ {