mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 09:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval/typval: Make tv_list_item_remove return pointer to the next item

Browse Source
This commit is contained in:
ZyX
2017-12-24 02:41:34 +03:00
parent 608c3d7baf
commit ac55558c97
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/eval.c
View File

@@ -2904,9 +2904,7 @@ static int do_unlet_var(lval_T *const lp, char_u *const name_end, int forceit)
// Delete a range of List items. // Delete a range of List items.
while (lp->ll_li != NULL && (lp->ll_empty2 || lp->ll_n2 >= lp->ll_n1)) { while (lp->ll_li != NULL && (lp->ll_empty2 || lp->ll_n2 >= lp->ll_n1)) {
li = TV_LIST_ITEM_NEXT(lp->ll_list, lp->ll_li); lp->ll_li = tv_list_item_remove(lp->ll_list, lp->ll_li);
tv_list_item_remove(lp->ll_list, lp->ll_li);
lp->ll_li = li;
lp->ll_n1++; lp->ll_n1++;
} }
} else { } else {
@@ -8467,7 +8465,6 @@ static void findfilendir(typval_T *argvars, typval_T *rettv, int find_what)
static void filter_map(typval_T *argvars, typval_T *rettv, int map) static void filter_map(typval_T *argvars, typval_T *rettv, int map)
{ {
typval_T *expr; typval_T *expr;
listitem_T *li, *nli;
list_T *l = NULL; list_T *l = NULL;
dictitem_T *di; dictitem_T *di;
hashtab_T *ht; hashtab_T *ht;
@@ -8551,20 +8548,21 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map)
} else { } else {
vimvars[VV_KEY].vv_type = VAR_NUMBER; vimvars[VV_KEY].vv_type = VAR_NUMBER;
for (li = tv_list_first(l); li != NULL; li = nli) { for (listitem_T *li = tv_list_first(l); li != NULL;) {
if (map if (map
&& tv_check_lock(TV_LIST_ITEM_TV(li)->v_lock, arg_errmsg, && tv_check_lock(TV_LIST_ITEM_TV(li)->v_lock, arg_errmsg,
TV_TRANSLATE)) { TV_TRANSLATE)) {
break; break;
} }
nli = TV_LIST_ITEM_NEXT(l, li);
vimvars[VV_KEY].vv_nr = idx; vimvars[VV_KEY].vv_nr = idx;
if (filter_map_one(TV_LIST_ITEM_TV(li), expr, map, &rem) == FAIL if (filter_map_one(TV_LIST_ITEM_TV(li), expr, map, &rem) == FAIL
|| did_emsg) { || did_emsg) {
break; break;
} }
if (!map && rem) { if (!map && rem) {
tv_list_item_remove(l, li); li = tv_list_item_remove(l, li);
} else {
li = TV_LIST_ITEM_NEXT(l, li);
} }
idx++; idx++;
} }
@@ -15440,18 +15438,17 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort)
int idx = 0; int idx = 0;
for (listitem_T *li = TV_LIST_ITEM_NEXT(l, tv_list_first(l)) for (listitem_T *li = TV_LIST_ITEM_NEXT(l, tv_list_first(l))
; li != NULL ; li != NULL;) {
; li = TV_LIST_ITEM_NEXT(l, li)) {
listitem_T *const prev_li = TV_LIST_ITEM_PREV(l, li); listitem_T *const prev_li = TV_LIST_ITEM_PREV(l, li);
if (item_compare_func_ptr(&prev_li, &li) == 0) { if (item_compare_func_ptr(&prev_li, &li) == 0) {
if (info.item_compare_func_err) { if (info.item_compare_func_err) {
EMSG(_("E882: Uniq compare function failed")); EMSG(_("E882: Uniq compare function failed"));
break; break;
} }
tv_list_item_remove(l, li); li = tv_list_item_remove(l, li);
li = tv_list_find(l, idx);
} else { } else {
idx++; idx++;
li = TV_LIST_ITEM_NEXT(l, li);
} }
} }
} }

7
src/nvim/eval/typval.c
View File

@@ -64,12 +64,17 @@ static listitem_T *tv_list_item_alloc(void)
/// ///
/// @param[out] l List to remove item from. /// @param[out] l List to remove item from.
/// @param[in,out] item Item to remove. /// @param[in,out] item Item to remove.
void tv_list_item_remove(list_T *const l, listitem_T *const item) ///
/// @return Pointer to the list item just after removed one, NULL if removed
/// item was the last one.
listitem_T *tv_list_item_remove(list_T *const l, listitem_T *const item)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
listitem_T *const next_item = TV_LIST_ITEM_NEXT(l, item);
tv_list_remove_items(l, item, item); tv_list_remove_items(l, item, item);
tv_clear(TV_LIST_ITEM_TV(item)); tv_clear(TV_LIST_ITEM_TV(item));
xfree(item); xfree(item);
return next_item;
} }
//{{{2 List watchers //{{{2 List watchers

