Mercurial > vim

comparison src/vim9type.c @ 33933:aceaf677dd92 v9.0.2163

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.2163: Vim9: type can be assigned to list/dict Commit: https://github.com/vim/vim/commit/fa831102c38c9192edf3aaf0cbcaff9ee5e006ac Author: Ernie Rael <errael@raelity.com> Date: Thu Dec 14 20:06:39 2023 +0100 patch 9.0.2163: Vim9: type can be assigned to list/dict Problem: Vim9: type can be assigned to list/dict Solution: Prevent assigning a `type` to a `list` or `dict` closes: #13683 Signed-off-by: Ernie Rael <errael@raelity.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Thu, 14 Dec 2023 20:15:08 +0100
parents a49ae967e9ed
children 84b93d95a952
comparison
equal deleted inserted replaced
33932:4d9213d8ba23 33933:aceaf677dd92
1658 type_T *type; 1658 type_T *type;
1659 1659
1660 // Use "unknown" for an empty list or dict. 1660 // Use "unknown" for an empty list or dict.
1661 if (count == 0) 1661 if (count == 0)
1662 return &t_unknown; 1662 return &t_unknown;
1663 1663 // Find the common type from following items.
1664 // Use the first value type for the list member type, then find the common
1665 // type from following items.
1666 typep = ((type2_T *)stack->ga_data) + stack->ga_len; 1664 typep = ((type2_T *)stack->ga_data) + stack->ga_len;
1667 result = (typep -(count * skip) + skip - 1)->type_curr; 1665 result = &t_unknown;
1668 for (i = 1; i < count; ++i) 1666 for (i = 0; i < count; ++i)
1669 { 1667 {
1670 if (result == &t_any)
1671 break; // won't get more common
1672 type = (typep -((count - i) * skip) + skip - 1)->type_curr; 1668 type = (typep -((count - i) * skip) + skip - 1)->type_curr;
1673 common_type(type, result, &result, type_gap); 1669 if (check_type_is_value(type) == FAIL)
1670 return NULL;
1671 if (result != &t_any)
1672 common_type(type, result, &result, type_gap);
1674 } 1673 }
1675 1674
1676 return result; 1675 return result;
1677 } 1676 }
1678 1677