diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-07-26 18:16:58 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-07-26 18:16:58 +0200 |
commit | ace6132aa8c5fce9d4965e1f2e3a42071815b9de (patch) | |
tree | cc92dd05609e704d2dbacf886e5c656a7465408e /src | |
parent | 4fc224ca1cf2a8991c5ea17682a742c6ad5ad0f3 (diff) |
patch 8.2.1301: Vim9: varargs argument type not parsed properlyv8.2.1301
Problem: Vim9: varargs argument type not parsed properly.
Solution: Skip over the "...". (issue #6507)
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_vim9_func.vim | 13 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9compile.c | 2 |
3 files changed, 17 insertions, 0 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index ade1fd1459..0d39d57649 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -363,6 +363,19 @@ def Test_call_funcref() assert_equal(123, g:echo) END CheckScriptSuccess(lines) + + lines =<< trim END + vim9script + def EchoList(...l: list<number>) + g:echo = l + enddef + let Funcref: func(...list<number>) = function('EchoList') + Funcref() + assert_equal([], g:echo) + Funcref(1, 2, 3) + assert_equal([1, 2, 3], g:echo) + END + CheckScriptSuccess(lines) enddef let SomeFunc = function('len') diff --git a/src/version.c b/src/version.c index 68c7cf5013..2481434407 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 */ /**/ + 1301, +/**/ 1300, /**/ 1299, diff --git a/src/vim9compile.c b/src/vim9compile.c index 1354a38b2c..31e761284e 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -1956,6 +1956,8 @@ skip_type(char_u *start, int optional) { char_u *sp = p; + if (STRNCMP(p, "...", 3) == 0) + p += 3; p = skip_type(p, TRUE); if (p == sp) return p; // syntax error |