To: vim_dev@googlegroups.com
Subject: Patch 8.2.3984
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.3984 (after 8.2.3981)
Problem:    Debugger test fails.
Solution:   Adjust the test for modified debugging of a for loop.
Files:      src/testdir/test_debugger.vim


*** ../vim-8.2.3983/src/testdir/test_debugger.vim	2021-12-27 17:21:38.020449109 +0000
--- src/testdir/test_debugger.vim	2022-01-02 17:28:21.484033408 +0000
***************
*** 1120,1137 ****
    call RunDbgCmd(buf, 'echo text', ['asdf'])
    call RunDbgCmd(buf, 'echo nr', ['42'])
    call RunDbgCmd(buf, 'echo items', ['[1, 2, 3]'])
!   call RunDbgCmd(buf, 'step', ['asdf42', 'function FuncWithArgs', 'line 2: for it in items'])
!   call RunDbgCmd(buf, 'echo it', ['1'])
    call RunDbgCmd(buf, 'step', ['line 3: echo it'])
    call RunDbgCmd(buf, 'step', ['1', 'function FuncWithArgs', 'line 4: endfor'])
    call RunDbgCmd(buf, 'step', ['line 2: for it in items'])
!   call RunDbgCmd(buf, 'echo it', ['2'])
    call RunDbgCmd(buf, 'step', ['line 3: echo it'])
    call RunDbgCmd(buf, 'step', ['2', 'function FuncWithArgs', 'line 4: endfor'])
    call RunDbgCmd(buf, 'step', ['line 2: for it in items'])
!   call RunDbgCmd(buf, 'echo it', ['3'])
    call RunDbgCmd(buf, 'step', ['line 3: echo it'])
    call RunDbgCmd(buf, 'step', ['3', 'function FuncWithArgs', 'line 4: endfor'])
    call RunDbgCmd(buf, 'step', ['line 5: echo "done"'])
    call RunDbgCmd(buf, 'cont')
  
--- 1120,1140 ----
    call RunDbgCmd(buf, 'echo text', ['asdf'])
    call RunDbgCmd(buf, 'echo nr', ['42'])
    call RunDbgCmd(buf, 'echo items', ['[1, 2, 3]'])
!   call RunDbgCmd(buf, 'step', ['asdf42', 'function FuncWithArgs', 'line 2:   for it in items'])
!   call RunDbgCmd(buf, 'step', ['function FuncWithArgs', 'line 2: for it in items'])
!   call RunDbgCmd(buf, 'echo it', ['0'])
    call RunDbgCmd(buf, 'step', ['line 3: echo it'])
+   call RunDbgCmd(buf, 'echo it', ['1'])
    call RunDbgCmd(buf, 'step', ['1', 'function FuncWithArgs', 'line 4: endfor'])
    call RunDbgCmd(buf, 'step', ['line 2: for it in items'])
!   call RunDbgCmd(buf, 'echo it', ['1'])
    call RunDbgCmd(buf, 'step', ['line 3: echo it'])
    call RunDbgCmd(buf, 'step', ['2', 'function FuncWithArgs', 'line 4: endfor'])
    call RunDbgCmd(buf, 'step', ['line 2: for it in items'])
!   call RunDbgCmd(buf, 'echo it', ['2'])
    call RunDbgCmd(buf, 'step', ['line 3: echo it'])
    call RunDbgCmd(buf, 'step', ['3', 'function FuncWithArgs', 'line 4: endfor'])
+   call RunDbgCmd(buf, 'step', ['line 2: for it in items'])
    call RunDbgCmd(buf, 'step', ['line 5: echo "done"'])
    call RunDbgCmd(buf, 'cont')
  
***************
*** 1149,1159 ****
    call RunDbgCmd(buf, 'cont')
  
    call RunDbgCmd(buf, ':breakadd func 2 FuncForLoop')
!   call RunDbgCmd(buf, ':call FuncForLoop()', ['function FuncForLoop', 'line 2: for i in [11, 22, 33]'])
!   call RunDbgCmd(buf, 'echo i', ['11'])
    call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 3: eval i + 2'])
    call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 4: endfor'])
    call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 2: for i in [11, 22, 33]'])
    call RunDbgCmd(buf, 'echo i', ['22'])
  
    call RunDbgCmd(buf, 'breakdel *')
--- 1152,1164 ----
    call RunDbgCmd(buf, 'cont')
  
    call RunDbgCmd(buf, ':breakadd func 2 FuncForLoop')
!   call RunDbgCmd(buf, ':call FuncForLoop()', ['function FuncForLoop', 'line 2:   for i in [11, 22, 33]'])
!   call RunDbgCmd(buf, 'step', ['line 2: for i in [11, 22, 33]'])
    call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 3: eval i + 2'])
+   call RunDbgCmd(buf, 'echo i', ['11'])
    call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 4: endfor'])
    call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 2: for i in [11, 22, 33]'])
+   call RunDbgCmd(buf, 'next', ['line 3: eval i + 2'])
    call RunDbgCmd(buf, 'echo i', ['22'])
  
    call RunDbgCmd(buf, 'breakdel *')
*** ../vim-8.2.3983/src/version.c	2022-01-02 17:00:37.006093299 +0000
--- src/version.c	2022-01-02 17:28:39.516031843 +0000
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     3984,
  /**/

-- 
Press any key to continue, press any other key to quit.

 /// 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    ///