diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim index c7a0fbefa7..0c11c078e7 100644 --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -11839,4 +11839,31 @@ def Test_uninitialized_object_var() v9.CheckSourceFailure(lines, "E1430: Uninitialized object variable 'x' referenced") enddef +" Test for initializing member variables of compound type in the constructor +def Test_constructor_init_compound_member_var() + var lines =<< trim END + vim9script + + class Foo + var v1: string = "aaa" + var v2: list = [1, 2] + var v3: dict = {a: 'a', b: 'b'} + endclass + + class Bar + var v4: string = "bbb" + var v5: Foo = Foo.new() + var v6: list = [1, 2] + endclass + + var b: Bar = Bar.new() + assert_equal("aaa", b.v5.v1) + assert_equal([1, 2], b.v5.v2) + assert_equal({a: 'a', b: 'b'}, b.v5.v3) + assert_equal("bbb", b.v4) + assert_equal([1, 2], b.v6) + END + v9.CheckSourceSuccess(lines) +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c index dc04ffc093..e8feb96f40 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 992, /**/ 991, /**/ diff --git a/src/vim9execute.c b/src/vim9execute.c index dde95b5115..d6962804b3 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -4855,6 +4855,7 @@ exec_instructions(ectx_T *ectx) + iptr->isn_arg.jumparg.jump_arg_off + STACK_FRAME_SIZE; type_T *t = ufunc->uf_arg_types[argidx]; + CLEAR_POINTER(tv); tv->v_type = t->tt_type; }