aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1351: Vim9: no proper error if using namespace for nested function

Browse Source 
Problem:    Vim9: no proper error if using namespace for nested function.
Solution:   Specifically check for a namespace. (closes #6582)
This commit is contained in:
Bram Moolenaar 2020-08-01 22:35:13 +02:00
parent b9a2cac3ef
commit bcbf41395f
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/testdir/test_vim9_func.vim
View File

@ -131,6 +131,8 @@ def Test_nested_function()
CheckDefFailure(['def Nested(arg: string)', 'enddef', 'Nested()'], 'E119:') CheckDefFailure(['def Nested(arg: string)', 'enddef', 'Nested()'], 'E119:')
CheckDefFailure(['func Nested()', 'endfunc'], 'E1086:') CheckDefFailure(['func Nested()', 'endfunc'], 'E1086:')
CheckDefFailure(['def s:Nested()', 'enddef'], 'E1075:')
CheckDefFailure(['def b:Nested()', 'enddef'], 'E1075:')
enddef enddef
func Test_call_default_args_from_func() func Test_call_default_args_from_func()

2
src/version.c
View File

@ -754,6 +754,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 */
/**/
1351,
/**/ /**/
1350, 1350,
/**/ /**/

8
src/vim9compile.c
View File

@ -4899,12 +4899,18 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx)
{ {
int is_global = *eap->arg == 'g' && eap->arg[1] == ':'; int is_global = *eap->arg == 'g' && eap->arg[1] == ':';
char_u *name_start = eap->arg; char_u *name_start = eap->arg;
char_u *name_end = to_name_end(eap->arg, is_global); char_u *name_end = to_name_end(eap->arg, TRUE);
char_u *lambda_name; char_u *lambda_name;
lvar_T *lvar; lvar_T *lvar;
ufunc_T *ufunc; ufunc_T *ufunc;
int r; int r;
// Only g:Func() can use a namespace.
if (name_start[1] == ':' && !is_global)
{
semsg(_(e_namespace), name_start);
return NULL;
}
if (check_defined(name_start, name_end - name_start, cctx) == FAIL) if (check_defined(name_start, name_end - name_start, cctx) == FAIL)
return NULL; return NULL;