# HG changeset patch # User Bram Moolenaar # Date 1600632903 -7200 # Node ID 56f674e7518c6136148fea14e4087490d4bc4339 # Parent f6c0c430ce673b5a7c6d5edaab2fd8fcd54bc23c patch 8.2.1718: Vim9: :def function disallows "firstline" for no good reason Commit: https://github.com/vim/vim/commit/b816dae16dbeec91ccb6fd1c0289b86b4ad5d7b3 Author: Bram Moolenaar 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) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim --- 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') diff --git a/src/userfunc.c b/src/userfunc.c --- 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); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1718, +/**/ 1717, /**/ 1716,