From ace6132aa8c5fce9d4965e1f2e3a42071815b9de Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 26 Jul 2020 18:16:58 +0200 Subject: [PATCH] patch 8.2.1301: Vim9: varargs argument type not parsed properly Problem: Vim9: varargs argument type not parsed properly. Solution: Skip over the "...". (issue #6507) --- src/testdir/test_vim9_func.vim | 13 +++++++++++++ src/version.c | 2 ++ src/vim9compile.c | 2 ++ 3 files changed, 17 insertions(+) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index ade1fd145..0d39d5764 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) + g:echo = l + enddef + let Funcref: func(...list) = 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 68c7cf501..248143440 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1301, /**/ 1300, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index 1354a38b2..31e761284 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 -- 2.50.1