mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-25 04:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval: Get rid of VV_LEN constant

Browse Source
This commit is contained in:
ZyX
2016-02-03 19:35:49 +03:00
parent 85244e68e3
commit 3c39219550
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/eval.c
View File

@@ -289,11 +289,11 @@ typedef enum {
// The reason to use this table anyway is for very quick access to the // The reason to use this table anyway is for very quick access to the
// variables with the VV_ defines. // variables with the VV_ defines.
static struct vimvar { static struct vimvar {
char *vv_name; /* name of variable, without v: */ char *vv_name; ///< Name of the variable, without v:.
dictitem_T vv_di; /* value and name for key */ dictitem_T vv_di; ///< Value of the variable, with name.
char vv_filler[16]; /* space for LONGEST name below!!! */ char vv_filler[16]; ///< Space for longest name from below.
char vv_flags; /* VV_COMPAT, VV_RO, VV_RO_SBX */ char vv_flags; ///< Flags: #VV_COMPAT, #VV_RO, #VV_RO_SBX.
} vimvars[VV_LEN] = } vimvars[] =
{ {
/* /*
* The order here must match the VV_ defines in eval.h! * The order here must match the VV_ defines in eval.h!
@@ -465,7 +465,6 @@ const list_T *eval_msgpack_type_lists[] = {
void eval_init(void) void eval_init(void)
{ {
jobs = pmap_new(uint64_t)(); jobs = pmap_new(uint64_t)();
int i;
struct vimvar *p; struct vimvar *p;
init_var_dict(&globvardict, &globvars_var, VAR_DEF_SCOPE); init_var_dict(&globvardict, &globvars_var, VAR_DEF_SCOPE);
@@ -474,7 +473,7 @@ void eval_init(void)
hash_init(&compat_hashtab); hash_init(&compat_hashtab);
hash_init(&func_hashtab); hash_init(&func_hashtab);
for (i = 0; i < VV_LEN; ++i) { for (size_t i = 0; i < ARRAY_SIZE(vimvars); ++i) {
p = &vimvars[i]; p = &vimvars[i];
STRCPY(p->vv_di.di_key, p->vv_name); STRCPY(p->vv_di.di_key, p->vv_name);
if (p->vv_flags & VV_RO) if (p->vv_flags & VV_RO)
@@ -534,7 +533,7 @@ void eval_clear(void)
{ {
struct vimvar *p; struct vimvar *p;
for (int i = 0; i < VV_LEN; ++i) { for (size_t i = 0; i < ARRAY_SIZE(vimvars); ++i) {
p = &vimvars[i]; p = &vimvars[i];
if (p->vv_di.di_tv.v_type == VAR_STRING) { if (p->vv_di.di_tv.v_type == VAR_STRING) {
xfree(p->vv_str); xfree(p->vv_str);
@@ -3188,7 +3187,7 @@ char_u *get_user_var_name(expand_T *xp, int idx)
static size_t bdone; static size_t bdone;
static size_t wdone; static size_t wdone;
static size_t tdone; static size_t tdone;
static int vidx; static size_t vidx;
static hashitem_T *hi; static hashitem_T *hi;
hashtab_T *ht; hashtab_T *ht;
@@ -3250,9 +3249,10 @@ char_u *get_user_var_name(expand_T *xp, int idx)
return cat_prefix_varname('t', hi->hi_key); return cat_prefix_varname('t', hi->hi_key);
} }
/* v: variables */ // v: variables
if (vidx < VV_LEN) if (vidx < ARRAY_SIZE(vimvars)) {
return cat_prefix_varname('v', (char_u *)vimvars[vidx++].vv_name); return cat_prefix_varname('v', (char_u *)vimvars[vidx++].vv_name);
}
xfree(varnamebuf); xfree(varnamebuf);
varnamebuf = NULL; varnamebuf = NULL;

5
src/nvim/eval.h
View File

@@ -54,7 +54,7 @@ EXTERN ufunc_T dumuf;
#define HI2UF(hi) HIKEY2UF((hi)->hi_key) #define HI2UF(hi) HIKEY2UF((hi)->hi_key)
/* Defines for Vim variables. These must match vimvars[] in eval.c! */ /* Defines for Vim variables. These must match vimvars[] in eval.c! */
enum { typedef enum {
VV_COUNT, VV_COUNT,
VV_COUNT1, VV_COUNT1,
VV_PREVCOUNT, VV_PREVCOUNT,
@@ -125,8 +125,7 @@ enum {
VV_TRUE, VV_TRUE,
VV_NULL, VV_NULL,
VV_NONE, VV_NONE,
VV_LEN, ///< Number of v: variables } VimVarIndex;
};
/// All recognized msgpack types /// All recognized msgpack types
typedef enum { typedef enum {