From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 6 Sep 2020 14:09:04 +0000 (+0200)
Subject: patch 8.2.1624: Vim9: cannot pass "true" to split(), str2nr() and strchars()
X-Git-Tag: v8.2.1624
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3986b94b090ea258109630008611230a599999ab;p=vim

patch 8.2.1624: Vim9: cannot pass "true" to split(), str2nr() and strchars()

Problem:    Vim9: cannot pass "true" to split(), str2nr() and strchars().
Solution:   Use tv_get_bool_chk(). (closes #6884, closes #6885, closes #6886)
---

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 810769ae2..e7683fc3d 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -7884,7 +7884,7 @@ f_split(typval_T *argvars, typval_T *rettv)
 	if (pat == NULL)
 	    typeerr = TRUE;
 	if (argvars[2].v_type != VAR_UNKNOWN)
-	    keepempty = (int)tv_get_number_chk(&argvars[2], &typeerr);
+	    keepempty = (int)tv_get_bool_chk(&argvars[2], &typeerr);
     }
     if (pat == NULL || *pat == NUL)
 	pat = (char_u *)"[\\x01- ]\\+";
@@ -8030,7 +8030,7 @@ f_str2nr(typval_T *argvars, typval_T *rettv)
 	    emsg(_(e_invarg));
 	    return;
 	}
-	if (argvars[2].v_type != VAR_UNKNOWN && tv_get_number(&argvars[2]))
+	if (argvars[2].v_type != VAR_UNKNOWN && tv_get_bool(&argvars[2]))
 	    what |= STR2NR_QUOTE;
     }
 
@@ -8155,12 +8155,12 @@ f_strlen(typval_T *argvars, typval_T *rettv)
 f_strchars(typval_T *argvars, typval_T *rettv)
 {
     char_u		*s = tv_get_string(&argvars[0]);
-    int			skipcc = 0;
+    int			skipcc = FALSE;
     varnumber_T		len = 0;
     int			(*func_mb_ptr2char_adv)(char_u **pp);
 
     if (argvars[1].v_type != VAR_UNKNOWN)
-	skipcc = (int)tv_get_number_chk(&argvars[1], NULL);
+	skipcc = (int)tv_get_bool(&argvars[1]);
     if (skipcc < 0 || skipcc > 1)
 	emsg(_(e_invarg));
     else
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index a27776773..e31551714 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1636,6 +1636,18 @@ def Test_spellsuggest()
   endif
 enddef
 
+def Test_split()
+  split('  aa  bb  ', '\W\+', true)->assert_equal(['', 'aa', 'bb', ''])
+enddef
+
+def Test_str2nr()
+  str2nr("1'000'000", 10, true)->assert_equal(1000000)
+enddef
+
+def Test_strchars()
+  strchars("A\u20dd", true)->assert_equal(1)
+enddef
+
 def Test_synID()
   new
   setline(1, "text")
diff --git a/src/version.c b/src/version.c
index ae775d9b8..6a6d99488 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1624,
 /**/
     1623,
 /**/