IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: find_var_ht_dict

Browse Source
This commit is contained in:
Jakub Łuczyński 2020-02-10 11:17:22 +01:00
parent e50b545676
commit bae1738bce
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/eval.c
View File

@ -8541,6 +8541,7 @@ static hashtab_T *find_var_ht_dict(const char *name, const size_t name_len,
const char **varname, dict_T **d) const char **varname, dict_T **d)
{ {
hashitem_T *hi; hashitem_T *hi;
funccall_T *funccal = get_funccal();
*d = NULL; *d = NULL;
if (name_len == 0) { if (name_len == 0) {
@ -8560,16 +8561,16 @@ static hashtab_T *find_var_ht_dict(const char *name, const size_t name_len,
return &compat_hashtab; return &compat_hashtab;
} }
if (current_funccal == NULL) { if (funccal == NULL) { // global variable
*d = &globvardict; *d = &globvardict;
} else { } else { // l: variable
*d = &get_funccal()->l_vars; // l: variable *d = &funccal->l_vars;
} }
goto end; goto end;
} }
*varname = name + 2; *varname = name + 2;
if (*name == 'g') { // global variable if (*name == 'g') { // global variable
*d = &globvardict; *d = &globvardict;
} else if (name_len > 2 } else if (name_len > 2
&& (memchr(name + 2, ':', name_len - 2) != NULL && (memchr(name + 2, ':', name_len - 2) != NULL
@ -8586,10 +8587,10 @@ static hashtab_T *find_var_ht_dict(const char *name, const size_t name_len,
*d = curtab->tp_vars; *d = curtab->tp_vars;
} else if (*name == 'v') { // v: variable } else if (*name == 'v') { // v: variable
*d = &vimvardict; *d = &vimvardict;
} else if (*name == 'a' && current_funccal != NULL) { // function argument } else if (*name == 'a' && funccal != NULL) { // function argument
*d = &get_funccal()->l_avars; *d = &funccal->l_avars;
} else if (*name == 'l' && current_funccal != NULL) { // local variable } else if (*name == 'l' && funccal != NULL) { // local variable
*d = &get_funccal()->l_vars; *d = &funccal->l_vars;
} else if (*name == 's' // script variable } else if (*name == 's' // script variable
&& current_sctx.sc_sid > 0 && current_sctx.sc_sid > 0
&& current_sctx.sc_sid <= ga_scripts.ga_len) { && current_sctx.sc_sid <= ga_scripts.ga_len) {