Patch 8.2.3138

[Bram Moolenaar]

Patch 8.2.3138 (after 8.2.3137)
Problem: Debugger test fails.
Solution: Adjust eval command.
Files: src/testdir/test_debugger.vim


*** ../vim-8.2.3137/src/testdir/test_debugger.vim 2021-07-07 20:10:40.628454961 +0200
--- src/testdir/test_debugger.vim 2021-07-10 20:43:16.938111676 +0200
***************
*** 1006,1012 ****
}
# comment
def Inner()
! eval 1
enddef
enddef

--- 1006,1012 ----
}
# comment
def Inner()
! eval 1 + 2
enddef
enddef

***************
*** 1019,1034 ****
enddef

def g:FuncForLoop()
! eval 1
for i in [11, 22, 33]
! eval i
endfor
echo "done"
enddef

def g:FuncWithSplitLine()
! eval 1
! | eval 2
enddef
END
call writefile(file, 'Xtest.vim')
--- 1019,1034 ----
enddef

def g:FuncForLoop()
! eval 1 + 2
for i in [11, 22, 33]
! eval i + 2
endfor
echo "done"
enddef

def g:FuncWithSplitLine()
! eval 1 + 2
! | eval 2 + 3
enddef
END
call writefile(file, 'Xtest.vim')
***************
*** 1080,1086 ****
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'])
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'])
--- 1080,1086 ----
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'])
***************
*** 1089,1095 ****
call RunDbgCmd(buf, 'cont')

call RunDbgCmd(buf, ':breakadd func FuncWithSplitLine')
! call RunDbgCmd(buf, ':call FuncWithSplitLine()', ['function FuncWithSplitLine', 'line 1: eval 1 | eval 2'])

call RunDbgCmd(buf, 'cont')
call StopVimInTerminal(buf)
--- 1089,1095 ----
call RunDbgCmd(buf, 'cont')

call RunDbgCmd(buf, ':breakadd func FuncWithSplitLine')
! call RunDbgCmd(buf, ':call FuncWithSplitLine()', ['function FuncWithSplitLine', 'line 1: eval 1 + 2 | eval 2 + 3'])

call RunDbgCmd(buf, 'cont')
call StopVimInTerminal(buf)
*** ../vim-8.2.3137/src/version.c 2021-07-10 19:41:59.916341599 +0200
--- src/version.c 2021-07-10 20:43:49.962053053 +0200
***************
*** 757,758 ****
--- 757,760 ----
{ /* Add new patch number below this line */
+ /**/
+ 3138,
/**/

--
In a world without walls and borders, who needs windows and gates?

/// Bram Moolenaar -- Br...@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 ///