0
0
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00

patch 9.0.0695: failing check for dictionary type for const any

Problem:    Failing check for dictionary type for const any.
Solution:   Check for any type properly. (closes #11310)
This commit is contained in:
Bram Moolenaar
2022-10-08 14:39:36 +01:00
parent 4314e4f7da
commit 0089ce293f
3 changed files with 13 additions and 2 deletions

View File

@@ -297,6 +297,14 @@ def Test_const()
constdict->assert_equal({one: 1, two: {five: 55, six: 66}, three: 3})
END
v9.CheckDefAndScriptSuccess(lines)
# "any" type with const flag is recognized as "any"
lines =<< trim END
const dict: dict<any> = {foo: {bar: 42}}
const foo = dict.foo
assert_equal(v:t_number, type(foo.bar))
END
v9.CheckDefAndScriptSuccess(lines)
enddef
def Test_const_bang()

View File

@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
695,
/**/
694,
/**/

View File

@@ -1831,7 +1831,8 @@ generate_STRINGMEMBER(cctx_T *cctx, char_u *name, size_t len)
// check for dict type
type = get_type_on_stack(cctx, 0);
if (type->tt_type != VAR_DICT && type != &t_any && type != &t_unknown)
if (type->tt_type != VAR_DICT
&& type->tt_type != VAR_ANY && type->tt_type != VAR_UNKNOWN)
{
char *tofree;
@@ -1843,7 +1844,7 @@ generate_STRINGMEMBER(cctx_T *cctx, char_u *name, size_t len)
// change dict type to dict member type
if (type->tt_type == VAR_DICT)
{
type_T *ntype = type->tt_member == &t_unknown
type_T *ntype = type->tt_member->tt_type == VAR_UNKNOWN
? &t_any : type->tt_member;
set_type_on_stack(cctx, ntype, 0);
}