Mercurial > vim
changeset 22322:a5b16c9eee9d v8.2.1710
patch 8.2.1710: Vim9: list of list type can be wrong
Commit: https://github.com/vim/vim/commit/77b20977dc31ecf753dddad7a7c7b8f7b6e0c244
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 19 14:12:34 2020 +0200
patch 8.2.1710: Vim9: list of list type can be wrong
Problem: Vim9: list of list type can be wrong.
Solution: Use VAR_UNKNOWN for empty list. Recognize VAR_UNKNOWN when
looking for a common type. (closes #6979)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 19 Sep 2020 14:15:04 +0200 |
| parents | 44ebaac84a54 |
| children | bf31e05d3fec |
| files | src/testdir/test_vim9_expr.vim src/version.c src/vim9type.c |
| diffstat | 3 files changed, 28 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1513,6 +1513,10 @@ def Test_expr7_list() 2] [3, 4] + let llstring: list<list<string>> = [['text'], []] + llstring = [[], ['text']] + llstring = [[], []] + CheckDefFailure(["let x = 1234[3]"], 'E1107:', 1) CheckDefExecFailure(["let x = g:anint[3]"], 'E1062:', 1) @@ -1718,6 +1722,14 @@ def Test_expr7_dict() mixed = #{a: 234} mixed = #{} + let dictlist: dict<list<string>> = #{absent: [], present: ['hi']} + dictlist = #{absent: ['hi'], present: []} + dictlist = #{absent: [], present: []} + + let dictdict: dict<dict<string>> = #{one: #{a: 'text'}, two: #{}} + dictdict = #{one: #{}, two: #{a: 'text'}} + dictdict = #{one: #{}, two: #{}} + CheckDefFailure(["let x = #{a:8}"], 'E1069:', 1) CheckDefFailure(["let x = #{a : 8}"], 'E1068:', 1) CheckDefFailure(["let x = #{a :8}"], 'E1068:', 1)
--- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1710, +/**/ 1709, /**/ 1708,
--- a/src/vim9type.c +++ b/src/vim9type.c @@ -869,6 +869,19 @@ common_type(type_T *type1, type_T *type2 return; } + // If either is VAR_UNKNOWN use the other type. An empty list/dict has no + // specific type. + if (type1->tt_type == VAR_UNKNOWN) + { + *dest = type2; + return; + } + if (type2->tt_type == VAR_UNKNOWN) + { + *dest = type1; + return; + } + if (type1->tt_type == type2->tt_type) { if (type1->tt_type == VAR_LIST || type2->tt_type == VAR_DICT) @@ -932,7 +945,7 @@ get_member_type_from_stack( // Use "any" for an empty list or dict. if (count == 0) - return &t_void; + return &t_unknown; // Use the first value type for the list member type, then find the common // type from following items.