Mercurial > vim
changeset 21803:e591b448a670 v8.2.1451
patch 8.2.1451: Vim9: list type at script level only uses first item
Commit: https://github.com/vim/vim/commit/41fab3eac80893fd203663fc6a7ded09b04b633f
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Aug 14 21:27:37 2020 +0200
patch 8.2.1451: Vim9: list type at script level only uses first item
Problem: Vim9: list type at script level only uses first item.
Solution: Use all members, like in a compiled function. (closes https://github.com/vim/vim/issues/6712)
Also for dictionary.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 14 Aug 2020 21:30:04 +0200 |
parents | 9c76dc7535a6 |
children | 4a77c5e2264d |
files | src/testdir/test_vim9_expr.vim src/version.c src/vim9type.c |
diffstat | 3 files changed, 55 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1498,6 +1498,27 @@ def Test_expr7_list_vim9script() let l = [11 , 22] END CheckScriptFailure(lines, 'E1068:') + + lines =<< trim END + vim9script + let l: list<number> = [234, 'x'] + END + CheckScriptFailure(lines, 'E1013:') + lines =<< trim END + vim9script + let l: list<number> = ['x', 234] + END + CheckScriptFailure(lines, 'E1013:') + lines =<< trim END + vim9script + let l: list<string> = ['x', 234] + END + CheckScriptFailure(lines, 'E1013:') + lines =<< trim END + vim9script + let l: list<string> = [234, 'x'] + END + CheckScriptFailure(lines, 'E1013:') enddef def LambdaWithComments(): func @@ -1679,6 +1700,27 @@ def Test_expr7_dict_vim9script() let d = #{one: 1 , two: 2} END CheckScriptFailure(lines, 'E1068:') + + lines =<< trim END + vim9script + let l: dict<number> = #{a: 234, b: 'x'} + END + CheckScriptFailure(lines, 'E1013:') + lines =<< trim END + vim9script + let l: dict<number> = #{a: 'x', b: 234} + END + CheckScriptFailure(lines, 'E1013:') + lines =<< trim END + vim9script + let l: dict<string> = #{a: 'x', b: 234} + END + CheckScriptFailure(lines, 'E1013:') + lines =<< trim END + vim9script + let l: dict<string> = #{a: 234, b: 'x'} + END + CheckScriptFailure(lines, 'E1013:') enddef let g:oneString = 'one'
--- 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 */ /**/ + 1451, +/**/ 1450, /**/ 1449,
--- a/src/vim9type.c +++ b/src/vim9type.c @@ -214,11 +214,17 @@ typval2type(typval_T *tv, garray_T *type if (tv->v_type == VAR_LIST) { + listitem_T *li; + if (tv->vval.v_list == NULL || tv->vval.v_list->lv_first == NULL) return &t_list_empty; - // Use the type of the first member, it is the most specific. + // Use the common type of all members. member_type = typval2type(&tv->vval.v_list->lv_first->li_tv, type_gap); + for (li = tv->vval.v_list->lv_first->li_next; li != NULL; + li = li->li_next) + common_type(typval2type(&li->li_tv, type_gap), + member_type, &member_type, type_gap); return get_list_type(member_type, type_gap); } @@ -231,10 +237,13 @@ typval2type(typval_T *tv, garray_T *type || tv->vval.v_dict->dv_hashtab.ht_used == 0) return &t_dict_empty; - // Use the type of the first value, it is the most specific. + // Use the common type of all values. dict_iterate_start(tv, &iter); dict_iterate_next(&iter, &value); member_type = typval2type(value, type_gap); + while (dict_iterate_next(&iter, &value) != NULL) + common_type(typval2type(value, type_gap), + member_type, &member_type, type_gap); return get_dict_type(member_type, type_gap); }