Mercurial > vim
changeset 24077:5006d95ef82d v8.2.2580
patch 8.2.2580: Vim9: checking vararg type may be wrong
Commit: https://github.com/vim/vim/commit/e3ffcd9902efc756178900d9bd972c74a09c3fcd
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Mar 8 21:47:13 2021 +0100
patch 8.2.2580: Vim9: checking vararg type may be wrong
Problem: Vim9: checking vararg type is wrong when function is auto-loaded.
Solution: Use the member type. (closes https://github.com/vim/vim/issues/7933)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 08 Mar 2021 22:00:03 +0100 |
parents | 2828d6cfb0b1 |
children | c7c23ae596ef |
files | src/testdir/test_vim9_script.vim src/version.c src/vim9execute.c |
diffstat | 3 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -3154,6 +3154,10 @@ def Test_vim9_autoload() return 'test' enddef g:some#name = 'name' + + def some#varargs(a1: string, ...l: list<string>): string + return a1 .. l[0] .. l[1] + enddef END mkdir('Xdir/autoload', 'p') @@ -3166,6 +3170,8 @@ def Test_vim9_autoload() g:some#other = 'other' assert_equal('other', g:some#other) + assert_equal('abc', some#varargs('a', 'b', 'c')) + # upper case script name works lines =<< trim END vim9script
--- 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 */ /**/ + 2580, +/**/ 2579, /**/ 2578,
--- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -807,9 +807,12 @@ call_by_name(char_u *name, int argcount, // types are correct. for (i = 0; i < argcount; ++i) { - type_T *type = i < ufunc->uf_args.ga_len - ? ufunc->uf_arg_types[i] : ufunc->uf_va_type; - + type_T *type = NULL; + + if (i < ufunc->uf_args.ga_len) + type = ufunc->uf_arg_types[i]; + else if (ufunc->uf_va_type != NULL) + type = ufunc->uf_va_type->tt_member; if (type != NULL && check_typval_arg_type(type, &argv[i], i + 1) == FAIL) return FAIL;