diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-02-23 19:11:49 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-02-23 19:11:49 +0000 |
| commit | 6e1a38745f794715dc624399c318f513b54797c4 (patch) | |
| tree | 335b5b60da1d7af6caeb2684cb3d8f4bd488ae08 | |
| parent | 33fc4a63071c03ad46636b345a814e7e6d8f4ae0 (diff) | |
| download | vim-git-6e1a38745f794715dc624399c318f513b54797c4.tar.gz | |
patch 8.2.4458: Vim9: compiling filter() call fails with unknown argumentsv8.2.4458
Problem: Vim9: compiling filter() call fails with funcref that has unknown
arguments.
Solution: Do not check the arguments if they are unknown at compile time.
(closes #9835)
| -rw-r--r-- | src/evalfunc.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_builtin.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index eb42269cf..e8ed4bab0 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -552,6 +552,8 @@ check_map_filter_arg2(type_T *type, argcontext_T *context, int is_map) t_func_exp.tt_member = &t_bool; if (args[0] == NULL) args[0] = &t_unknown; + if (type->tt_argcount == -1) + t_func_exp.tt_argcount = -1; where.wt_index = 2; return check_type(&t_func_exp, type, TRUE, where); diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index 7366b8c3f..dfec991f8 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -1340,10 +1340,21 @@ def Test_filter() enddef assert_equal([1], GetFiltered()) + var lines =<< trim END + vim9script + def Func(): list<string> + var MatchWord: func: bool = (_, v) => true + var l = ['xxx'] + return l->filter(MatchWord) + enddef + assert_equal(['xxx'], Func()) + END + v9.CheckScriptSuccess(lines) + v9.CheckDefAndScriptFailure(['filter(1.1, "1")'], ['E1013: Argument 1: type mismatch, expected list<any> but got float', 'E1251: List, Dictionary, Blob or String required for argument 1']) v9.CheckDefAndScriptFailure(['filter([1, 2], 4)'], ['E1256: String or function required for argument 2', 'E1024: Using a Number as a String']) - var lines =<< trim END + lines =<< trim END def F(i: number, v: any): string return 'bad' enddef diff --git a/src/version.c b/src/version.c index 85af24173..800925df9 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 */ /**/ + 4458, +/**/ 4457, /**/ 4456, |