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

refactor: replace unnecessary helper functions in optionstr.c

Browse Source 
Replaces unnecessary helper functions in `optionstr.c` such as
`get_option_flags()`, `get_option_fullname()`, `set_option_flag()`,
`is_global_option()`, etc. with a single `get_option()` helper function
that allows direct access to the `options` array.

Also refactors `f_exists()` to use `get_varp_scope` instead of using
`get_option_tv`. This opens up the path for removing `getoptions_T`
altogether later down the line since the hidden option logic is no
longer needed.
This commit is contained in:
Famiu Haque
2022-09-27 21:16:28 +06:00
parent 1d337d4e2f
commit 4b7904d16b
5 changed files with 89 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/eval/funcs.c
View File

@@ -1938,9 +1938,14 @@ static void f_exists(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
xfree(exp);
}
} else if (*p == '&' || *p == '+') { // Option.
n = (get_option_tv(&p, NULL, true) == OK);
if (*skipwhite(p) != NUL) {
n = false; // Trailing garbage.
bool working = (*p == '+'); // whether option needs to be working
int opt_flags;
if (find_option_end(&p, &opt_flags) != NULL) {
int opt_idx = findoption(p);
n = (opt_idx >= 0 && (!working || get_varp_scope(get_option(opt_idx), opt_flags) != NULL));
} else {
n = false;
}
} else if (*p == '*') { // Internal or user defined function.
n = function_exists(p + 1, false);