From dd0b287c1ec8314034a2dbb14c4267994c47520c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 24 Jul 2021 15:44:30 +0200 Subject: [PATCH] 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. --- src/testdir/test_vim9_builtin.vim | 12 ++++++++++-- src/version.c | 2 ++ src/vim9compile.c | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index 6b64823f5..d983c34e0 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -2569,9 +2569,17 @@ def Test_searchpair() 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 76c6db9bc..49e4b609c 100644 --- 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 */ +/**/ + 3210, /**/ 3209, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index 5ec3b3d39..2df5ff4f4 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -3315,7 +3315,7 @@ compile_arguments(char_u **arg, cctx_T *cctx, int *argcount, int is_searchpair) 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; -- 2.40.0