patch 8.2.3210: Vim9: searchpair() sixth argument is compiled
Problem: Vim9: searchpair() sixth argument is compiled. (Yegappan
Lakshmanan)
Solution: Only compile the fifth argument.
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index 6b64823..d983c34 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -2569,9 +2569,17 @@
unlet g:caught
lines =<< trim END
- echo searchpair("a", "b", "c", "d", "1", "f")
+ echo searchpair("a", "b", "c", "d", "f", 33)
END
- CheckDefAndScriptFailure2(lines, 'E1001:', 'E475:')
+ CheckDefAndScriptFailure2(lines, 'E1001: Variable not found: f', 'E475: Invalid argument: d')
+
+ lines =<< trim END
+ def TestPair()
+ echo searchpair("a", "b", "c", "d", "1", "f")
+ enddef
+ defcompile
+ END
+ CheckScriptSuccess(lines)
bwipe!
enddef
diff --git a/src/version.c b/src/version.c
index 76c6db9..49e4b60 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3210,
+/**/
3209,
/**/
3208,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 5ec3b3d..2df5ff4 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3315,7 +3315,7 @@
return FAIL;
++*argcount;
- if (is_searchpair && *argcount >= 5
+ if (is_searchpair && *argcount == 5
&& cctx->ctx_instr.ga_len == instr_count + 1)
{
isn_T *isn = ((isn_T *)cctx->ctx_instr.ga_data) + instr_count;