commit e15eebd202e739ec7821a0e9c2aa72a445668bb8
author Bram Moolenaar <Bram@vim.org> Tue Aug 18 19:11:38 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Aug 18 19:11:38 2020 +0200
tree d58ed5a6235ae2a87713ecb9c8553a59634687d4
parent 1d634542cf5ebcd1d5d83bd124b3e1d5e7c96c58

patch 8.2.1480: Vim9: skip expression in search() gives error

Problem:    Vim9: skip expression in search() gives error.
Solution:   use tv_get_bool() eval_expr_to_bool(). (closes #6729)

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index c800139..585975a 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -326,7 +326,7 @@
 	*error = TRUE;
 	return FALSE;
     }
-    res = (tv_get_number_chk(&rettv, error) != 0);
+    res = (tv_get_bool_chk(&rettv, error) != 0);
     clear_tv(&rettv);
     return res;
 }

src/proto/typval.pro

diff --git a/src/proto/typval.pro b/src/proto/typval.pro
index 15f9345..25ad3e6 100644
--- a/src/proto/typval.pro
+++ b/src/proto/typval.pro
@@ -7,6 +7,7 @@
 varnumber_T tv_get_number(typval_T *varp);
 varnumber_T tv_get_number_chk(typval_T *varp, int *denote);
 varnumber_T tv_get_bool(typval_T *varp);
+varnumber_T tv_get_bool_chk(typval_T *varp, int *denote);
 float_T tv_get_float(typval_T *varp);
 char_u *tv_get_string(typval_T *varp);
 char_u *tv_get_string_buf(typval_T *varp, char_u *buf);

src/testdir/test_vim9_func.vim

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 446ee4d..79fd80a 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1379,6 +1379,13 @@
   call delete('XTest_silent_echo')
 endfunc
 
+def Test_search()
+  new
+  setline(1, ['foo', 'bar'])
+  let val = 0
+  assert_equal(2, search('bar', 'W', 0, 0, {-> val == 1}))
+enddef
+
 def Fibonacci(n: number): number
   if n < 2
     return n

src/typval.c

diff --git a/src/typval.c b/src/typval.c
index 053f300..2203bc6 100644
--- a/src/typval.c
+++ b/src/typval.c
@@ -270,6 +270,17 @@
 
 }
 
+/*
+ * Get the boolean value of "varp".  This is like tv_get_number_chk(),
+ * but in Vim9 script accepts Number and Bool.
+ */
+    varnumber_T
+tv_get_bool_chk(typval_T *varp, int *denote)
+{
+    return tv_get_bool_or_number_chk(varp, denote, TRUE);
+
+}
+
 #ifdef FEAT_FLOAT
     float_T
 tv_get_float(typval_T *varp)

src/version.c

diff --git a/src/version.c b/src/version.c
index e8eb852..fc6884c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1480,
+/**/
     1479,
 /**/
     1478,