diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-11-06 11:16:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-06 11:16:54 +0800 |
| commit | eb55eba7e5b422301c50088623e60514a843ab08 (patch) | |
| tree | 2fd4f4964889533fc9b72c98ad64d95a6cb70763 /src/nvim/eval/userfunc.c | |
| parent | be90bfbb00436fba68595cc4fd67548df794469d (diff) | |
| parent | d4353c3645f294b67f5b30dae9f39de8f99c7413 (diff) | |
| download | rneovim-eb55eba7e5b422301c50088623e60514a843ab08.tar.gz rneovim-eb55eba7e5b422301c50088623e60514a843ab08.tar.bz2 rneovim-eb55eba7e5b422301c50088623e60514a843ab08.zip | |
Merge pull request #20955 from zeertzjq/vim-8.2.2918
vim-patch:8.2.{2918,2920,2921},9.0.0836: variable can shadow builtin function
Diffstat (limited to 'src/nvim/eval/userfunc.c')
| -rw-r--r-- | src/nvim/eval/userfunc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c index 4024410a04..ef74ca58e3 100644 --- a/src/nvim/eval/userfunc.c +++ b/src/nvim/eval/userfunc.c @@ -589,7 +589,7 @@ static void add_nr_var(dict_T *dp, dictitem_T *v, char *name, varnumber_T nr) STRCPY(v->di_key, name); #endif v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX; - tv_dict_add(dp, v); + hash_add(&dp->dv_hashtab, v->di_key); v->di_tv.v_type = VAR_NUMBER; v->di_tv.v_lock = VAR_FIXED; v->di_tv.vval.v_number = nr; @@ -885,7 +885,7 @@ void call_user_func(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rett STRCPY(name, "self"); #endif v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX; - tv_dict_add(&fc->l_vars, v); + hash_add(&fc->l_vars.dv_hashtab, v->di_key); v->di_tv.v_type = VAR_DICT; v->di_tv.v_lock = VAR_UNLOCKED; v->di_tv.vval.v_dict = selfdict; @@ -911,7 +911,7 @@ void call_user_func(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rett STRCPY(name, "000"); #endif v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX; - tv_dict_add(&fc->l_avars, v); + hash_add(&fc->l_avars.dv_hashtab, v->di_key); v->di_tv.v_type = VAR_LIST; v->di_tv.v_lock = VAR_FIXED; v->di_tv.vval.v_list = &fc->l_varlist; @@ -989,9 +989,9 @@ void call_user_func(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rett // Named arguments can be accessed without the "a:" prefix in lambda // expressions. Add to the l: dict. tv_copy(&v->di_tv, &v->di_tv); - tv_dict_add(&fc->l_vars, v); + hash_add(&fc->l_vars.dv_hashtab, v->di_key); } else { - tv_dict_add(&fc->l_avars, v); + hash_add(&fc->l_avars.dv_hashtab, v->di_key); } if (ai >= 0 && ai < MAX_FUNC_ARGS) { |