diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-08-07 15:35:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-08-07 15:35:36 +0200 |
| commit | 6ce46b99635877fb0a17c06a6f5625fbc1ffa6f4 (patch) | |
| tree | 26d8fdc7f508a50bef742841e38976d3687e6737 | |
| parent | 7de62623735d228c8f81f6ac8309fe4922822cb2 (diff) | |
| download | vim-git-6ce46b99635877fb0a17c06a6f5625fbc1ffa6f4.tar.gz | |
patch 8.2.3308: Vim9: no runtime check for argument type with varargs onlyv8.2.3308
Problem: Vim9: no runtime check for argument type if a function only has
varargs.
Solution: Also check argument types if uf_va_type is set. (closes #8715)
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9execute.c | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 5fdd71792..5704511df 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1149,6 +1149,18 @@ def Test_call_def_varargs() enddef END CheckScriptFailure(lines, 'E1160:') + + lines =<< trim END + vim9script + def DoIt() + g:Later('') + enddef + defcompile + def g:Later(...l: list<number>) + enddef + DoIt() + END + CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected number but got string') enddef let s:value = '' diff --git a/src/version.c b/src/version.c index 9d5ede555..867d894a2 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3308, +/**/ 3307, /**/ 3306, diff --git a/src/vim9execute.c b/src/vim9execute.c index 690b7e0b6..b72881512 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -893,7 +893,7 @@ call_by_name( if (ufunc != NULL) { - if (ufunc->uf_arg_types != NULL) + if (ufunc->uf_arg_types != NULL || ufunc->uf_va_type != NULL) { int i; typval_T *argv = STACK_TV_BOT(0) - argcount; @@ -904,7 +904,7 @@ call_by_name( { type_T *type = NULL; - if (i < ufunc->uf_args.ga_len) + if (i < ufunc->uf_args.ga_len && ufunc->uf_arg_types != NULL) type = ufunc->uf_arg_types[i]; else if (ufunc->uf_va_type != NULL) type = ufunc->uf_va_type->tt_member; |