# HG changeset patch # User Christian Brabandt # Date 1694362505 -7200 # Node ID d64e4106dd9190343e78aea58e851bf14ca89ce8 # Parent 6d006f03c0e3d2ee773e4e8de3861ec8776e55a7 patch 9.0.1889: Vim9 static tests fail Commit: https://github.com/vim/vim/commit/0405405536f06a3bf384757be4affa9c1a07bdcd Author: Yegappan Lakshmanan Date: Sun Sep 10 18:12:56 2023 +0200 patch 9.0.1889: Vim9 static tests fail Problem: Vim9 static tests fail Solution: Fix tests, make CI happy ;) closes: #13064 Signed-off-by: Christian Brabandt Co-authored-by: Yegappan Lakshmanan diff --git a/src/testdir/test_vim9_disassemble.vim b/src/testdir/test_vim9_disassemble.vim --- a/src/testdir/test_vim9_disassemble.vim +++ b/src/testdir/test_vim9_disassemble.vim @@ -3067,17 +3067,13 @@ def Test_disassemble_interface_static_me def F1(i: I) var x: number - x = i.s_var x = i.o_var - x = i.s_var2 x = i.o_var2 enddef def F2(o: C) var x: number - x = o.s_var x = o.o_var - x = o.s_var2 x = o.o_var2 enddef @@ -3087,43 +3083,27 @@ def Test_disassemble_interface_static_me v9.CheckScriptSuccess(lines) assert_match('\d*_F1\_s*' .. 'var x: number\_s*' .. - 'x = i.s_var\_s*' .. + 'x = i.o_var\_s*' .. '0 LOAD arg\[-1\]\_s*' .. - '1 ITF_MEMBER 0 on I \[STATIC\]\_s*' .. + '1 ITF_MEMBER 0 on I\_s*' .. '2 STORE $0\_s*' .. - 'x = i.o_var\_s*' .. + 'x = i.o_var2\_s*' .. '3 LOAD arg\[-1\]\_s*' .. - '4 ITF_MEMBER 0 on I\_s*' .. + '4 ITF_MEMBER 1 on I\_s*' .. '5 STORE $0\_s*' .. - 'x = i.s_var2\_s*' .. - '6 LOAD arg\[-1\]\_s*' .. - '7 ITF_MEMBER 1 on I \[STATIC\]\_s*' .. - '8 STORE $0\_s*' .. - 'x = i.o_var2\_s*' .. - '9 LOAD arg\[-1\]\_s*' .. - '10 ITF_MEMBER 1 on I\_s*' .. - '11 STORE $0\_s*' .. - '12 RETURN void\_s*', + '6 RETURN void\_s*', g:instr1) assert_match('\d*_F2\_s*' .. 'var x: number\_s*' .. - 'x = o.s_var\_s*' .. + 'x = o.o_var\_s*' .. '0 LOAD arg\[-1\]\_s*' .. - '1 OBJ_MEMBER 0 \[STATIC\]\_s*' .. + '1 OBJ_MEMBER 0\_s*' .. '2 STORE $0\_s*' .. - 'x = o.o_var\_s*' .. + 'x = o.o_var2\_s*' .. '3 LOAD arg\[-1\]\_s*' .. - '4 OBJ_MEMBER 0\_s*' .. + '4 OBJ_MEMBER 1\_s*' .. '5 STORE $0\_s*' .. - 'x = o.s_var2\_s*' .. - '6 LOAD arg\[-1\]\_s*' .. - '7 OBJ_MEMBER 1 \[STATIC\]\_s*' .. - ' 8 STORE $0\_s*' .. - 'x = o.o_var2\_s*' .. - '9 LOAD arg\[-1\]\_s*' .. - '10 OBJ_MEMBER 1\_s*' .. - '11 STORE $0\_s*' .. - '12 RETURN void', + '6 RETURN void', g:instr2) unlet g:instr1 diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 1889, +/**/ 1888, /**/ 1887,