thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.1302: Vim9: varargs arg after optional arg does not work

Browse Source 
Problem:    Vim9: varargs arg after optional arg does not work
Solution:   Check for the "..." first. (issue #6507)
This commit is contained in:
Bram Moolenaar 2020-07-26 18:33:09 +02:00
parent ace6132aa8
commit 01865ade85
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/testdir/test_vim9_func.vim
View File

@ -376,6 +376,28 @@ def Test_call_funcref()
assert_equal([1, 2, 3], g:echo)
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
def OptAndVar(nr: number, opt = 12, ...l: list<number>): number
g:optarg = opt
g:listarg = l
return nr
enddef
let Funcref: func(number, ?number, ...list<number>): number = function('OptAndVar')
assert_equal(10, Funcref(10))
assert_equal(12, g:optarg)
assert_equal([], g:listarg)
assert_equal(11, Funcref(11, 22))
assert_equal(22, g:optarg)
assert_equal([], g:listarg)
assert_equal(17, Funcref(17, 18, 1, 2, 3))
assert_equal(18, g:optarg)
assert_equal([1, 2, 3], g:listarg)
END
CheckScriptSuccess(lines)
enddef
let SomeFunc = function('len')

2
src/version.c
View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1302,
/**/
1301,
/**/

10
src/vim9compile.c
View File

@ -2106,16 +2106,16 @@ parse_type(char_u **arg, garray_T *type_gap)
first_optional = argcount;
++p;
}
else if (first_optional != -1)
{
emsg(_("E1007: mandatory argument after optional argument"));
return &t_any;
}
else if (STRNCMP(p, "...", 3) == 0)
{
flags |= TTFLAG_VARARGS;
p += 3;
}
else if (first_optional != -1)
{
emsg(_("E1007: mandatory argument after optional argument"));
return &t_any;
}
arg_type[argcount++] = parse_type(&p, type_gap);