Mercurial > vim
changeset 32586:304341915488 v9.0.1625
patch 9.0.1625: "super" is not considered a reserved name
Commit: https://github.com/vim/vim/commit/ce723f391844695a07d9af02ef60330afd3e158c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 10 19:00:12 2023 +0100
patch 9.0.1625: "super" is not considered a reserved name
Problem: "super" is not considered a reserved name.
Solution: Add "super" to the list of reserved names. (closes https://github.com/vim/vim/issues/12515)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 10 Jun 2023 20:15:04 +0200 |
| parents | c06d20c2d3af |
| children | 2ab810fbff1f |
| files | src/testdir/test_vim9_assign.vim src/userfunc.c src/version.c src/vim9script.c |
| diffstat | 4 files changed, 31 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -311,6 +311,8 @@ def Test_reserved_name() for name in ['true', 'false', + 'this', + 'super', 'null', 'null_blob', 'null_dict', @@ -322,6 +324,15 @@ def Test_reserved_name() v9.CheckDefExecAndScriptFailure(['var ' .. name .. ' = 0'], 'E1034:') v9.CheckDefExecAndScriptFailure(['var ' .. name .. ': bool'], 'E1034:') endfor + + var lines =<< trim END + vim9script + def Foo(super: bool) + echo 'something' + enddef + defcompile + END + v9.CheckScriptFailure(lines, 'E1034:') enddef def Test_null_values() @@ -1526,6 +1537,7 @@ def Test_assignment_failure() v9.CheckDefFailure(['var false = 1'], 'E1034:') v9.CheckDefFailure(['var null = 1'], 'E1034:') v9.CheckDefFailure(['var this = 1'], 'E1034:') + v9.CheckDefFailure(['var super = 1'], 'E1034:') v9.CheckDefFailure(['[a; b; c] = g:list'], 'E1001:') v9.CheckDefFailure(['var [a; b; c] = g:list'], 'E1080:')
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -86,12 +86,23 @@ one_function_arg( return arg; } - // Vim9 script: cannot use script var name for argument. In function: also - // check local vars and arguments. - if (!skip && argtypes != NULL && check_defined(arg, p - arg, - evalarg == NULL ? NULL : evalarg->eval_cctx, + // Extra checks in Vim9 script. + if (!skip && argtypes != NULL) + { + int c = *p; + *p = NUL; + int r = check_reserved_name(arg, FALSE); + *p = c; + if (r == FAIL) + return arg; + + // Cannot use script var name for argument. In function: also check + // local vars and arguments. + if (check_defined(arg, p - arg, + evalarg == NULL ? NULL : evalarg->eval_cctx, eap == NULL ? NULL : eap->cstack, TRUE) == FAIL) - return arg; + return arg; + } if (newargs != NULL && ga_grow(newargs, 1) == FAIL) return arg;