# HG changeset patch # User Bram Moolenaar # Date 1595177103 -7200 # Node ID 62339482daabfa5d8aef25215e123562ccf3e7db # Parent f8d5637942eff819f1bd686f588b62a6021d566f patch 8.2.1249: Vim9: disassemble test fails Commit: https://github.com/vim/vim/commit/747f11ad6ecad4dd85ce386a0a539cb853fec41a Author: Bram Moolenaar Date: Sun Jul 19 18:38:37 2020 +0200 patch 8.2.1249: Vim9: disassemble test fails Problem: Vim9: disassemble test fails. Solution: Change INDEX to LISTINDEX. Add test for STRINDEX. 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 @@ -898,6 +898,27 @@ def Test_disassemble_concat() assert_equal('aabb', ConcatString()) enddef +def StringIndex(): number + let s = "abcd" + let res = s[1] + return res +enddef + +def Test_disassemble_string_index() + let instr = execute('disassemble StringIndex') + assert_match('StringIndex\_s*' .. + 'let s = "abcd"\_s*' .. + '\d PUSHS "abcd"\_s*' .. + '\d STORE $0\_s*' .. + 'let res = s\[1]\_s*' .. + '\d LOAD $0\_s*' .. + '\d PUSHNR 1\_s*' .. + '\d STRINDEX\_s*' .. + '\d STORE $1\_s*', + instr) + assert_equal('b', StringIndex()) +enddef + def ListIndex(): number let l = [1, 2, 3] let res = l[1] @@ -916,7 +937,7 @@ def Test_disassemble_list_index() 'let res = l\[1]\_s*' .. '\d LOAD $0\_s*' .. '\d PUSHNR 1\_s*' .. - '\d INDEX\_s*' .. + '\d LISTINDEX\_s*' .. '\d STORE $1\_s*', instr) assert_equal(2, ListIndex()) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1249, +/**/ 1248, /**/ 1247,