thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1574: Vim9: glob() doesnot take "true" as argument

Browse Source 
Problem:    Vim9: glob() doesnot take "true" as argument.
Solution:   Use tv_get_bool_chk(). (closes #6821)
This commit is contained in:
Bram Moolenaar
2020-09-02 21:53:11 +02:00
parent 67ff97ded7
commit 5892ea1511
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/filepath.c
View File

@@ -1174,14 +1174,14 @@ f_glob(typval_T *argvars, typval_T *rettv)
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
if (argvars[1].v_type != VAR_UNKNOWN) if (argvars[1].v_type != VAR_UNKNOWN)
{ {
if (tv_get_number_chk(&argvars[1], &error)) if (tv_get_bool_chk(&argvars[1], &error))
options |= WILD_KEEP_ALL; options |= WILD_KEEP_ALL;
if (argvars[2].v_type != VAR_UNKNOWN) if (argvars[2].v_type != VAR_UNKNOWN)
{ {
if (tv_get_number_chk(&argvars[2], &error)) if (tv_get_bool_chk(&argvars[2], &error))
rettv_list_set(rettv, NULL); rettv_list_set(rettv, NULL);
if (argvars[3].v_type != VAR_UNKNOWN if (argvars[3].v_type != VAR_UNKNOWN
&& tv_get_number_chk(&argvars[3], &error)) && tv_get_bool_chk(&argvars[3], &error))
options |= WILD_ALLLINKS; options |= WILD_ALLLINKS;
} }
} }

4
src/testdir/test_vim9_func.vim
View File

@@ -1509,6 +1509,10 @@ def Test_getreg()
assert_equal(lines, getreg('a', true, true)) assert_equal(lines, getreg('a', true, true))
enddef enddef
def Test_glob()
assert_equal(['runtest.vim'], glob('runtest.vim', true, true, true))
enddef
def Test_recursive_call() def Test_recursive_call()
assert_equal(6765, Fibonacci(20)) assert_equal(6765, Fibonacci(20))
enddef enddef

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1574,
/**/ /**/
1573, 1573,
/**/ /**/