Mercurial > vim
changeset 22339:56f674e7518c v8.2.1718
patch 8.2.1718: Vim9: :def function disallows "firstline" for no good reason
Commit: https://github.com/vim/vim/commit/b816dae16dbeec91ccb6fd1c0289b86b4ad5d7b3
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 20 22:04:00 2020 +0200
patch 8.2.1718: Vim9: :def function disallows "firstline" for no good reason
Problem: Vim9: :def function disallows "firstline" and "lastline" argument
names for no good reason.
Solution: Don't check the arguments for a :def function. (closes #6986)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 20 Sep 2020 22:15:03 +0200 |
| parents | f6c0c430ce67 |
| children | 0b83fa038b54 |
| files | src/testdir/test_vim9_func.vim src/userfunc.c src/version.c |
| diffstat | 3 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -486,6 +486,15 @@ def Test_assign_to_argument() CheckScriptFailure(['def Func(arg: number)', 'arg = 3', 'enddef', 'defcompile'], 'E1090:') enddef +" These argument names are reserved in legacy functions. +def WithReservedNames(firstline: string, lastline: string): string + return firstline .. lastline +enddef + +def Test_argument_names() + assert_equal('OK', WithReservedNames('O', 'K')) +enddef + def Test_call_func_defined_later() g:DefinedLater('one')->assert_equal('one') assert_fails('NotDefined("one")', 'E117:', '', 2, 'Test_call_func_defined_later')
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -66,8 +66,9 @@ one_function_arg(char_u *arg, garray_T * while (ASCII_ISALNUM(*p) || *p == '_') ++p; if (arg == p || isdigit(*arg) - || (p - arg == 9 && STRNCMP(arg, "firstline", 9) == 0) - || (p - arg == 8 && STRNCMP(arg, "lastline", 8) == 0)) + || (argtypes == NULL + && ((p - arg == 9 && STRNCMP(arg, "firstline", 9) == 0) + || (p - arg == 8 && STRNCMP(arg, "lastline", 8) == 0)))) { if (!skip) semsg(_("E125: Illegal argument: %s"), arg);