20
test/unit/eval/typval_spec.lua
View File

@@ -138,19 +138,19 @@ describe('typval.c', function()
a.li(lis[7]), a.li(lis[7]),
}) })
lib.tv_list_item_remove(l, lis[1]) eq(lis[2], lib.tv_list_item_remove(l, lis[1]))
alloc_log:check({ alloc_log:check({
a.freed(table.remove(lis, 1)), a.freed(table.remove(lis, 1)),
}) })
eq(lis, list_items(l)) eq(lis, list_items(l))
lib.tv_list_item_remove(l, lis[6]) eq(lis[7], lib.tv_list_item_remove(l, lis[6]))
alloc_log:check({ alloc_log:check({
a.freed(table.remove(lis)), a.freed(table.remove(lis)),
}) })
eq(lis, list_items(l)) eq(lis, list_items(l))
lib.tv_list_item_remove(l, lis[3]) eq(lis[4], lib.tv_list_item_remove(l, lis[3]))
alloc_log:check({ alloc_log:check({
a.freed(table.remove(lis, 3)), a.freed(table.remove(lis, 3)),
}) })
@@ -174,21 +174,21 @@ describe('typval.c', function()
local strings = map(function(li) return li.li_tv.vval.v_string end, local strings = map(function(li) return li.li_tv.vval.v_string end,
lis) lis)
lib.tv_list_item_remove(l, lis[1]) eq(lis[2], lib.tv_list_item_remove(l, lis[1]))
alloc_log:check({ alloc_log:check({
a.freed(table.remove(strings, 1)), a.freed(table.remove(strings, 1)),
a.freed(table.remove(lis, 1)), a.freed(table.remove(lis, 1)),
}) })
eq(lis, list_items(l)) eq(lis, list_items(l))
lib.tv_list_item_remove(l, lis[2]) eq(lis[3], lib.tv_list_item_remove(l, lis[2]))
alloc_log:check({ alloc_log:check({
a.freed(table.remove(strings, 2)), a.freed(table.remove(strings, 2)),
a.freed(table.remove(lis, 2)), a.freed(table.remove(lis, 2)),
}) })
eq(lis, list_items(l)) eq(lis, list_items(l))
lib.tv_list_item_remove(l, lis[2]) eq(nil, lib.tv_list_item_remove(l, lis[2]))
alloc_log:check({ alloc_log:check({
a.freed(table.remove(strings, 2)), a.freed(table.remove(strings, 2)),
a.freed(table.remove(lis, 2)), a.freed(table.remove(lis, 2)),
@@ -216,19 +216,19 @@ describe('typval.c', function()
a.li(lis[7]), a.li(lis[7]),
}) })
lib.tv_list_item_remove(l, lis[4]) eq(lis[5], lib.tv_list_item_remove(l, lis[4]))
alloc_log:check({a.freed(lis[4])}) alloc_log:check({a.freed(lis[4])})
eq({lis[1], lis[5], lis[7]}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item}) eq({lis[1], lis[5], lis[7]}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item})
lib.tv_list_item_remove(l, lis[2]) eq(lis[3], lib.tv_list_item_remove(l, lis[2]))
alloc_log:check({a.freed(lis[2])}) alloc_log:check({a.freed(lis[2])})
eq({lis[1], lis[5], lis[7]}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item}) eq({lis[1], lis[5], lis[7]}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item})
lib.tv_list_item_remove(l, lis[7]) eq(nil, lib.tv_list_item_remove(l, lis[7]))
alloc_log:check({a.freed(lis[7])}) alloc_log:check({a.freed(lis[7])})
eq({lis[1], lis[5], nil}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item == nil and nil}) eq({lis[1], lis[5], nil}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item == nil and nil})
lib.tv_list_item_remove(l, lis[1]) eq(lis[3], lib.tv_list_item_remove(l, lis[1]))
alloc_log:check({a.freed(lis[1])}) alloc_log:check({a.freed(lis[1])})
eq({lis[3], lis[5], nil}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item == nil and nil}) eq({lis[3], lis[5], nil}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item == nil and nil})