From 35767912bbe9da4556aab122ba00488c56dd9f17 Mon Sep 17 00:00:00 2001 From: TJ DeVries Date: Tue, 27 Oct 2020 22:20:52 -0400 Subject: api/options: add option metadata --- src/nvim/option.c | 52 +++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 25 deletions(-) (limited to 'src/nvim/option.c') diff --git a/src/nvim/option.c b/src/nvim/option.c index 0034117ddc..5e3f917bed 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -102,13 +102,6 @@ #define OPT_BUF(x) (idopt_T)(PV_BUF + (int)(x)) #define OPT_BOTH(x) (idopt_T)(PV_BOTH + (int)(x)) - -// WV_ and BV_ values get typecasted to this for the "indir" field -typedef enum { - PV_NONE = 0, - PV_MAXVAL = 0xffff // to avoid warnings for value out of range -} idopt_T; - /* * Options local to a window have a value local to a buffer and global to all * buffers. Indicate this by setting "var" to VAR_WIN. @@ -195,20 +188,6 @@ static long p_sts_nopaste; static long p_tw_nopaste; static long p_wm_nopaste; -typedef struct vimoption { - char *fullname; // full option name - char *shortname; // permissible abbreviation - uint32_t flags; // see below - char_u *var; // global option: pointer to variable; - // window-local option: VAR_WIN; - // buffer-local option: global value - idopt_T indir; // global option: PV_NONE; - // local option: indirect option index - char_u *def_val[2]; // default values for variable (vi and vim) - LastSet last_set; // script in which the option was last set -# define SCTX_INIT , { 0, 0, 0 } -} vimoption_T; - #define VI_DEFAULT 0 // def_val[VI_DEFAULT] is Vi default value #define VIM_DEFAULT 1 // def_val[VIM_DEFAULT] is Vim default value @@ -3617,10 +3596,14 @@ static void set_option_sctx_idx(int opt_idx, int opt_flags, sctx_T script_ctx) { int both = (opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0; int indir = (int)options[opt_idx].indir; - const LastSet last_set = { .script_ctx = - { script_ctx.sc_sid, script_ctx.sc_seq, - script_ctx.sc_lnum + sourcing_lnum }, - current_channel_id }; + const LastSet last_set = { + .script_ctx = { + script_ctx.sc_sid, + script_ctx.sc_seq, + script_ctx.sc_lnum + sourcing_lnum + }, + current_channel_id + }; // Remember where the option was set. For local options need to do that // in the buffer or window structure. @@ -7174,3 +7157,22 @@ long get_sidescrolloff_value(void) { return curwin->w_p_siso < 0 ? p_siso : curwin->w_p_siso; } + +vimoption_T get_vimoption(int opt_idx) +{ + return options[opt_idx]; +} + +vimoption_T* get_all_vimoptions(void) +{ + return options; +} + +String get_option_type_string(vimoption_T opt) +{ + return cstr_to_string( + opt.flags & P_BOOL ? "boolean" + : opt.flags & P_NUM ? "number" + : opt.flags & P_STRING ? "string" + : "unknown"); +} -- cgit From 3b3c006ae34256637f101ea85a84998377f56e40 Mon Sep 17 00:00:00 2001 From: Björn Linse Date: Tue, 1 Dec 2020 22:10:41 +0100 Subject: api/options: cleanup --- src/nvim/option.c | 104 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 87 insertions(+), 17 deletions(-) (limited to 'src/nvim/option.c') diff --git a/src/nvim/option.c b/src/nvim/option.c index 5e3f917bed..12468adbe8 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -102,6 +102,13 @@ #define OPT_BUF(x) (idopt_T)(PV_BUF + (int)(x)) #define OPT_BOTH(x) (idopt_T)(PV_BOTH + (int)(x)) + +// WV_ and BV_ values get typecasted to this for the "indir" field +typedef enum { + PV_NONE = 0, + PV_MAXVAL = 0xffff // to avoid warnings for value out of range +} idopt_T; + /* * Options local to a window have a value local to a buffer and global to all * buffers. Indicate this by setting "var" to VAR_WIN. @@ -188,6 +195,20 @@ static long p_sts_nopaste; static long p_tw_nopaste; static long p_wm_nopaste; +typedef struct vimoption { + char *fullname; // full option name + char *shortname; // permissible abbreviation + uint32_t flags; // see below + char_u *var; // global option: pointer to variable; + // window-local option: VAR_WIN; + // buffer-local option: global value + idopt_T indir; // global option: PV_NONE; + // local option: indirect option index + char_u *def_val[2]; // default values for variable (vi and vim) + LastSet last_set; // script in which the option was last set +# define SCTX_INIT , { 0, 0, 0 } +} vimoption_T; + #define VI_DEFAULT 0 // def_val[VI_DEFAULT] is Vi default value #define VIM_DEFAULT 1 // def_val[VIM_DEFAULT] is Vim default value @@ -331,9 +352,6 @@ void set_init_1(bool clean_arg) langmap_init(); - // Be nocompatible - p_cp = false; - /* * Find default value for 'shell' option. * Don't use it if it is empty. @@ -662,7 +680,7 @@ set_options_default( { for (int i = 0; options[i].fullname; i++) { if (!(options[i].flags & P_NODEFAULT)) { - set_option_default(i, opt_flags, p_cp); + set_option_default(i, opt_flags, false); } } @@ -742,7 +760,7 @@ void set_init_2(bool headless) // which results in the actual value computed from the window height. idx = findoption("scroll"); if (idx >= 0 && !(options[idx].flags & P_WAS_SET)) { - set_option_default(idx, OPT_LOCAL, p_cp); + set_option_default(idx, OPT_LOCAL, false); } comp_col(); @@ -1092,7 +1110,7 @@ int do_set( if (vim_strchr((char_u *)"?=:!&<", nextchar) != NULL) { arg += len; - cp_val = p_cp; + cp_val = false; if (nextchar == '&' && arg[1] == 'v' && arg[2] == 'i') { if (arg[3] == 'm') { // "opt&vim": set to Vim default cp_val = false; @@ -4933,7 +4951,7 @@ static int optval_default(vimoption_T *p, char_u *varp) if (varp == NULL) { return true; // hidden option is always at default } - dvi = ((p->flags & P_VI_DEF) || p_cp) ? VI_DEFAULT : VIM_DEFAULT; + dvi = (p->flags & P_VI_DEF) ? VI_DEFAULT : VIM_DEFAULT; if (p->flags & P_NUM) { return *(long *)varp == (long)(intptr_t)p->def_val[dvi]; } @@ -7158,21 +7176,73 @@ long get_sidescrolloff_value(void) return curwin->w_p_siso < 0 ? p_siso : curwin->w_p_siso; } -vimoption_T get_vimoption(int opt_idx) +Dictionary get_vimoption(String name, Error *err) { - return options[opt_idx]; + int opt_idx = findoption_len((const char *)name.data, name.size); + if (opt_idx < 0) { + api_set_error(err, kErrorTypeValidation, "no such option %s", name.data); + return (Dictionary)ARRAY_DICT_INIT; + } + return vimoption2dict(&options[opt_idx]); } -vimoption_T* get_all_vimoptions(void) +Dictionary get_all_vimoptions(void) { - return options; + Dictionary retval = ARRAY_DICT_INIT; + for (size_t i = 0; i < PARAM_COUNT; i++) { + Dictionary opt_dict = vimoption2dict(&options[i]); + PUT(retval, options[i].fullname, DICTIONARY_OBJ(opt_dict)); + } + return retval; } -String get_option_type_string(vimoption_T opt) +static Dictionary vimoption2dict(vimoption_T *opt) { - return cstr_to_string( - opt.flags & P_BOOL ? "boolean" - : opt.flags & P_NUM ? "number" - : opt.flags & P_STRING ? "string" - : "unknown"); + Dictionary dict = ARRAY_DICT_INIT; + + PUT(dict, "name", STRING_OBJ(cstr_to_string(opt->fullname))); + PUT(dict, "shortname", STRING_OBJ(cstr_to_string(opt->shortname))); +#define PUT_IF(dict, name, condition) do if (condition) \ + { PUT(dict, name, BOOLEAN_OBJ(true)); } while (0) + PUT_IF(dict, "win", opt->indir & PV_WIN); + PUT_IF(dict, "buf", opt->indir & PV_BUF); + // welcome to the jungle + PUT_IF(dict, "global_local", opt->indir & PV_BOTH); + PUT_IF(dict, "commalist", opt->flags & P_COMMA); + PUT_IF(dict, "flaglist", opt->flags & P_FLAGLIST); + + PUT_IF(dict, "was_set", opt->flags & P_WAS_SET); + + PUT(dict, "flag", INTEGER_OBJ(opt->flags)); // TODO(bfredl): lol tj + PUT(dict, "last_set_sid", INTEGER_OBJ(opt->last_set.script_ctx.sc_sid)); + if (opt->last_set.script_ctx.sc_lnum > 0) { + PUT(dict, "last_set_linenr", + INTEGER_OBJ(opt->last_set.script_ctx.sc_lnum)); + } + if (opt->last_set.channel_id > 0) { + PUT(dict, "last_set_lchan", + INTEGER_OBJ((int64_t)opt->last_set.channel_id)); + } + + const char *type; + Object def; + // TODO(bfredl): do you even nocp? + char_u *def_val = opt->def_val[(opt->flags & P_VI_DEF) + ? VI_DEFAULT : VIM_DEFAULT]; + if (opt->flags & P_STRING) { + type = "string"; + def = STRING_OBJ(cstr_to_string(def_val ? (char *)def_val : "")); + } else if (opt->flags & P_NUM) { + type = "string"; + def = INTEGER_OBJ((Integer)(intptr_t)def_val); + } else if (opt->flags & P_BOOL) { + type = "boolean"; + def = BOOLEAN_OBJ((intptr_t)def_val); + } else { + type = ""; def = NIL; + } + PUT(dict, "type", STRING_OBJ(cstr_to_string(type))); + PUT(dict, "default", def); + + return dict; } -- cgit From ced951c2aacd175c21c68a5bbf7fdf459954d0ab Mon Sep 17 00:00:00 2001 From: TJ DeVries Date: Thu, 3 Dec 2020 20:59:36 -0500 Subject: api/options: fixup --- src/nvim/option.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'src/nvim/option.c') diff --git a/src/nvim/option.c b/src/nvim/option.c index 12468adbe8..85f38b02ae 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -7180,7 +7180,7 @@ Dictionary get_vimoption(String name, Error *err) { int opt_idx = findoption_len((const char *)name.data, name.size); if (opt_idx < 0) { - api_set_error(err, kErrorTypeValidation, "no such option %s", name.data); + api_set_error(err, kErrorTypeValidation, "no such option: '%s'", name.data); return (Dictionary)ARRAY_DICT_INIT; } return vimoption2dict(&options[opt_idx]); @@ -7202,27 +7202,30 @@ static Dictionary vimoption2dict(vimoption_T *opt) PUT(dict, "name", STRING_OBJ(cstr_to_string(opt->fullname))); PUT(dict, "shortname", STRING_OBJ(cstr_to_string(opt->shortname))); -#define PUT_IF(dict, name, condition) do if (condition) \ - { PUT(dict, name, BOOLEAN_OBJ(true)); } while (0) - PUT_IF(dict, "win", opt->indir & PV_WIN); - PUT_IF(dict, "buf", opt->indir & PV_BUF); + +#define PUT_BOOL(dict, name, condition) \ + PUT(dict, name, BOOLEAN_OBJ(condition)); + + PUT_BOOL(dict, "win", opt->indir & PV_WIN); + PUT_BOOL(dict, "buf", opt->indir & PV_BUF); + // welcome to the jungle - PUT_IF(dict, "global_local", opt->indir & PV_BOTH); - PUT_IF(dict, "commalist", opt->flags & P_COMMA); - PUT_IF(dict, "flaglist", opt->flags & P_FLAGLIST); + PUT_BOOL(dict, "global_local", opt->indir & PV_BOTH); + PUT_BOOL(dict, "commalist", opt->flags & P_COMMA); + PUT_BOOL(dict, "flaglist", opt->flags & P_FLAGLIST); - PUT_IF(dict, "was_set", opt->flags & P_WAS_SET); + PUT_BOOL(dict, "was_set", opt->flags & P_WAS_SET); +#undef PUT_BOOL - PUT(dict, "flag", INTEGER_OBJ(opt->flags)); // TODO(bfredl): lol tj PUT(dict, "last_set_sid", INTEGER_OBJ(opt->last_set.script_ctx.sc_sid)); - if (opt->last_set.script_ctx.sc_lnum > 0) { - PUT(dict, "last_set_linenr", - INTEGER_OBJ(opt->last_set.script_ctx.sc_lnum)); - } - if (opt->last_set.channel_id > 0) { - PUT(dict, "last_set_lchan", - INTEGER_OBJ((int64_t)opt->last_set.channel_id)); - } + PUT(dict, "last_set_linenr", + opt->last_set.script_ctx.sc_lnum > 0 + ? INTEGER_OBJ(opt->last_set.script_ctx.sc_lnum) + : INTEGER_OBJ(-1)); + PUT(dict, "last_set_lchan", + opt->last_set.channel_id > 0 + ? INTEGER_OBJ((int64_t)opt->last_set.channel_id) + : INTEGER_OBJ(-1)); const char *type; Object def; -- cgit From 17a58043a3fc49179a47590e905ed3a7d5a29907 Mon Sep 17 00:00:00 2001 From: Björn Linse Date: Fri, 4 Dec 2020 10:59:58 +0100 Subject: api/options: cleanup the fixup --- src/nvim/option.c | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'src/nvim/option.c') diff --git a/src/nvim/option.c b/src/nvim/option.c index 85f38b02ae..acca6fe681 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -7200,32 +7200,30 @@ static Dictionary vimoption2dict(vimoption_T *opt) { Dictionary dict = ARRAY_DICT_INIT; - PUT(dict, "name", STRING_OBJ(cstr_to_string(opt->fullname))); - PUT(dict, "shortname", STRING_OBJ(cstr_to_string(opt->shortname))); - -#define PUT_BOOL(dict, name, condition) \ - PUT(dict, name, BOOLEAN_OBJ(condition)); + PUT(dict, "name", CSTR_TO_OBJ(opt->fullname)); + PUT(dict, "shortname", CSTR_TO_OBJ(opt->shortname)); + + const char *scope; + if (opt->indir & PV_BUF) { + scope = "buf"; + } else if (opt->indir & PV_WIN) { + scope = "win"; + } else { + scope = "global"; + } - PUT_BOOL(dict, "win", opt->indir & PV_WIN); - PUT_BOOL(dict, "buf", opt->indir & PV_BUF); + PUT(dict, "scope", CSTR_TO_OBJ(scope)); // welcome to the jungle - PUT_BOOL(dict, "global_local", opt->indir & PV_BOTH); - PUT_BOOL(dict, "commalist", opt->flags & P_COMMA); - PUT_BOOL(dict, "flaglist", opt->flags & P_FLAGLIST); + PUT(dict, "global_local", BOOL(opt->indir & PV_BOTH)); + PUT(dict, "commalist", BOOL(opt->flags & P_COMMA)); + PUT(dict, "flaglist", BOOL(opt->flags & P_FLAGLIST)); - PUT_BOOL(dict, "was_set", opt->flags & P_WAS_SET); -#undef PUT_BOOL + PUT(dict, "was_set", BOOL(opt->flags & P_WAS_SET)); PUT(dict, "last_set_sid", INTEGER_OBJ(opt->last_set.script_ctx.sc_sid)); - PUT(dict, "last_set_linenr", - opt->last_set.script_ctx.sc_lnum > 0 - ? INTEGER_OBJ(opt->last_set.script_ctx.sc_lnum) - : INTEGER_OBJ(-1)); - PUT(dict, "last_set_lchan", - opt->last_set.channel_id > 0 - ? INTEGER_OBJ((int64_t)opt->last_set.channel_id) - : INTEGER_OBJ(-1)); + PUT(dict, "last_set_linenr", INTEGER_OBJ(opt->last_set.script_ctx.sc_lnum)); + PUT(dict, "last_set_chan", INTEGER_OBJ((int64_t)opt->last_set.channel_id)); const char *type; Object def; @@ -7234,17 +7232,17 @@ static Dictionary vimoption2dict(vimoption_T *opt) ? VI_DEFAULT : VIM_DEFAULT]; if (opt->flags & P_STRING) { type = "string"; - def = STRING_OBJ(cstr_to_string(def_val ? (char *)def_val : "")); + def = CSTR_TO_OBJ(def_val ? (char *)def_val : ""); } else if (opt->flags & P_NUM) { - type = "string"; + type = "number"; def = INTEGER_OBJ((Integer)(intptr_t)def_val); } else if (opt->flags & P_BOOL) { type = "boolean"; - def = BOOLEAN_OBJ((intptr_t)def_val); + def = BOOL((intptr_t)def_val); } else { type = ""; def = NIL; } - PUT(dict, "type", STRING_OBJ(cstr_to_string(type))); + PUT(dict, "type", CSTR_TO_OBJ(type)); PUT(dict, "default", def); return dict; -- cgit