Mercurial > vim
changeset 25212:79eb112b492d v8.2.3142
patch 8.2.3142: Vim9: type check for has_key() argument is too strict
Commit: https://github.com/vim/vim/commit/1aeddeb8bd29a69fa118734c7f27d7df1b37801f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 11 14:55:49 2021 +0200
patch 8.2.3142: Vim9: type check for has_key() argument is too strict
Problem: Vim9: type check for has_key() argument is too strict.
Solution: Also allow for a number key argument. (closes https://github.com/vim/vim/issues/8542)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 11 Jul 2021 15:00:03 +0200 |
parents | 578a919a67ab |
children | e1995fcc0a37 |
files | src/evalfunc.c src/testdir/test_vim9_builtin.vim src/version.c |
diffstat | 3 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -446,6 +446,7 @@ argcheck_T arg2_number[] = {arg_number, argcheck_T arg2_string[] = {arg_string, arg_string}; argcheck_T arg2_list_nr[] = {arg_list_number, arg_list_number}; argcheck_T arg2_dict_string[] = {arg_dict_any, arg_string}; +argcheck_T arg2_dict_string_or_nr[] = {arg_dict_any, arg_string_or_nr}; argcheck_T arg2_string_dict[] = {arg_string, arg_dict_any}; argcheck_T arg2_listblob_item[] = {arg_list_or_blob, arg_item_of_prev}; argcheck_T arg2_execute[] = {arg_string_or_list, arg_string}; @@ -1109,7 +1110,7 @@ static funcentry_T global_functions[] = ret_any, f_globpath}, {"has", 1, 2, 0, NULL, ret_number_bool, f_has}, - {"has_key", 2, 2, FEARG_1, arg2_dict_string, + {"has_key", 2, 2, FEARG_1, arg2_dict_string_or_nr, ret_number_bool, f_has_key}, {"haslocaldir", 0, 2, FEARG_1, arg2_number, ret_number, f_haslocaldir},
--- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -1131,6 +1131,12 @@ def Test_has() enddef def Test_has_key() + var d = {123: 'xx'} + assert_true(has_key(d, '123')) + assert_true(has_key(d, 123)) + assert_false(has_key(d, 'x')) + assert_false(has_key(d, 99)) + CheckDefAndScriptFailure2(['has_key([1, 2], "k")'], 'E1013: Argument 1: type mismatch, expected dict<any> but got list<number>', 'E715: Dictionary required') CheckDefAndScriptFailure2(['has_key({"a": 10}, ["a"])'], 'E1013: Argument 2: type mismatch, expected string but got list<string>', 'E730: Using a List as a String') enddef