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

eval: Move dict_set_keys_readonly to typval.c

Browse Source
This commit is contained in:
ZyX
2016-08-20 23:14:50 +03:00
parent ecff8387f4
commit 983a5532ca
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/eval.c
View File

@@ -5605,19 +5605,6 @@ int dict_add_dict(dict_T *d, char *key, dict_T *dict)
return OK;
}
/// Set all existing keys in "dict" as read-only.
///
/// This does not protect against adding new keys to the Dictionary.
///
/// @param dict The dict whose keys should be frozen
void dict_set_keys_readonly(dict_T *const dict)
FUNC_ATTR_NONNULL_ALL
{
TV_DICT_ITER(dict, di, {
di->di_flags |= DI_FLAGS_RO | DI_FLAGS_FIX;
});
}
/*
* Allocate a variable for a Dictionary and fill it from "*arg".
* Return OK or FAIL. Returns NOTDONE for {expr}.
@@ -18083,7 +18070,7 @@ void set_vim_var_dict(const VimVarIndex idx, dict_T *const val)
if (val != NULL) {
val->dv_refcount++;
// Set readonly
dict_set_keys_readonly(val);
tv_dict_set_keys_readonly(val);
}
}

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

@@ -1135,8 +1135,8 @@ const char *tv_dict_get_string_buf(dict_T *const d, const char *const key,
/// @param[in] d Dictionary to get callback from.
/// @param[in] key Dictionary key.
/// @param[in] key_len Key length, may be -1 to use strlen().
/// @param[out] result The address where a pointer to the wanted callback
/// will be left.
/// @param[out] result The address where a pointer to the wanted callback
/// will be left.
///
/// @return true/false on success/failure.
bool tv_dict_get_callback(dict_T *const d,
@@ -1348,6 +1348,19 @@ dict_T *tv_dict_copy(const vimconv_T *const conv,
return copy;
}
/// Set all existing keys in "dict" as read-only.
///
/// This does not protect against adding new keys to the Dictionary.
///
/// @param dict The dict whose keys should be frozen.
void tv_dict_set_keys_readonly(dict_T *const dict)
FUNC_ATTR_NONNULL_ALL
{
TV_DICT_ITER(dict, di, {
di->di_flags |= DI_FLAGS_RO | DI_FLAGS_FIX;
});
}
//{{{1 Generic typval operations
//{{{2 Init/alloc/clear
//{{{3 Alloc

2
src/nvim/file_search.c
View File

@@ -1551,7 +1551,7 @@ void do_autocmd_dirchanged(char *new_dir, CdScope scope)
dict_add_nr_str(dict, "scope", 0L, (char_u *)buf);
dict_add_nr_str(dict, "cwd", 0L, (char_u *)new_dir);
dict_set_keys_readonly(dict);
tv_dict_set_keys_readonly(dict);
apply_autocmds(EVENT_DIRCHANGED, (char_u *)buf, (char_u *)new_dir, false,
NULL);

2
src/nvim/ops.c
View File

@@ -2578,7 +2578,7 @@ static void do_autocmd_textyankpost(oparg_T *oap, yankreg_T *reg)
buf[1] = NUL;
dict_add_nr_str(dict, "operator", 0, (char_u *)buf);
dict_set_keys_readonly(dict);
tv_dict_set_keys_readonly(dict);
textlock++;
apply_autocmds(EVENT_TEXTYANKPOST, NULL, NULL, false, curbuf);
textlock--;