aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00
Code

patch 8.2.1486: Vim9: readdir() expression doesn't accept bool

Browse Source 
Problem:    Vim9: readdir() expression doesn't accept bool.
Solution:   Merge with code for readdirex(). (closes #6737)
This commit is contained in:
Bram Moolenaar 2020-08-19 16:00:06 +02:00
parent af8822ce08
commit f8abbf37d6
3 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/filepath.c
View File

@ -1373,10 +1373,11 @@ f_pathshorten(typval_T *argvars, typval_T *rettv)
}
/*
* Evaluate "expr" (= "context") for readdir().
* Common code for readdir_checkitem() and readdirex_checkitem().
* Either "name" or "dict" is NULL.
*/
static int
readdir_checkitem(void *context, void *item)
checkitem_common(void *context, char_u *name, dict_T *dict)
{
typval_T *expr = (typval_T *)context;
typval_T save_val;
@ -1384,27 +1385,55 @@ readdir_checkitem(void *context, void *item)
typval_T argv[2];
int retval = 0;
int error = FALSE;
char_u *name = (char_u*)item;
prepare_vimvar(VV_VAL, &save_val);
set_vim_var_string(VV_VAL, name, -1);
argv[0].v_type = VAR_STRING;
argv[0].vval.v_string = name;
if (name != NULL)
{
set_vim_var_string(VV_VAL, name, -1);
argv[0].v_type = VAR_STRING;
argv[0].vval.v_string = name;
}
else
{
set_vim_var_dict(VV_VAL, dict);
argv[0].v_type = VAR_DICT;
argv[0].vval.v_dict = dict;
}
if (eval_expr_typval(expr, argv, 1, &rettv) == FAIL)
goto theend;
// We want to use -1, but also true/false should be allowed.
if (rettv.v_type == VAR_SPECIAL || rettv.v_type == VAR_BOOL)
{
rettv.v_type = VAR_NUMBER;
rettv.vval.v_number = rettv.vval.v_number == VVAL_TRUE;
}
retval = tv_get_number_chk(&rettv, &error);
if (error)
retval = -1;
clear_tv(&rettv);
theend:
set_vim_var_string(VV_VAL, NULL, 0);
if (name != NULL)
set_vim_var_string(VV_VAL, NULL, 0);
else
set_vim_var_dict(VV_VAL, NULL);
restore_vimvar(VV_VAL, &save_val);
return retval;
}
/*
* Evaluate "expr" (= "context") for readdir().
*/
static int
readdir_checkitem(void *context, void *item)
{
char_u *name = (char_u *)item;
return checkitem_common(context, name, NULL);
}
static int
readdirex_dict_arg(typval_T *tv, int *cmp)
{
@ -1477,37 +1506,9 @@ f_readdir(typval_T *argvars, typval_T *rettv)
static int
readdirex_checkitem(void *context, void *item)
{
typval_T *expr = (typval_T *)context;
typval_T save_val;
typval_T rettv;
typval_T argv[2];
int retval = 0;
int error = FALSE;
dict_T *dict = (dict_T*)item;
prepare_vimvar(VV_VAL, &save_val);
set_vim_var_dict(VV_VAL, dict);
argv[0].v_type = VAR_DICT;
argv[0].vval.v_dict = dict;
if (eval_expr_typval(expr, argv, 1, &rettv) == FAIL)
goto theend;
// We want to use -1, but also true/false should be allowed.
if (rettv.v_type == VAR_SPECIAL || rettv.v_type == VAR_BOOL)
{
rettv.v_type = VAR_NUMBER;
rettv.vval.v_number = rettv.vval.v_number == VVAL_TRUE;
}
retval = tv_get_number_chk(&rettv, &error);
if (error)
retval = -1;
clear_tv(&rettv);
theend:
set_vim_var_dict(VV_VAL, NULL);
restore_vimvar(VV_VAL, &save_val);
return retval;
return checkitem_common(context, NULL, dict);
}
/*

3
src/testdir/test_vim9_func.vim
View File

@ -1386,7 +1386,8 @@ def Test_search()
assert_equal(2, search('bar', 'W', 0, 0, {-> val == 1}))
enddef
def Test_readdirex()
def Test_readdir()
eval expand('.')->readdir({e -> e[0] !=# '.'})
eval expand('.')->readdirex({e -> e.name[0] !=# '.'})
enddef

2
src/version.c
View File

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