Mercurial > vim
changeset 26931:6cdf92e77a91 v8.2.3994
patch 8.2.3994: Vim9: extend() complains about type when it was not declared
Commit: https://github.com/vim/vim/commit/ad8f2485856eadb931ebd1f633ca366a40e415b8
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jan 3 16:52:28 2022 +0000
patch 8.2.3994: Vim9: extend() complains about type when it was not declared
Problem: Vim9: extend() complains about the type even when it was not
declared.
Solution: Only check the list or dict type when it was declared.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 03 Jan 2022 18:00:03 +0100 |
parents | a84aeabd7722 |
children | db2a59d62a69 |
files | src/list.c src/testdir/test_vim9_builtin.vim src/version.c |
diffstat | 3 files changed, 26 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/list.c +++ b/src/list.c @@ -2758,25 +2758,26 @@ list_extend_func( extend(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg, int is_new) { type_T *type = NULL; - garray_T type_list; char *func_name = is_new ? "extendnew()" : "extend()"; - if (!is_new && in_vim9script()) + if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST) { - // Check that extend() does not change the type of the dict. - ga_init2(&type_list, sizeof(type_T *), 10); - type = typval2type(argvars, get_copyID(), &type_list, TVTT_DO_MEMBER); + // Check that extend() does not change the type of the list if it was + // declared. + if (!is_new && in_vim9script() && argvars[0].vval.v_list != NULL) + type = argvars[0].vval.v_list->lv_type; + list_extend_func(argvars, type, func_name, arg_errmsg, is_new, rettv); } - - if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST) - list_extend_func(argvars, type, func_name, arg_errmsg, is_new, rettv); else if (argvars[0].v_type == VAR_DICT && argvars[1].v_type == VAR_DICT) + { + // Check that extend() does not change the type of the list if it was + // declared. + if (!is_new && in_vim9script() && argvars[0].vval.v_dict != NULL) + type = argvars[0].vval.v_dict->dv_type; dict_extend_func(argvars, type, func_name, arg_errmsg, is_new, rettv); + } else semsg(_(e_argument_of_str_must_be_list_or_dictionary), func_name); - - if (type != NULL) - clear_type_list(&type_list); } /*
--- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -974,15 +974,25 @@ def Test_extend_arg_types() assert_equal({a: 1, b: 2}, extend({a: 1, b: 2}, {b: 4}, 'keep')) assert_equal({a: 1, b: 2}, extend({a: 1, b: 2}, {b: 4}, g:string_keep)) + # mix of types is OK without a declaration + var res: list<dict<any>> extend(res, mapnew([1, 2], (_, v) => ({}))) assert_equal([{}, {}], res) END CheckDefAndScriptSuccess(lines) + # FIXME: this should not fail when compiled + lines =<< trim END + vim9script + assert_equal([1, 2, "x"], extend([1, 2], ["x"])) + assert_equal([1, "b", 1], extend([1], ["b", 1])) + END + CheckScriptSuccess(lines) + CheckDefAndScriptFailure(['extend("a", 1)'], ['E1013: Argument 1: type mismatch, expected list<any> but got string', 'E712: Argument of extend() must be a List or Dictionary']) CheckDefAndScriptFailure(['extend([1, 2], 3)'], ['E1013: Argument 2: type mismatch, expected list<number> but got number', 'E712: Argument of extend() must be a List or Dictionary']) - CheckDefAndScriptFailure(['extend([1, 2], ["x"])'], ['E1013: Argument 2: type mismatch, expected list<number> but got list<string>', 'E1013: Argument 2: type mismatch, expected list<number> but got list<string>']) + CheckDefAndScriptFailure(['var ll = [1, 2]', 'extend(ll, ["x"])'], ['E1013: Argument 2: type mismatch, expected list<number> but got list<string>', 'E1013: Argument 2: type mismatch, expected list<number> but got list<string>']) CheckDefFailure(['extend([1, 2], [3], "x")'], 'E1013: Argument 3: type mismatch, expected number but got string') CheckDefFailure(['extend({a: 1}, 42)'], 'E1013: Argument 2: type mismatch, expected dict<number> but got number') @@ -992,7 +1002,7 @@ def Test_extend_arg_types() CheckDefFailure(['extend([1], ["b"])'], 'E1013: Argument 2: type mismatch, expected list<number> but got list<string>') CheckDefExecFailure(['extend([1], ["b", 1])'], 'E1013: Argument 2: type mismatch, expected list<number> but got list<any>') - CheckScriptFailure(['vim9script', 'extend([1], ["b", 1])'], 'E1013: Argument 2: type mismatch, expected list<number> but got list<any> in extend()') + CheckScriptFailure(['vim9script', 'var l = [1]', 'extend(l, ["b", 1])'], 'E1013: Argument 2: type mismatch, expected list<number> but got list<any> in extend()') enddef func g:ExtendDict(d)