changeset 33230:d64e4106dd91 v9.0.1889

patch 9.0.1889: Vim9 static tests fail Commit: https://github.com/vim/vim/commit/0405405536f06a3bf384757be4affa9c1a07bdcd Author: Yegappan Lakshmanan <yegappan@yahoo.com> 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 <cb@256bit.org> Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
author Christian Brabandt <cb@256bit.org>
date Sun, 10 Sep 2023 18:15:05 +0200
parents 6d006f03c0e3
children 64eca35d9488
files src/testdir/test_vim9_disassemble.vim src/version.c
diffstat 2 files changed, 12 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- 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('<SNR>\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('<SNR>\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
--- 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,