kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-25 05:35:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1583: set_ref_in_list() only sets ref in items (#26418)

Browse Source 
Problem:    Set_ref_in_list() only sets ref in items.
Solution:   Rename to set_ref_in_list_items() to avoid confusion.

7be3ab2589

Omit set_ref_in_list() and set_ref_in_dict(): only used in popup window,
if_pyth and if_lua.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2023-12-06 15:48:16 +08:00 committed by GitHub
parent e718866358
commit 401ce9f3fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval.c
View File

@ -4711,7 +4711,7 @@ bool set_ref_in_ht(hashtab_T *ht, int copyID, list_stack_T **list_stack)
/// @param ht_stack Used to add hashtabs to be marked. Can be NULL. /// @param ht_stack Used to add hashtabs to be marked. Can be NULL.
/// ///
/// @returns true if setting references failed somehow. /// @returns true if setting references failed somehow.
bool set_ref_in_list(list_T *l, int copyID, ht_stack_T **ht_stack) bool set_ref_in_list_items(list_T *l, int copyID, ht_stack_T **ht_stack)
FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_WARN_UNUSED_RESULT
{ {
bool abort = false; bool abort = false;
@ -4788,7 +4788,7 @@ bool set_ref_in_item(typval_T *tv, int copyID, ht_stack_T **ht_stack, list_stack
// Didn't see this list yet. // Didn't see this list yet.
ll->lv_copyID = copyID; ll->lv_copyID = copyID;
if (list_stack == NULL) { if (list_stack == NULL) {
abort = set_ref_in_list(ll, copyID, ht_stack); abort = set_ref_in_list_items(ll, copyID, ht_stack);
} else { } else {
list_stack_T *const newitem = xmalloc(sizeof(list_stack_T)); list_stack_T *const newitem = xmalloc(sizeof(list_stack_T));
newitem->list = ll; newitem->list = ll;

4
src/nvim/eval/userfunc.c
View File

@ -3818,7 +3818,7 @@ bool set_ref_in_previous_funccal(int copyID)
fc->fc_copyID = copyID + 1; fc->fc_copyID = copyID + 1;
if (set_ref_in_ht(&fc->fc_l_vars.dv_hashtab, copyID + 1, NULL) if (set_ref_in_ht(&fc->fc_l_vars.dv_hashtab, copyID + 1, NULL)
|| set_ref_in_ht(&fc->fc_l_avars.dv_hashtab, copyID + 1, NULL) || set_ref_in_ht(&fc->fc_l_avars.dv_hashtab, copyID + 1, NULL)
|| set_ref_in_list(&fc->fc_l_varlist, copyID + 1, NULL)) { || set_ref_in_list_items(&fc->fc_l_varlist, copyID + 1, NULL)) {
return true; return true;
} }
} }
@ -3831,7 +3831,7 @@ static bool set_ref_in_funccal(funccall_T *fc, int copyID)
fc->fc_copyID = copyID; fc->fc_copyID = copyID;
if (set_ref_in_ht(&fc->fc_l_vars.dv_hashtab, copyID, NULL) if (set_ref_in_ht(&fc->fc_l_vars.dv_hashtab, copyID, NULL)
|| set_ref_in_ht(&fc->fc_l_avars.dv_hashtab, copyID, NULL) || set_ref_in_ht(&fc->fc_l_avars.dv_hashtab, copyID, NULL)
|| set_ref_in_list(&fc->fc_l_varlist, copyID, NULL) || set_ref_in_list_items(&fc->fc_l_varlist, copyID, NULL)
|| set_ref_in_func(NULL, fc->fc_func, copyID)) { || set_ref_in_func(NULL, fc->fc_func, copyID)) {
return true; return true;
} }

2
src/nvim/shada.c
View File

@ -2604,7 +2604,7 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer, ShaDaReadDef
case VAR_LIST: { case VAR_LIST: {
list_T *l = vartv.vval.v_list; list_T *l = vartv.vval.v_list;
int copyID = get_copyID(); int copyID = get_copyID();
if (!set_ref_in_list(l, copyID, NULL) if (!set_ref_in_list_items(l, copyID, NULL)
&& copyID == l->lv_copyID) { && copyID == l->lv_copyID) {
tv_clear(&vartv); tv_clear(&vartv);
continue; continue;