mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 02:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4627: flatten() does not use maxdepth correctly

Browse Source 
Problem:    flatten() does not use maxdepth correctly.
Solution:   Use a recursive implementation. (closes vim/vim#10020)

acf7d73a7f

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2023-02-24 15:24:38 +08:00
parent 904d099583
commit d9263688bf
3 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -647,53 +647,55 @@ tv_list_copy_error:
return NULL;
}
/// Flatten "list" in place to depth "maxdepth".
/// Flatten up to "maxitems" in "list", starting at "first" to depth "maxdepth".
/// When "first" is NULL use the first item.
/// Does nothing if "maxdepth" is 0.
///
/// @param[in,out] list List to flatten
/// @param[in] maxdepth Maximum depth that will be flattened
///
/// @return OK or FAIL
void tv_list_flatten(list_T *list, long maxdepth)
void tv_list_flatten(list_T *list, listitem_T *first, long maxitems, long maxdepth)
FUNC_ATTR_NONNULL_ARG(1)
{
listitem_T *item;
listitem_T *to_free;
int n;
int done = 0;
if (maxdepth == 0) {
return;
}
n = 0;
item = list->lv_first;
while (item != NULL) {
if (first == NULL) {
item = list->lv_first;
} else {
item = first;
}
while (item != NULL && done < maxitems) {
listitem_T *next = item->li_next;
fast_breakcheck();
if (got_int) {
return;
}
if (item->li_tv.v_type == VAR_LIST) {
listitem_T *next = item->li_next;
list_T *itemlist = item->li_tv.vval.v_list;
tv_list_drop_items(list, item, item);
tv_list_extend(list, item->li_tv.vval.v_list, next);
tv_list_extend(list, itemlist, next);
tv_clear(&item->li_tv);
to_free = item;
if (item->li_prev == NULL) {
item = list->lv_first;
} else {
item = item->li_prev->li_next;
if (maxdepth > 0) {
tv_list_flatten(list,
item->li_prev == NULL ? list->lv_first : item->li_prev->li_next,
itemlist->lv_len, maxdepth - 1);
}
xfree(to_free);
if (++n >= maxdepth) {
n = 0;
item = next;
}
} else {
n = 0;
item = item->li_next;
}
done++;
item = next;
}
}