diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-01 22:35:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-01 22:35:13 +0200 |
| commit | bcbf41395f93aabd577a17dc4fbabe523d0a7ce8 (patch) | |
| tree | 9cc9270de87f65cb8ad127fb663ba937fcff9cf8 | |
| parent | b9a2cac3ef293bfdfe80dea6c6d16d02b7af5435 (diff) | |
patch 8.2.1351: Vim9: no proper error if using namespace for nested functionv8.2.1351
Problem: Vim9: no proper error if using namespace for nested function.
Solution: Specifically check for a namespace. (closes #6582)
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 85fd8ff4e0..1ccaeb308a 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -131,6 +131,8 @@ def Test_nested_function() CheckDefFailure(['def Nested(arg: string)', 'enddef', 'Nested()'], 'E119:') CheckDefFailure(['func Nested()', 'endfunc'], 'E1086:') + CheckDefFailure(['def s:Nested()', 'enddef'], 'E1075:') + CheckDefFailure(['def b:Nested()', 'enddef'], 'E1075:') enddef func Test_call_default_args_from_func() diff --git a/src/version.c b/src/version.c index 00d8c2dab6..f032581c0c 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1351, +/**/ 1350, /**/ 1349, diff --git a/src/vim9compile.c b/src/vim9compile.c index 6581708bc9..61be54d7b7 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4899,12 +4899,18 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx) { int is_global = *eap->arg == 'g' && eap->arg[1] == ':'; 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; lvar_T *lvar; ufunc_T *ufunc; 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) return NULL; |