diff options
-rw-r--r-- | src/testdir/test_vim9_script.vim | 8 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9instr.c | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index fd07fbfae..8a4fd3b6c 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -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() diff --git a/src/version.c b/src/version.c index 6813bf6bb..530874a96 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 695, +/**/ 694, /**/ 693, diff --git a/src/vim9instr.c b/src/vim9instr.c index 9c3b2a911..600fab466 100644 --- a/src/vim9instr.c +++ b/src/vim9instr.c @@ -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); } |