Skip to content

Commit 2c5576e

Browse files
brammooldouglasdrumond
brammool
authored and
douglasdrumond
committed
patch 7.4.708 Problem: gettext() is called too often. Solution: Do not call gettext() for messages until they are actually used. (idea by Yasuhiro Matsumoto)
1 parent 03a2a2c commit 2c5576e

File tree

2 files changed

+62
-54
lines changed

2 files changed

+62
-54
lines changed

‎src/eval.c‎

Lines changed: 60 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -802,11 +802,11 @@ static void delete_var __ARGS((hashtab_T *ht, hashitem_T *hi));
802802
static void list_one_var __ARGS((dictitem_T *v, char_u *prefix, int *first));
803803
static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type, char_u *string, int *first));
804804
static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
805-
static int var_check_ro __ARGS((int flags, char_u *name));
806-
static int var_check_fixed __ARGS((int flags, char_u *name));
805+
static int var_check_ro __ARGS((int flags, char_u *name, int use_gettext));
806+
static int var_check_fixed __ARGS((int flags, char_u *name, int use_gettext));
807807
static int var_check_func_name __ARGS((char_u *name, int new_var));
808808
static int valid_varname __ARGS((char_u *varname));
809-
static int tv_check_lock __ARGS((int lock, char_u *name));
809+
static int tv_check_lock __ARGS((int lock, char_u *name, int use_gettext));
810810
static int item_copy __ARGS((typval_T *from, typval_T *to, int deep, int copyID));
811811
static char_u *find_option_end __ARGS((char_u **arg, int *opt_flags));
812812
static char_u *trans_function_name __ARGS((char_u **pp, int skip, int flags, funcdict_T *fd));
@@ -2808,7 +2808,7 @@ get_lval(name, rettv, lp, unlet, skip, flags, fne_flags)
28082808
break;
28092809
}
28102810
/* existing variable, need to check if it can be changed */
2811-
else if (var_check_ro(lp->ll_di->di_flags, name))
2811+
else if (var_check_ro(lp->ll_di->di_flags, name, FALSE))
28122812
return NULL;
28132813

