To: vim_dev@googlegroups.com Subject: Patch 8.2.2997 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2997 (after 8.2 2996) Problem: Vim9: disassemble test fails. Solution: Adjust expected output. Files: src/testdir/test_vim9_disassemble.vim *** ../vim-8.2.2996/src/testdir/test_vim9_disassemble.vim 2021-06-13 14:01:22.760396977 +0200 --- src/testdir/test_vim9_disassemble.vim 2021-06-14 21:07:37.360570134 +0200 *************** *** 2146,2151 **** --- 2146,2152 ---- def s:Profiled(): string echo "profiled" + var some = "some text" return "done" enddef *************** *** 2159,2170 **** '\d PROFILE START line 1\_s*' .. '\d PUSHS "profiled"\_s*' .. '\d ECHO 1\_s*' .. ! 'return "done"\_s*' .. '\d PROFILE END\_s*' .. '\d PROFILE START line 2\_s*' .. '\d PUSHS "done"\_s*' .. ! '\d RETURN\_s*' .. ! '\d PROFILE END', res) enddef --- 2160,2176 ---- '\d PROFILE START line 1\_s*' .. '\d PUSHS "profiled"\_s*' .. '\d ECHO 1\_s*' .. ! 'var some = "some text"\_s*' .. '\d PROFILE END\_s*' .. '\d PROFILE START line 2\_s*' .. + '\d PUSHS "some text"\_s*' .. + '\d STORE $0\_s*' .. + 'return "done"\_s*' .. + '\d PROFILE END\_s*' .. + '\d PROFILE START line 3\_s*' .. '\d PUSHS "done"\_s*' .. ! '\d\+ RETURN\_s*' .. ! '\d\+ PROFILE END', res) enddef *************** *** 2172,2182 **** var res = execute('disass debug s:Profiled') assert_match('\d*_Profiled\_s*' .. 'echo "profiled"\_s*' .. ! '\d DEBUG line 1\_s*' .. '\d PUSHS "profiled"\_s*' .. '\d ECHO 1\_s*' .. 'return "done"\_s*' .. ! '\d DEBUG line 2\_s*' .. '\d PUSHS "done"\_s*' .. '\d RETURN\_s*', res) --- 2178,2192 ---- var res = execute('disass debug s:Profiled') assert_match('\d*_Profiled\_s*' .. 'echo "profiled"\_s*' .. ! '\d DEBUG line 1 varcount 0\_s*' .. '\d PUSHS "profiled"\_s*' .. '\d ECHO 1\_s*' .. + 'var some = "some text"\_s*' .. + '\d DEBUG line 2 varcount 0\_s*' .. + '\d PUSHS "some text"\_s*' .. + '\d STORE $0\_s*' .. 'return "done"\_s*' .. ! '\d DEBUG line 3 varcount 1\_s*' .. '\d PUSHS "done"\_s*' .. '\d RETURN\_s*', res) *** ../vim-8.2.2996/src/version.c 2021-06-14 20:40:33.590233925 +0200 --- src/version.c 2021-06-14 21:08:22.004415887 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2997, /**/ -- Team-building exercises come in many forms but they all trace their roots back to the prison system. In your typical team-building exercise the employees are subjected to a variety of unpleasant situations until they become either a cohesive team or a ring of car jackers. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///