aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 9.0.0202: code and help for indexof() is not ideal

Browse Source 
Problem:    Code and help for indexof() is not ideal.
Solution:   Refactor the code, improve the help. (Yegappan Lakshmanan,
            closes #10908)
This commit is contained in:
Yegappan Lakshmanan
2022-08-13 21:35:13 +01:00
committed by Bram Moolenaar
parent 9113c2cd19
commit 3fbf6cd355
4 changed files with 109 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
src/evalfunc.c
View File

@@ -6818,17 +6818,90 @@ indexof_eval_expr(typval_T *expr)
return error ? FALSE : found;
}
/*
* Evaluate 'expr' for each byte in the Blob 'b' starting with the byte at
* 'startidx' and return the index of the byte where 'expr' is TRUE. Returns
* -1 if 'expr' doesn't evaluate to TRUE for any of the bytes.
*/
static int
indexof_blob(blob_T *b, long startidx, typval_T *expr)
{
long idx = 0;
if (b == NULL)
return -1;
if (startidx < 0)
{
// negative index: index from the last byte
startidx = blob_len(b) + startidx;
if (startidx < 0)
startidx = 0;
}
set_vim_var_type(VV_KEY, VAR_NUMBER);
set_vim_var_type(VV_VAL, VAR_NUMBER);
for (idx = startidx; idx < blob_len(b); ++idx)
{
set_vim_var_nr(VV_KEY, idx);
set_vim_var_nr(VV_VAL, blob_get(b, idx));
if (indexof_eval_expr(expr))
return idx;
}
return -1;
}
/*
* Evaluate 'expr' for each item in the List 'l' starting with the item at
* 'startidx' and return the index of the item where 'expr' is TRUE. Returns
* -1 if 'expr' doesn't evaluate to TRUE for any of the items.
*/
static int
indexof_list(list_T *l, long startidx, typval_T *expr)
{
listitem_T *item;
long idx = 0;
if (l == NULL)
return -1;
CHECK_LIST_MATERIALIZE(l);
if (startidx == 0)
item = l->lv_first;
else
{
// Start at specified item. Use the cached index that list_find()
// sets, so that a negative number also works.
item = list_find(l, startidx);
if (item != NULL)
idx = l->lv_u.mat.lv_idx;
}
set_vim_var_type(VV_KEY, VAR_NUMBER);
for ( ; item != NULL; item = item->li_next, ++idx)
{
set_vim_var_nr(VV_KEY, idx);
copy_tv(&item->li_tv, get_vim_var_tv(VV_VAL));
if (indexof_eval_expr(expr))
return idx;
}
return -1;
}
/*
* "indexof()" function
*/
static void
f_indexof(typval_T *argvars, typval_T *rettv)
{
list_T *l;
listitem_T *item;
blob_T *b;
long startidx = 0;
long idx = 0;
typval_T save_val;
typval_T save_key;
int save_did_emsg;
@@ -6857,67 +6930,12 @@ f_indexof(typval_T *argvars, typval_T *rettv)
did_emsg = FALSE;
if (argvars[0].v_type == VAR_BLOB)
{
b = argvars[0].vval.v_blob;
if (b == NULL)
goto theend;
if (startidx < 0)
{
startidx = blob_len(b) + startidx;
if (startidx < 0)
startidx = 0;
}
set_vim_var_type(VV_KEY, VAR_NUMBER);
set_vim_var_type(VV_VAL, VAR_NUMBER);
for (idx = startidx; idx < blob_len(b); ++idx)
{
set_vim_var_nr(VV_KEY, idx);
set_vim_var_nr(VV_VAL, blob_get(b, idx));
if (indexof_eval_expr(&argvars[1]))
{
rettv->vval.v_number = idx;
break;
}
}
}
rettv->vval.v_number = indexof_blob(argvars[0].vval.v_blob, startidx,
&argvars[1]);
else
{
l = argvars[0].vval.v_list;
if (l == NULL)
goto theend;
rettv->vval.v_number = indexof_list(argvars[0].vval.v_list, startidx,
&argvars[1]);
CHECK_LIST_MATERIALIZE(l);
if (startidx == 0)
item = l->lv_first;
else
{
// Start at specified item. Use the cached index that list_find()
// sets, so that a negative number also works.
item = list_find(l, startidx);
if (item != NULL)
idx = l->lv_u.mat.lv_idx;
}
set_vim_var_type(VV_KEY, VAR_NUMBER);
for ( ; item != NULL; item = item->li_next, ++idx)
{
set_vim_var_nr(VV_KEY, idx);
copy_tv(&item->li_tv, get_vim_var_tv(VV_VAL));
if (indexof_eval_expr(&argvars[1]))
{
rettv->vval.v_number = idx;
break;
}
}
}
theend:
restore_vimvar(VV_KEY, &save_key);
restore_vimvar(VV_VAL, &save_val);
did_emsg |= save_did_emsg;

11
src/testdir/test_vim9_builtin.vim
View File

@@ -2067,10 +2067,17 @@ def Test_index()
enddef
def Test_indexof()
var l = [{color: 'red'}, {color: 'blue'}, {color: 'green'}]
indexof(l, (i, v) => v.color == 'green')->assert_equal(2)
var l = [{color: 'red'}, {color: 'blue'}, {color: 'green'}, {color: 'blue'}]
indexof(l, (i, v) => v.color == 'blue')->assert_equal(1)
indexof(l, (i, v) => v.color == 'blue', {startidx: 1})->assert_equal(1)
indexof(l, (i, v) => v.color == 'blue', {startidx: 2})->assert_equal(3)
var b = 0zdeadbeef
indexof(b, "v:val == 0xef")->assert_equal(3)
def TestIdx(k: number, v: dict<any>): bool
return v.color == 'blue'
enddef
indexof(l, TestIdx)->assert_equal(1)
enddef
def Test_input()

2
src/version.c
View File

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