28142814
if (len == -1)
@@ -2941,7 +2941,7 @@ set_var_lval(lp, endp, rettv, copy, op)
29412941
}
29422942
else if (tv_check_lock(lp->ll_newkey == NULL
29432943
? lp->ll_tv->v_lock
2944-
: lp->ll_tv->vval.v_dict->dv_lock, lp->ll_name))
2944+
: lp->ll_tv->vval.v_dict->dv_lock, lp->ll_name, FALSE))
29452945
;
29462946
else if (lp->ll_range)
29472947
{
@@ -2953,7 +2953,7 @@ set_var_lval(lp, endp, rettv, copy, op)
29532953
*/
29542954
for (ri = rettv->vval.v_list->lv_first; ri != NULL && ll_li != NULL; )
29552955
{
2956-
if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name))
2956+
if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name, FALSE))
29572957
return;
29582958
ri = ri->li_next;
29592959
if (ri == NULL || (!lp->ll_empty2 && lp->ll_n2 == ll_n1))
@@ -3659,9 +3659,9 @@ do_unlet_var(lp, name_end, forceit)
36593659
*name_end = cc;
36603660
}
36613661
else if ((lp->ll_list != NULL
3662-
&& tv_check_lock(lp->ll_list->lv_lock, lp->ll_name))
3662+
&& tv_check_lock(lp->ll_list->lv_lock, lp->ll_name, FALSE))
36633663
|| (lp->ll_dict != NULL
3664-
&& tv_check_lock(lp->ll_dict->dv_lock, lp->ll_name)))
3664+
&& tv_check_lock(lp->ll_dict->dv_lock, lp->ll_name, FALSE)))
36653665
return FAIL;
36663666
else if (lp->ll_range)
36673667
{
@@ -3672,7 +3672,7 @@ do_unlet_var(lp, name_end, forceit)
36723672
while (ll_li != NULL && (lp->ll_empty2 || lp->ll_n2 >= ll_n1))
36733673
{
36743674
li = ll_li->li_next;
3675-
if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name))
3675+
if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name, FALSE))
36763676
return FAIL;
36773677
ll_li = li;
36783678
++ll_n1;
@@ -3732,9 +3732,9 @@ do_unlet(name, forceit)
37323732
if (!HASHITEM_EMPTY(hi))
37333733
{
37343734
di = HI2DI(hi);
3735-
if (var_check_fixed(di->di_flags, name)
3736-
|| var_check_ro(di->di_flags, name)
3737-
|| tv_check_lock(d->dv_lock, name))
3735+
if (var_check_fixed(di->di_flags, name, FALSE)
3736+
|| var_check_ro(di->di_flags, name, FALSE)
3737+
|| tv_check_lock(d->dv_lock, name, FALSE))
37383738
return FAIL;
37393739
delete_var(ht, hi);
37403740
return OK;
@@ -8938,7 +8938,8 @@ f_add(argvars, rettv)
89388938
if (argvars[0].v_type == VAR_LIST)
89398939
{
89408940
if ((l = argvars[0].vval.v_list) != NULL
8941-
&& !tv_check_lock(l->lv_lock, (char_u *)_("add() argument"))
8941+
&& !tv_check_lock(l->lv_lock,
8942+
(char_u *)N_("add() argument"), TRUE)
89428943
&& list_append_tv(l, &argvars[1]) == OK)
89438944
copy_tv(&argvars[0], rettv);
89448945
}
@@ -10500,7 +10501,7 @@ dict_extend(d1, d2, action)
1050010501
dictitem_T *di1;
1050110502
hashitem_T *hi2;
1050210503
int todo;
10503-
char *arg_errmsg = N_("extend() argument");
10504+
char_u *arg_errmsg = (char_u *)N_("extend() argument");
1050410505

1050510506
todo = (int)d2->dv_hashtab.ht_used;
1050610507
for (hi2 = d2->dv_hashtab.ht_array; todo > 0; ++hi2)
@@ -10535,8 +10536,8 @@ dict_extend(d1, d2, action)
1053510536
}
1053610537
else if (*action == 'f' && HI2DI(hi2) != di1)
1053710538
{
10538-
if (tv_check_lock(di1->di_tv.v_lock, (char_u *)_(arg_errmsg))
10539-
|| var_check_ro(di1->di_flags, (char_u *)_(arg_errmsg)))
10539+
if (tv_check_lock(di1->di_tv.v_lock, arg_errmsg, TRUE)
10540+
|| var_check_ro(di1->di_flags, arg_errmsg, TRUE))
1054010541
break;
1054110542
clear_tv(&di1->di_tv);
1054210543
copy_tv(&HI2DI(hi2)->di_tv, &di1->di_tv);
@@ -10554,7 +10555,7 @@ f_extend(argvars, rettv)
1055410555
typval_T *argvars;
1055510556
typval_T *rettv;
1055610557
{
10557-
char *arg_errmsg = N_("extend() argument");
10558+
char_u *arg_errmsg = (char_u *)N_("extend() argument");
1055810559

1055910560
if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST)
1056010561
{
@@ -10565,7 +10566,7 @@ f_extend(argvars, rettv)
1056510566

1056610567
l1 = argvars[0].vval.v_list;
1056710568
l2 = argvars[1].vval.v_list;
10568-
if (l1 != NULL && !tv_check_lock(l1->lv_lock, (char_u *)_(arg_errmsg))
10569+
if (l1 != NULL && !tv_check_lock(l1->lv_lock, arg_errmsg, TRUE)
1056910570
&& l2 != NULL)
1057010571
{
1057110572
if (argvars[2].v_type != VAR_UNKNOWN)
@@ -10601,7 +10602,7 @@ f_extend(argvars, rettv)
1060110602

1060210603
d1 = argvars[0].vval.v_dict;
1060310604
d2 = argvars[1].vval.v_dict;
10604-
if (d1 != NULL && !tv_check_lock(d1->dv_lock, (char_u *)_(arg_errmsg))
10605+
if (d1 != NULL && !tv_check_lock(d1->dv_lock, arg_errmsg, TRUE)
1060510606
&& d2 != NULL)
1060610607
{
1060710608
/* Check the third argument. */
@@ -10820,21 +10821,21 @@ filter_map(argvars, rettv, map)
1082010821
int rem;
1082110822
int todo;
1082210823
char_u *ermsg = (char_u *)(map ? "map()" : "filter()");
10823-
char *arg_errmsg = (map ? N_("map() argument")
10824+
char_u *arg_errmsg = (char_u *)(map ? N_("map() argument")
1082410825
: N_("filter() argument"));
1082510826
int save_did_emsg;
1082610827
int idx = 0;
1082710828

1082810829
if (argvars[0].v_type == VAR_LIST)
1082910830
{
1083010831
if ((l = argvars[0].vval.v_list) == NULL
10831-
|| (!map && tv_check_lock(l->lv_lock, (char_u *)_(arg_errmsg))))
10832+
|| (!map && tv_check_lock(l->lv_lock, arg_errmsg, TRUE)))
1083210833
return;
1083310834
}
1083410835
else if (argvars[0].v_type == VAR_DICT)
1083510836
{
1083610837
if ((d = argvars[0].vval.v_dict) == NULL
10837-
|| (!map && tv_check_lock(d->dv_lock, (char_u *)_(arg_errmsg))))
10838+
|| (!map && tv_check_lock(d->dv_lock, arg_errmsg, TRUE)))
1083810839
return;
1083910840
}
1084010841
else
@@ -10874,10 +10875,8 @@ filter_map(argvars, rettv, map)
1087410875
--todo;
1087510876
di = HI2DI(hi);
1087610877
if (map &&
10877-
(tv_check_lock(di->di_tv.v_lock,
10878-
(char_u *)_(arg_errmsg))
10879-
|| var_check_ro(di->di_flags,
10880-
(char_u *)_(arg_errmsg))))
10878+
(tv_check_lock(di->di_tv.v_lock, arg_errmsg, TRUE)
10879+
|| var_check_ro(di->di_flags, arg_errmsg, TRUE)))
1088110880
break;
1088210881
vimvars[VV_KEY].vv_str = vim_strsave(di->di_key);
1088310882
r = filter_map_one(&di->di_tv, expr, map, &rem);
@@ -10886,10 +10885,8 @@ filter_map(argvars, rettv, map)
1088610885
break;
1088710886
if (!map && rem)
1088810887
{
10889-
if (var_check_fixed(di->di_flags,
10890-
(char_u *)_(arg_errmsg))
10891-
|| var_check_ro(di->di_flags,
10892-
(char_u *)_(arg_errmsg)))
10888+
if (var_check_fixed(di->di_flags, arg_errmsg, TRUE)
10889+
|| var_check_ro(di->di_flags, arg_errmsg, TRUE))
1089310890
break;
1089410891
dictitem_remove(d, di);
1089510892
}
@@ -10903,8 +10900,7 @@ filter_map(argvars, rettv, map)
1090310900

1090410901
for (li = l->lv_first; li != NULL; li = nli)
1090510902
{
10906-
if (map && tv_check_lock(li->li_tv.v_lock,
10907-
(char_u *)_(arg_errmsg)))
10903+
if (map && tv_check_lock(li->li_tv.v_lock, arg_errmsg, TRUE))
1090810904
break;
1090910905
nli = li->li_next;
1091010906
vimvars[VV_KEY].vv_nr = idx;
@@ -13776,7 +13772,7 @@ f_insert(argvars, rettv)
1377613772
if (argvars[0].v_type != VAR_LIST)
1377713773
EMSG2(_(e_listarg), "insert()");
1377813774
else if ((l = argvars[0].vval.v_list) != NULL
13779-
&& !tv_check_lock(l->lv_lock, (char_u *)_("insert() argument")))
13775+
&& !tv_check_lock(l->lv_lock, (char_u *)N_("insert() argument"), TRUE))
1378013776
{
1378113777
if (argvars[2].v_type != VAR_UNKNOWN)
1378213778
before = get_tv_number_chk(&argvars[2], &error);
@@ -15865,24 +15861,23 @@ f_remove(argvars, rettv)
1586515861
char_u *key;
1586615862
dict_T *d;
1586715863
dictitem_T *di;
15868-
char *arg_errmsg = N_("remove() argument");
15864+
char_u *arg_errmsg = (char_u *)N_("remove() argument");
1586915865

1587015866
if (argvars[0].v_type == VAR_DICT)
1587115867
{
1587215868
if (argvars[2].v_type != VAR_UNKNOWN)
1587315869
EMSG2(_(e_toomanyarg), "remove()");
1587415870
else if ((d = argvars[0].vval.v_dict) != NULL
15875-
&& !tv_check_lock(d->dv_lock, (char_u *)_(arg_errmsg)))
15871+
&& !tv_check_lock(d->dv_lock, arg_errmsg, TRUE))
1587615872
{
1587715873
key = get_tv_string_chk(&argvars[1]);
1587815874
if (key != NULL)
1587915875
{
1588015876
di = dict_find(d, key, -1);
1588115877
if (di == NULL)
1588215878
EMSG2(_(e_dictkey), key);
15883-
else if (!var_check_fixed(di->di_flags, (char_u *)_(arg_errmsg))
15884-
&& !var_check_ro(di->di_flags,
15885-
(char_u *)_(arg_errmsg)))
15879+
else if (!var_check_fixed(di->di_flags, arg_errmsg, TRUE)
15880+
&& !var_check_ro(di->di_flags, arg_errmsg, TRUE))
1588615881
{
1588715882
*rettv = di->di_tv;
1588815883
init_tv(&di->di_tv);
@@ -15894,7 +15889,7 @@ f_remove(argvars, rettv)
1589415889
else if (argvars[0].v_type != VAR_LIST)
1589515890
EMSG2(_(e_listdictarg), "remove()");
1589615891
else if ((l = argvars[0].vval.v_list) != NULL
15897-
&& !tv_check_lock(l->lv_lock, (char_u *)_(arg_errmsg)))
15892+
&& !tv_check_lock(l->lv_lock, arg_errmsg, TRUE))
1589815893
{
1589915894
int error = FALSE;
1590015895

@@ -16238,7 +16233,8 @@ f_reverse(argvars, rettv)
1623816233
if (argvars[0].v_type != VAR_LIST)
1623916234
EMSG2(_(e_listarg), "reverse()");
1624016235
else if ((l = argvars[0].vval.v_list) != NULL
16241-
&& !tv_check_lock(l->lv_lock, (char_u *)_("reverse() argument")))
16236+
&& !tv_check_lock(l->lv_lock,
16237+
(char_u *)N_("reverse() argument"), TRUE))
1624216238
{
1624316239
li = l->lv_last;
1624416240
l->lv_first = l->lv_last = NULL;
@@ -17772,7 +17768,8 @@ do_sort_uniq(argvars, rettv, sort)
1777217768
{
1777317769
l = argvars[0].vval.v_list;
1777417770
if (l == NULL || tv_check_lock(l->lv_lock,
17775-
(char_u *)(sort ? _("sort() argument") : _("uniq() argument"))))
17771+
(char_u *)(sort ? N_("sort() argument") : N_("uniq() argument")),
17772+
TRUE))
1777617773
return;
1777717774
rettv->vval.v_list = l;
1777817775
rettv->v_type = VAR_LIST;
@@ -21484,8 +21481,8 @@ set_var(name, tv, copy)
2148421481
if (v != NULL)
2148521482
{
2148621483
/* existing variable, need to clear the value */
21487-
if (var_check_ro(v->di_flags, name)
21488-
|| tv_check_lock(v->di_tv.v_lock, name))
21484+
if (var_check_ro(v->di_flags, name, FALSE)
21485+
|| tv_check_lock(v->di_tv.v_lock, name, FALSE))
2148921486
return;
2149021487
if (v->di_tv.v_type != tv->v_type
2149121488
&& !((v->di_tv.v_type == VAR_STRING
@@ -21583,18 +21580,19 @@ set_var(name, tv, copy)
2158321580
* Also give an error message.
2158421581
*/
2158521582
static int
21586-
var_check_ro(flags, name)
21583+
var_check_ro(flags, name, use_gettext)
2158721584
int flags;
2158821585
char_u *name;
21586+
int use_gettext;
2158921587
{
2159021588
if (flags & DI_FLAGS_RO)
2159121589
{
21592-
EMSG2(_(e_readonlyvar), name);
21590+
EMSG2(_(e_readonlyvar), use_gettext ? (char_u *)_(name) : name);
2159321591
return TRUE;
2159421592
}
2159521593
if ((flags & DI_FLAGS_RO_SBX) && sandbox)
2159621594
{
21597-
EMSG2(_(e_readonlysbx), name);
21595+
EMSG2(_(e_readonlysbx), use_gettext ? (char_u *)_(name) : name);
2159821596
return TRUE;
2159921597
}
2160021598
return FALSE;
@@ -21605,13 +21603,15 @@ var_check_ro(flags, name)
2160521603
* Also give an error message.
2160621604
*/
2160721605
static int
21608-
var_check_fixed(flags, name)
21606+
var_check_fixed(flags, name, use_gettext)
2160921607
int flags;
2161021608
char_u *name;
21609+
int use_gettext;
2161121610
{
2161221611
if (flags & DI_FLAGS_FIX)
2161321612
{
21614-
EMSG2(_("E795: Cannot delete variable %s"), name);
21613+
EMSG2(_("E795: Cannot delete variable %s"),
21614+
use_gettext ? (char_u *)_(name) : name);
2161521615
return TRUE;
2161621616
}
2161721617
return FALSE;
@@ -21669,23 +21669,29 @@ valid_varname(varname)
2166921669

2167021670
/*
2167121671
* Return TRUE if typeval "tv" is set to be locked (immutable).
21672-
* Also give an error message, using "name".
21672+
* Also give an error message, using "name" or _("name") when use_gettext is
21673+
* TRUE.
2167321674
*/
2167421675
static int
21675-
tv_check_lock(lock, name)
21676+
tv_check_lock(lock, name, use_gettext)
2167621677
int lock;
2167721678
char_u *name;
21679+
int use_gettext;
2167821680
{
2167921681
if (lock & VAR_LOCKED)
2168021682
{
2168121683
EMSG2(_("E741: Value is locked: %s"),
21682-
name == NULL ? (char_u *)_("Unknown") : name);
21684+
name == NULL ? (char_u *)_("Unknown")
21685+
: use_gettext ? (char_u *)_(name)
21686+
: name);
2168321687
return TRUE;
2168421688
}
2168521689
if (lock & VAR_FIXED)
2168621690
{
2168721691
EMSG2(_("E742: Cannot change value of %s"),
21688-
name == NULL ? (char_u *)_("Unknown") : name);
21692+
name == NULL ? (char_u *)_("Unknown")
21693+
: use_gettext ? (char_u *)_(name)
21694+
: name);
2168921695
return TRUE;
2169021696
}
2169121697
return FALSE;
@@ -22623,11 +22629,11 @@ ex_function(eap)
2262322629
if (fudi.fd_di == NULL)
2262422630
{
2262522631
/* Can't add a function to a locked dictionary */
22626-
if (tv_check_lock(fudi.fd_dict->dv_lock, eap->arg))
22632+
if (tv_check_lock(fudi.fd_dict->dv_lock, eap->arg, FALSE))
2262722633
goto erret;
2262822634
}
2262922635
/* Can't change an existing function if it is locked */
22630-
else if (tv_check_lock(fudi.fd_di->di_tv.v_lock, eap->arg))
22636+
else if (tv_check_lock(fudi.fd_di->di_tv.v_lock, eap->arg, FALSE))
2263122637
goto erret;
2263222638

2263322639
/* Give the function a sequential number. Can only be used with a

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,8 @@ static char *(features[]) =
756756

757757
static int included_patches[] =
758758
{ /* Add new patch number below this line */
759+
/**/
760+
708,
759761
/**/
760762
707,
761763
/**/

0 commit comments

Comments
 (0)