mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
eval: Change the point at which arg_errmsg and its length are changed
Ref #6437
This commit is contained in:
parent
58d2ce9bdb
commit
b2942d1e72
130
src/nvim/eval.c
130
src/nvim/eval.c
@ -2378,9 +2378,9 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv,
|
|||||||
&tv, &di, true, false) == OK) {
|
&tv, &di, true, false) == OK) {
|
||||||
if ((di == NULL
|
if ((di == NULL
|
||||||
|| (!var_check_ro(di->di_flags, (const char *)lp->ll_name,
|
|| (!var_check_ro(di->di_flags, (const char *)lp->ll_name,
|
||||||
STRLEN(lp->ll_name))
|
TV_CSTRING)
|
||||||
&& !tv_check_lock(di->di_tv.v_lock, (const char *)lp->ll_name,
|
&& !tv_check_lock(di->di_tv.v_lock, (const char *)lp->ll_name,
|
||||||
STRLEN(lp->ll_name))))
|
TV_CSTRING)))
|
||||||
&& eexe_mod_op(&tv, rettv, (const char *)op) == OK) {
|
&& eexe_mod_op(&tv, rettv, (const char *)op) == OK) {
|
||||||
set_var(lp->ll_name, lp->ll_name_len, &tv, false);
|
set_var(lp->ll_name, lp->ll_name_len, &tv, false);
|
||||||
}
|
}
|
||||||
@ -2393,7 +2393,7 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv,
|
|||||||
} else if (tv_check_lock(lp->ll_newkey == NULL
|
} else if (tv_check_lock(lp->ll_newkey == NULL
|
||||||
? lp->ll_tv->v_lock
|
? lp->ll_tv->v_lock
|
||||||
: lp->ll_tv->vval.v_dict->dv_lock,
|
: lp->ll_tv->vval.v_dict->dv_lock,
|
||||||
(const char *)lp->ll_name, STRLEN(lp->ll_name))) {
|
(const char *)lp->ll_name, TV_CSTRING)) {
|
||||||
} else if (lp->ll_range) {
|
} else if (lp->ll_range) {
|
||||||
listitem_T *ll_li = lp->ll_li;
|
listitem_T *ll_li = lp->ll_li;
|
||||||
int ll_n1 = lp->ll_n1;
|
int ll_n1 = lp->ll_n1;
|
||||||
@ -2402,7 +2402,7 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv,
|
|||||||
for (listitem_T *ri = rettv->vval.v_list->lv_first;
|
for (listitem_T *ri = rettv->vval.v_list->lv_first;
|
||||||
ri != NULL && ll_li != NULL; ) {
|
ri != NULL && ll_li != NULL; ) {
|
||||||
if (tv_check_lock(ll_li->li_tv.v_lock, (const char *)lp->ll_name,
|
if (tv_check_lock(ll_li->li_tv.v_lock, (const char *)lp->ll_name,
|
||||||
STRLEN(lp->ll_name))) {
|
TV_CSTRING)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ri = ri->li_next;
|
ri = ri->li_next;
|
||||||
@ -2992,14 +2992,14 @@ int do_unlet(const char *const name, const size_t name_len, const int forceit)
|
|||||||
}
|
}
|
||||||
if (hi != NULL && !HASHITEM_EMPTY(hi)) {
|
if (hi != NULL && !HASHITEM_EMPTY(hi)) {
|
||||||
dictitem_T *const di = TV_DICT_HI2DI(hi);
|
dictitem_T *const di = TV_DICT_HI2DI(hi);
|
||||||
if (var_check_fixed(di->di_flags, (const char *)name, STRLEN(name))
|
if (var_check_fixed(di->di_flags, (const char *)name, TV_CSTRING)
|
||||||
|| var_check_ro(di->di_flags, (const char *)name, STRLEN(name))
|
|| var_check_ro(di->di_flags, (const char *)name, TV_CSTRING)
|
||||||
|| tv_check_lock(d->dv_lock, (const char *)name, STRLEN(name))) {
|
|| tv_check_lock(d->dv_lock, (const char *)name, TV_CSTRING)) {
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (d == NULL
|
if (d == NULL
|
||||||
|| tv_check_lock(d->dv_lock, (const char *)name, STRLEN(name))) {
|
|| tv_check_lock(d->dv_lock, (const char *)name, TV_CSTRING)) {
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6553,10 +6553,8 @@ static void f_add(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
|||||||
|
|
||||||
rettv->vval.v_number = 1; /* Default: Failed */
|
rettv->vval.v_number = 1; /* Default: Failed */
|
||||||
if (argvars[0].v_type == VAR_LIST) {
|
if (argvars[0].v_type == VAR_LIST) {
|
||||||
const char *const arg_errmsg = _("add() argument");
|
|
||||||
const size_t arg_errmsg_len = strlen(arg_errmsg);
|
|
||||||
if ((l = argvars[0].vval.v_list) != NULL
|
if ((l = argvars[0].vval.v_list) != NULL
|
||||||
&& !tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len)) {
|
&& !tv_check_lock(l->lv_lock, "add() argument", TV_TRANSLATE)) {
|
||||||
tv_list_append_tv(l, &argvars[1]);
|
tv_list_append_tv(l, &argvars[1]);
|
||||||
tv_copy(&argvars[0], rettv);
|
tv_copy(&argvars[0], rettv);
|
||||||
}
|
}
|
||||||
@ -8152,7 +8150,6 @@ static void f_expand(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
|||||||
static void f_extend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
static void f_extend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
||||||
{
|
{
|
||||||
const char *const arg_errmsg = N_("extend() argument");
|
const char *const arg_errmsg = N_("extend() argument");
|
||||||
const size_t arg_errmsg_len = strlen(arg_errmsg);
|
|
||||||
|
|
||||||
if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST) {
|
if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST) {
|
||||||
long before;
|
long before;
|
||||||
@ -8161,13 +8158,13 @@ static void f_extend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
|||||||
list_T *const l1 = argvars[0].vval.v_list;
|
list_T *const l1 = argvars[0].vval.v_list;
|
||||||
list_T *const l2 = argvars[1].vval.v_list;
|
list_T *const l2 = argvars[1].vval.v_list;
|
||||||
if (l1 == NULL) {
|
if (l1 == NULL) {
|
||||||
const bool locked = tv_check_lock(VAR_FIXED, arg_errmsg, arg_errmsg_len);
|
const bool locked = tv_check_lock(VAR_FIXED, arg_errmsg, TV_TRANSLATE);
|
||||||
(void)locked;
|
(void)locked;
|
||||||
assert(locked == true);
|
assert(locked == true);
|
||||||
} else if (l2 == NULL) {
|
} else if (l2 == NULL) {
|
||||||
// Do nothing
|
// Do nothing
|
||||||
tv_copy(&argvars[0], rettv);
|
tv_copy(&argvars[0], rettv);
|
||||||
} else if (!tv_check_lock(l1->lv_lock, arg_errmsg, arg_errmsg_len)) {
|
} else if (!tv_check_lock(l1->lv_lock, arg_errmsg, TV_TRANSLATE)) {
|
||||||
listitem_T *item;
|
listitem_T *item;
|
||||||
if (argvars[2].v_type != VAR_UNKNOWN) {
|
if (argvars[2].v_type != VAR_UNKNOWN) {
|
||||||
before = tv_get_number_chk(&argvars[2], &error);
|
before = tv_get_number_chk(&argvars[2], &error);
|
||||||
@ -8195,13 +8192,13 @@ static void f_extend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
|||||||
dict_T *const d1 = argvars[0].vval.v_dict;
|
dict_T *const d1 = argvars[0].vval.v_dict;
|
||||||
dict_T *const d2 = argvars[1].vval.v_dict;
|
dict_T *const d2 = argvars[1].vval.v_dict;
|
||||||
if (d1 == NULL) {
|
if (d1 == NULL) {
|
||||||
const bool locked = tv_check_lock(VAR_FIXED, arg_errmsg, arg_errmsg_len);
|
const bool locked = tv_check_lock(VAR_FIXED, arg_errmsg, TV_TRANSLATE);
|
||||||
(void)locked;
|
(void)locked;
|
||||||
assert(locked == true);
|
assert(locked == true);
|
||||||
} else if (d2 == NULL) {
|
} else if (d2 == NULL) {
|
||||||
// Do nothing
|
// Do nothing
|
||||||
tv_copy(&argvars[0], rettv);
|
tv_copy(&argvars[0], rettv);
|
||||||
} else if (!tv_check_lock(d1->dv_lock, arg_errmsg, arg_errmsg_len)) {
|
} else if (!tv_check_lock(d1->dv_lock, arg_errmsg, TV_TRANSLATE)) {
|
||||||
const char *action = "force";
|
const char *action = "force";
|
||||||
// Check the third argument.
|
// Check the third argument.
|
||||||
if (argvars[2].v_type != VAR_UNKNOWN) {
|
if (argvars[2].v_type != VAR_UNKNOWN) {
|
||||||
@ -8349,20 +8346,19 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map)
|
|||||||
int todo;
|
int todo;
|
||||||
char_u *ermsg = (char_u *)(map ? "map()" : "filter()");
|
char_u *ermsg = (char_u *)(map ? "map()" : "filter()");
|
||||||
const char *const arg_errmsg = (map
|
const char *const arg_errmsg = (map
|
||||||
? _("map() argument")
|
? N_("map() argument")
|
||||||
: _("filter() argument"));
|
: N_("filter() argument"));
|
||||||
const size_t arg_errmsg_len = strlen(arg_errmsg);
|
|
||||||
int save_did_emsg;
|
int save_did_emsg;
|
||||||
int idx = 0;
|
int idx = 0;
|
||||||
|
|
||||||
if (argvars[0].v_type == VAR_LIST) {
|
if (argvars[0].v_type == VAR_LIST) {
|
||||||
if ((l = argvars[0].vval.v_list) == NULL
|
if ((l = argvars[0].vval.v_list) == NULL
|
||||||
|| (!map && tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len))) {
|
|| (!map && tv_check_lock(l->lv_lock, arg_errmsg, TV_TRANSLATE))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else if (argvars[0].v_type == VAR_DICT) {
|
} else if (argvars[0].v_type == VAR_DICT) {
|
||||||
if ((d = argvars[0].vval.v_dict) == NULL
|
if ((d = argvars[0].vval.v_dict) == NULL
|
||||||
|| (!map && tv_check_lock(d->dv_lock, arg_errmsg, arg_errmsg_len))) {
|
|| (!map && tv_check_lock(d->dv_lock, arg_errmsg, TV_TRANSLATE))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -8395,8 +8391,8 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map)
|
|||||||
|
|
||||||
di = TV_DICT_HI2DI(hi);
|
di = TV_DICT_HI2DI(hi);
|
||||||
if (map
|
if (map
|
||||||
&& (tv_check_lock(di->di_tv.v_lock, arg_errmsg, arg_errmsg_len)
|
&& (tv_check_lock(di->di_tv.v_lock, arg_errmsg, TV_TRANSLATE)
|
||||||
|| var_check_ro(di->di_flags, arg_errmsg, arg_errmsg_len))) {
|
|| var_check_ro(di->di_flags, arg_errmsg, TV_TRANSLATE))) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -8407,8 +8403,8 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (!map && rem) {
|
if (!map && rem) {
|
||||||
if (var_check_fixed(di->di_flags, arg_errmsg, arg_errmsg_len)
|
if (var_check_fixed(di->di_flags, arg_errmsg, TV_TRANSLATE)
|
||||||
|| var_check_ro(di->di_flags, arg_errmsg, arg_errmsg_len)) {
|
|| var_check_ro(di->di_flags, arg_errmsg, TV_TRANSLATE)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
tv_dict_item_remove(d, di);
|
tv_dict_item_remove(d, di);
|
||||||
@ -8421,7 +8417,7 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map)
|
|||||||
|
|
||||||
for (li = l->lv_first; li != NULL; li = nli) {
|
for (li = l->lv_first; li != NULL; li = nli) {
|
||||||
if (map
|
if (map
|
||||||
&& tv_check_lock(li->li_tv.v_lock, arg_errmsg, arg_errmsg_len)) {
|
&& tv_check_lock(li->li_tv.v_lock, arg_errmsg, TV_TRANSLATE)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
nli = li->li_next;
|
nli = li->li_next;
|
||||||
@ -11158,13 +11154,12 @@ static void f_insert(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
|||||||
{
|
{
|
||||||
list_T *l;
|
list_T *l;
|
||||||
bool error = false;
|
bool error = false;
|
||||||
const char *const arg_errmsg = _("insert() argument");
|
|
||||||
const size_t arg_errmsg_len = strlen(arg_errmsg);
|
|
||||||
|
|
||||||
if (argvars[0].v_type != VAR_LIST) {
|
if (argvars[0].v_type != VAR_LIST) {
|
||||||
EMSG2(_(e_listarg), "insert()");
|
EMSG2(_(e_listarg), "insert()");
|
||||||
} else if ((l = argvars[0].vval.v_list) != NULL
|
} else if ((l = argvars[0].vval.v_list) != NULL
|
||||||
&& !tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len)) {
|
&& !tv_check_lock(l->lv_lock, N_("insert() argument"),
|
||||||
|
TV_TRANSLATE)) {
|
||||||
long before = 0;
|
long before = 0;
|
||||||
if (argvars[2].v_type != VAR_UNKNOWN) {
|
if (argvars[2].v_type != VAR_UNKNOWN) {
|
||||||
before = tv_get_number_chk(&argvars[2], &error);
|
before = tv_get_number_chk(&argvars[2], &error);
|
||||||
@ -13205,21 +13200,20 @@ static void f_remove(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
|||||||
long end;
|
long end;
|
||||||
dict_T *d;
|
dict_T *d;
|
||||||
dictitem_T *di;
|
dictitem_T *di;
|
||||||
const char *const arg_errmsg = _("remove() argument");
|
const char *const arg_errmsg = N_("remove() argument");
|
||||||
const size_t arg_errmsg_len = strlen(arg_errmsg);
|
|
||||||
|
|
||||||
if (argvars[0].v_type == VAR_DICT) {
|
if (argvars[0].v_type == VAR_DICT) {
|
||||||
if (argvars[2].v_type != VAR_UNKNOWN) {
|
if (argvars[2].v_type != VAR_UNKNOWN) {
|
||||||
EMSG2(_(e_toomanyarg), "remove()");
|
EMSG2(_(e_toomanyarg), "remove()");
|
||||||
} else if ((d = argvars[0].vval.v_dict) != NULL
|
} else if ((d = argvars[0].vval.v_dict) != NULL
|
||||||
&& !tv_check_lock(d->dv_lock, arg_errmsg, arg_errmsg_len)) {
|
&& !tv_check_lock(d->dv_lock, arg_errmsg, TV_TRANSLATE)) {
|
||||||
const char *key = tv_get_string_chk(&argvars[1]);
|
const char *key = tv_get_string_chk(&argvars[1]);
|
||||||
if (key != NULL) {
|
if (key != NULL) {
|
||||||
di = tv_dict_find(d, key, -1);
|
di = tv_dict_find(d, key, -1);
|
||||||
if (di == NULL) {
|
if (di == NULL) {
|
||||||
EMSG2(_(e_dictkey), key);
|
EMSG2(_(e_dictkey), key);
|
||||||
} else if (!var_check_fixed(di->di_flags, arg_errmsg, arg_errmsg_len)
|
} else if (!var_check_fixed(di->di_flags, arg_errmsg, TV_TRANSLATE)
|
||||||
&& !var_check_ro(di->di_flags, arg_errmsg, arg_errmsg_len)) {
|
&& !var_check_ro(di->di_flags, arg_errmsg, TV_TRANSLATE)) {
|
||||||
*rettv = di->di_tv;
|
*rettv = di->di_tv;
|
||||||
di->di_tv = TV_INITIAL_VALUE;
|
di->di_tv = TV_INITIAL_VALUE;
|
||||||
tv_dict_item_remove(d, di);
|
tv_dict_item_remove(d, di);
|
||||||
@ -13232,7 +13226,7 @@ static void f_remove(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
|||||||
} else if (argvars[0].v_type != VAR_LIST) {
|
} else if (argvars[0].v_type != VAR_LIST) {
|
||||||
EMSG2(_(e_listdictarg), "remove()");
|
EMSG2(_(e_listdictarg), "remove()");
|
||||||
} else if ((l = argvars[0].vval.v_list) != NULL
|
} else if ((l = argvars[0].vval.v_list) != NULL
|
||||||
&& !tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len)) {
|
&& !tv_check_lock(l->lv_lock, arg_errmsg, TV_TRANSLATE)) {
|
||||||
bool error = false;
|
bool error = false;
|
||||||
|
|
||||||
idx = tv_get_number_chk(&argvars[1], &error);
|
idx = tv_get_number_chk(&argvars[1], &error);
|
||||||
@ -13503,14 +13497,12 @@ static void f_resolve(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
|||||||
*/
|
*/
|
||||||
static void f_reverse(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
static void f_reverse(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
||||||
{
|
{
|
||||||
const char *const arg_errmsg = _("reverse() argument");
|
|
||||||
const size_t arg_errmsg_len = strlen(arg_errmsg);
|
|
||||||
|
|
||||||
list_T *l;
|
list_T *l;
|
||||||
if (argvars[0].v_type != VAR_LIST) {
|
if (argvars[0].v_type != VAR_LIST) {
|
||||||
EMSG2(_(e_listarg), "reverse()");
|
EMSG2(_(e_listarg), "reverse()");
|
||||||
} else if ((l = argvars[0].vval.v_list) != NULL
|
} else if ((l = argvars[0].vval.v_list) != NULL
|
||||||
&& !tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len)) {
|
&& !tv_check_lock(l->lv_lock, N_("reverse() argument"),
|
||||||
|
TV_TRANSLATE)) {
|
||||||
listitem_T *li = l->lv_last;
|
listitem_T *li = l->lv_last;
|
||||||
l->lv_first = l->lv_last = NULL;
|
l->lv_first = l->lv_last = NULL;
|
||||||
l->lv_len = 0;
|
l->lv_len = 0;
|
||||||
@ -15202,16 +15194,14 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort)
|
|||||||
sortinfo = &info;
|
sortinfo = &info;
|
||||||
|
|
||||||
const char *const arg_errmsg = (sort
|
const char *const arg_errmsg = (sort
|
||||||
? _("sort() argument")
|
? N_("sort() argument")
|
||||||
: _("uniq() argument"));
|
: N_("uniq() argument"));
|
||||||
const size_t arg_errmsg_len = strlen(arg_errmsg);
|
|
||||||
|
|
||||||
if (argvars[0].v_type != VAR_LIST) {
|
if (argvars[0].v_type != VAR_LIST) {
|
||||||
EMSG2(_(e_listarg), sort ? "sort()" : "uniq()");
|
EMSG2(_(e_listarg), sort ? "sort()" : "uniq()");
|
||||||
} else {
|
} else {
|
||||||
l = argvars[0].vval.v_list;
|
l = argvars[0].vval.v_list;
|
||||||
if (l == NULL
|
if (l == NULL || tv_check_lock(l->lv_lock, arg_errmsg, TV_TRANSLATE)) {
|
||||||
|| tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len)) {
|
|
||||||
goto theend;
|
goto theend;
|
||||||
}
|
}
|
||||||
rettv->vval.v_list = l;
|
rettv->vval.v_list = l;
|
||||||
@ -18876,24 +18866,37 @@ static void set_var(const char *name, const size_t name_len, typval_T *const tv,
|
|||||||
///
|
///
|
||||||
/// @param[in] flags di_flags attribute value.
|
/// @param[in] flags di_flags attribute value.
|
||||||
/// @param[in] name Variable name, for use in error message.
|
/// @param[in] name Variable name, for use in error message.
|
||||||
/// @param[in] name_len Variable name length.
|
/// @param[in] name_len Variable name length. Use #TV_TRANSLATE to translate
|
||||||
|
/// variable name and compute the length. Use #TV_CSTRING
|
||||||
|
/// to compute the length with strlen() without
|
||||||
|
/// translating.
|
||||||
///
|
///
|
||||||
/// @return True if variable is read-only: either always or in sandbox when
|
/// @return True if variable is read-only: either always or in sandbox when
|
||||||
/// sandbox is enabled, false otherwise.
|
/// sandbox is enabled, false otherwise.
|
||||||
bool var_check_ro(const int flags, const char *const name,
|
bool var_check_ro(const int flags, const char *name,
|
||||||
const size_t name_len)
|
size_t name_len)
|
||||||
FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
|
FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
|
||||||
{
|
{
|
||||||
|
const char *error_message = NULL;
|
||||||
if (flags & DI_FLAGS_RO) {
|
if (flags & DI_FLAGS_RO) {
|
||||||
emsgf(_(e_readonlyvar), (int)name_len, name);
|
error_message = N_(e_readonlyvar);
|
||||||
return true;
|
} else if ((flags & DI_FLAGS_RO_SBX) && sandbox) {
|
||||||
|
error_message = N_("E794: Cannot set variable in the sandbox: \"%.*s\"");
|
||||||
}
|
}
|
||||||
if ((flags & DI_FLAGS_RO_SBX) && sandbox) {
|
|
||||||
emsgf(_("E794: Cannot set variable in the sandbox: \"%.*s\""),
|
if (error_message == NULL) {
|
||||||
(int)name_len, name);
|
return false;
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
return false;
|
if (name_len == TV_TRANSLATE) {
|
||||||
|
name = _(name);
|
||||||
|
name_len = strlen(name);
|
||||||
|
} else if (name_len == TV_CSTRING) {
|
||||||
|
name_len = strlen(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
emsgf(_(error_message), (int)name_len, name);
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Check whether variable is fixed (DI_FLAGS_FIX)
|
/// Check whether variable is fixed (DI_FLAGS_FIX)
|
||||||
@ -18902,14 +18905,23 @@ bool var_check_ro(const int flags, const char *const name,
|
|||||||
///
|
///
|
||||||
/// @param[in] flags di_flags attribute value.
|
/// @param[in] flags di_flags attribute value.
|
||||||
/// @param[in] name Variable name, for use in error message.
|
/// @param[in] name Variable name, for use in error message.
|
||||||
/// @param[in] name_len Variable name length.
|
/// @param[in] name_len Variable name length. Use #TV_TRANSLATE to translate
|
||||||
|
/// variable name and compute the length. Use #TV_CSTRING
|
||||||
|
/// to compute the length with strlen() without
|
||||||
|
/// translating.
|
||||||
///
|
///
|
||||||
/// @return True if variable is fixed, false otherwise.
|
/// @return True if variable is fixed, false otherwise.
|
||||||
static bool var_check_fixed(const int flags, const char *const name,
|
static bool var_check_fixed(const int flags, const char *name,
|
||||||
const size_t name_len)
|
size_t name_len)
|
||||||
FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
|
FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
|
||||||
{
|
{
|
||||||
if (flags & DI_FLAGS_FIX) {
|
if (flags & DI_FLAGS_FIX) {
|
||||||
|
if (name_len == TV_TRANSLATE) {
|
||||||
|
name = _(name);
|
||||||
|
name_len = strlen(name);
|
||||||
|
} else if (name_len == TV_CSTRING) {
|
||||||
|
name_len = strlen(name);
|
||||||
|
}
|
||||||
emsgf(_("E795: Cannot delete variable %.*s"), (int)name_len, name);
|
emsgf(_("E795: Cannot delete variable %.*s"), (int)name_len, name);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -19716,12 +19728,12 @@ void ex_function(exarg_T *eap)
|
|||||||
}
|
}
|
||||||
if (fudi.fd_di == NULL) {
|
if (fudi.fd_di == NULL) {
|
||||||
if (tv_check_lock(fudi.fd_dict->dv_lock, (const char *)eap->arg,
|
if (tv_check_lock(fudi.fd_dict->dv_lock, (const char *)eap->arg,
|
||||||
STRLEN(eap->arg))) {
|
TV_CSTRING)) {
|
||||||
// Can't add a function to a locked dictionary
|
// Can't add a function to a locked dictionary
|
||||||
goto erret;
|
goto erret;
|
||||||
}
|
}
|
||||||
} else if (tv_check_lock(fudi.fd_di->di_tv.v_lock, (const char *)eap->arg,
|
} else if (tv_check_lock(fudi.fd_di->di_tv.v_lock, (const char *)eap->arg,
|
||||||
STRLEN(eap->arg))) {
|
TV_CSTRING)) {
|
||||||
// Can't change an existing function if it is locked
|
// Can't change an existing function if it is locked
|
||||||
goto erret;
|
goto erret;
|
||||||
}
|
}
|
||||||
|
@ -2045,11 +2045,14 @@ bool tv_islocked(const typval_T *const tv)
|
|||||||
///
|
///
|
||||||
/// @param[in] lock Lock status.
|
/// @param[in] lock Lock status.
|
||||||
/// @param[in] name Variable name, used in the error message.
|
/// @param[in] name Variable name, used in the error message.
|
||||||
/// @param[in] name_len Variable name length.
|
/// @param[in] name_len Variable name length. Use #TV_TRANSLATE to translate
|
||||||
|
/// variable name and compute the length. Use #TV_CSTRING
|
||||||
|
/// to compute the length with strlen() without
|
||||||
|
/// translating.
|
||||||
///
|
///
|
||||||
/// @return true if variable is locked, false otherwise.
|
/// @return true if variable is locked, false otherwise.
|
||||||
bool tv_check_lock(const VarLockStatus lock, const char *const name,
|
bool tv_check_lock(const VarLockStatus lock, const char *name,
|
||||||
const size_t name_len)
|
size_t name_len)
|
||||||
FUNC_ATTR_WARN_UNUSED_RESULT
|
FUNC_ATTR_WARN_UNUSED_RESULT
|
||||||
{
|
{
|
||||||
const char *error_message = NULL;
|
const char *error_message = NULL;
|
||||||
@ -2068,10 +2071,17 @@ bool tv_check_lock(const VarLockStatus lock, const char *const name,
|
|||||||
}
|
}
|
||||||
assert(error_message != NULL);
|
assert(error_message != NULL);
|
||||||
|
|
||||||
const char *const unknown_name = _("Unknown");
|
if (name == NULL) {
|
||||||
|
name = _("Unknown");
|
||||||
|
name_len = strlen(name);
|
||||||
|
} else if (name_len == TV_TRANSLATE) {
|
||||||
|
name = _(name);
|
||||||
|
name_len = strlen(name);
|
||||||
|
} else if (name_len == TV_CSTRING) {
|
||||||
|
name_len = strlen(name);
|
||||||
|
}
|
||||||
|
|
||||||
emsgf(_(error_message), (name != NULL ? name_len : strlen(unknown_name)),
|
emsgf(_(error_message), (int)name_len, name);
|
||||||
(name != NULL ? name : unknown_name));
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -423,6 +423,17 @@ static inline bool tv_is_func(const typval_T tv)
|
|||||||
return tv.v_type == VAR_FUNC || tv.v_type == VAR_PARTIAL;
|
return tv.v_type == VAR_FUNC || tv.v_type == VAR_PARTIAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Specify that argument needs to be translated
|
||||||
|
///
|
||||||
|
/// Used for size_t length arguments to avoid calling gettext() and strlen()
|
||||||
|
/// unless needed.
|
||||||
|
#define TV_TRANSLATE (SIZE_MAX)
|
||||||
|
|
||||||
|
/// Specify that argument is a NUL-terminated C string
|
||||||
|
///
|
||||||
|
/// Used for size_t length arguments to avoid calling strlen() unless needed.
|
||||||
|
#define TV_CSTRING (SIZE_MAX - 1)
|
||||||
|
|
||||||
#ifdef INCLUDE_GENERATED_DECLARATIONS
|
#ifdef INCLUDE_GENERATED_DECLARATIONS
|
||||||
# include "eval/typval.h.generated.h"
|
# include "eval/typval.h.generated.h"
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user