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

eval: Use tv_is_func in place of ==VAR_FUNC||==VAR_PARTIAL

Browse Source 
Also fixes same error as in vim/vim#1557
This commit is contained in:
ZyX
2017-03-13 13:43:01 +03:00
parent 270a3889af
commit 43e9fad1c8
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1250,8 +1250,7 @@ bool tv_dict_get_callback(dict_T *const d,
return true;
}
if (di->di_tv.v_type != VAR_FUNC && di->di_tv.v_type != VAR_STRING
&& di->di_tv.v_type != VAR_PARTIAL) {
if (!tv_is_func(di->di_tv) && di->di_tv.v_type != VAR_STRING) {
emsgf(_("E6000: Argument is not a function or function name"));
return false;
}
@@ -1418,7 +1417,7 @@ void tv_dict_extend(dict_T *const d1, dict_T *const d2,
// Disallow replacing a builtin function in l: and g:.
// Check the key to be valid when adding to any scope.
if (d1->dv_scope == VAR_DEF_SCOPE
&& di2->di_tv.v_type == VAR_FUNC
&& tv_is_func(di2->di_tv)
&& !var_check_func_name((const char *)di2->di_key, di1 == NULL)) {
break;
}
@@ -2101,9 +2100,7 @@ bool tv_equal(typval_T *const tv1, typval_T *const tv2, const bool ic,
// TODO(ZyX-I): Make this not recursive
static int recursive_cnt = 0; // Catch recursive loops.
if (!((tv1->v_type == VAR_FUNC || tv1->v_type == VAR_PARTIAL)
&& (tv2->v_type == VAR_FUNC || tv2->v_type == VAR_PARTIAL))
&& tv1->v_type != tv2->v_type) {
if (!(tv_is_func(*tv1) && tv_is_func(*tv2)) && tv1->v_type != tv2->v_type) {
return false;
}