mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-01 07:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(option.c): add do_set_bool

Browse Source
This commit is contained in:
Lewis Russell
2023-01-25 14:33:23 +00:00
parent 37b44d1772
commit ca1ad8977c
1 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/nvim/option.c
View File

@@ -726,6 +726,49 @@ void ex_set(exarg_T *eap)
(void)do_set(eap->arg, flags); (void)do_set(eap->arg, flags);
} }
static void do_set_bool(int opt_idx, int opt_flags, int prefix, int nextchar, int afterchar,
const char *varp, char **errmsg)
{
if (nextchar == '=' || nextchar == ':') {
*errmsg = e_invarg;
return;
}
varnumber_T value;
// ":set opt!": invert
// ":set opt&": reset to default value
// ":set opt<": reset to global value
if (nextchar == '!') {
value = *(int *)(varp) ^ 1;
} else if (nextchar == '&') {
value = (int)(intptr_t)options[opt_idx].def_val;
} else if (nextchar == '<') {
// For 'autoread' -1 means to use global value.
if ((int *)varp == &curbuf->b_p_ar
&& opt_flags == OPT_LOCAL) {
value = -1;
} else {
value = *(int *)get_varp_scope(&(options[opt_idx]),
OPT_GLOBAL);
}
} else {
// ":set invopt": invert
// ":set opt" or ":set noopt": set or reset
if (nextchar != NUL && !ascii_iswhite(afterchar)) {
*errmsg = e_trailing;
return;
}
if (prefix == 2) { // inv
value = *(int *)(varp) ^ 1;
} else {
value = prefix;
}
}
*errmsg = set_bool_option(opt_idx, (char_u *)varp, (int)value, opt_flags);
}
static void do_set_num(int opt_idx, int opt_flags, char **argp, int nextchar, const set_op_T op, static void do_set_num(int opt_idx, int opt_flags, char **argp, int nextchar, const set_op_T op,
const char *varp, char *errbuf, size_t errbuflen, char **errmsg) const char *varp, char *errbuf, size_t errbuflen, char **errmsg)
{ {
@@ -1367,45 +1410,11 @@ int do_set(char *arg, int opt_flags)
} }
} else { } else {
int value_checked = false; int value_checked = false;
varnumber_T value;
if (flags & P_BOOL) { // boolean if (flags & P_BOOL) { // boolean
if (nextchar == '=' || nextchar == ':') { do_set_bool(opt_idx, opt_flags, prefix, nextchar, afterchar, varp, &errmsg);
errmsg = e_invarg; if (errmsg != NULL) {
goto skip; goto skip;
} }
// ":set opt!": invert
// ":set opt&": reset to default value
// ":set opt<": reset to global value
if (nextchar == '!') {
value = *(int *)(varp) ^ 1;
} else if (nextchar == '&') {
value = (int)(intptr_t)options[opt_idx].def_val;
} else if (nextchar == '<') {
// For 'autoread' -1 means to use global value.
if ((int *)varp == &curbuf->b_p_ar
&& opt_flags == OPT_LOCAL) {
value = -1;
} else {
value = *(int *)get_varp_scope(&(options[opt_idx]),
OPT_GLOBAL);
}
} else {
// ":set invopt": invert
// ":set opt" or ":set noopt": set or reset
if (nextchar != NUL && !ascii_iswhite(afterchar)) {
errmsg = e_trailing;
goto skip;
}
if (prefix == 2) { // inv
value = *(int *)(varp) ^ 1;
} else {
value = prefix;
}
}
errmsg = set_bool_option(opt_idx, (char_u *)varp, (int)value, opt_flags);
} else { // Numeric or string. } else { // Numeric or string.
if (vim_strchr("=:&<", (uint8_t)nextchar) == NULL if (vim_strchr("=:&<", (uint8_t)nextchar) == NULL
|| prefix != 1) { || prefix != 1) {