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

refactor(option.c): factor out some nextchar checks

Browse Source
This commit is contained in:
Lewis Russell
2023-01-26 11:02:00 +00:00
parent 8f2d3537b4
commit 068151f5c6
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/nvim/option.c
View File

@@ -726,14 +726,9 @@ 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, static void do_set_bool(int opt_idx, int opt_flags, int prefix, int nextchar, const char *varp,
const char *varp, char **errmsg) char **errmsg)
{ {
if (nextchar == '=' || nextchar == ':') {
*errmsg = e_invarg;
return;
}
varnumber_T value; varnumber_T value;
// ":set opt!": invert // ":set opt!": invert
@@ -745,24 +740,16 @@ static void do_set_bool(int opt_idx, int opt_flags, int prefix, int nextchar, in
value = (int)(intptr_t)options[opt_idx].def_val; value = (int)(intptr_t)options[opt_idx].def_val;
} else if (nextchar == '<') { } else if (nextchar == '<') {
// For 'autoread' -1 means to use global value. // For 'autoread' -1 means to use global value.
if ((int *)varp == &curbuf->b_p_ar if ((int *)varp == &curbuf->b_p_ar && opt_flags == OPT_LOCAL) {
&& opt_flags == OPT_LOCAL) {
value = -1; value = -1;
} else { } else {
value = *(int *)get_varp_scope(&(options[opt_idx]), value = *(int *)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL);
OPT_GLOBAL);
} }
} else { } else {
// ":set invopt": invert if (prefix == 2) {
// ":set opt" or ":set noopt": set or reset value = *(int *)varp ^ 1; // ":set invopt": invert
if (nextchar != NUL && !ascii_iswhite(afterchar)) {
*errmsg = e_trailing;
return;
}
if (prefix == 2) { // inv
value = *(int *)(varp) ^ 1;
} else { } else {
value = prefix; value = prefix; // ":set opt" or ":set noopt": set or reset
} }
} }
@@ -1301,12 +1288,12 @@ static int validate_opt_idx(win_T *win, int opt_idx, int opt_flags, uint32_t fla
} }
static void do_set_option_value(int opt_idx, int opt_flags, char **argp, int prefix, int nextchar, static void do_set_option_value(int opt_idx, int opt_flags, char **argp, int prefix, int nextchar,
int afterchar, set_op_T op, uint32_t flags, char *varp, set_op_T op, uint32_t flags, char *varp, char *errbuf,
char *errbuf, size_t errbuflen, char **errmsg) size_t errbuflen, char **errmsg)
{ {
int value_checked = false; int value_checked = false;
if (flags & P_BOOL) { // boolean if (flags & P_BOOL) { // boolean
do_set_bool(opt_idx, opt_flags, prefix, nextchar, afterchar, varp, errmsg); do_set_bool(opt_idx, opt_flags, prefix, nextchar, varp, errmsg);
} else if (flags & P_NUM) { // numeric } else if (flags & P_NUM) { // numeric
do_set_num(opt_idx, opt_flags, argp, nextchar, op, varp, errbuf, errbuflen, errmsg); do_set_num(opt_idx, opt_flags, argp, nextchar, op, varp, errbuf, errbuflen, errmsg);
} else if (opt_idx >= 0) { // string. } else if (opt_idx >= 0) { // string.
@@ -1441,12 +1428,24 @@ static void do_set_option(int opt_flags, char **argp, bool *did_show, char *errb
return; return;
} }
if (!(flags & P_BOOL) && vim_strchr("=:&<", nextchar) == NULL) { if (flags & P_BOOL) {
*errmsg = e_invarg; if (vim_strchr("=:", nextchar) != NULL) {
return; *errmsg = e_invarg;
return;
}
if (vim_strchr("!&<", nextchar) == NULL && nextchar != NUL && !ascii_iswhite(afterchar)) {
*errmsg = e_trailing;
return;
}
} else {
if (vim_strchr("=:&<", nextchar) == NULL) {
*errmsg = e_invarg;
return;
}
} }
do_set_option_value(opt_idx, opt_flags, argp, prefix, nextchar, afterchar, op, flags, varp, do_set_option_value(opt_idx, opt_flags, argp, prefix, nextchar, op, flags, varp,
errbuf, errbuflen, errmsg); errbuf, errbuflen, errmsg);
} }