Skip to content

Commit 8739607

Browse files
brammoolbrammool
committed
patch 8.2.0069: ETYPE_ is used for two different enums
Problem: ETYPE_ is used for two different enums. Solution: Rename one to use EXPR_.
1 parent 556684f commit 8739607

4 files changed

Lines changed: 77 additions & 75 deletions

File tree

‎src/debugger.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ debuggy_find(
939939
}
940940
else
941941
{
942-
if (typval_compare(tv, bp->dbg_val, ETYPE_IS, FALSE) == OK
942+
if (typval_compare(tv, bp->dbg_val, EXPR_IS, FALSE) == OK
943943
&& tv->vval.v_number == FALSE)
944944
{
945945
typval_T *v;

‎src/eval.c‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,7 @@ eval4(char_u **arg, typval_T *rettv, int evaluate)
19971997
typval_T var2;
19981998
char_u *p;
19991999
int i;
2000-
exptype_T type = ETYPE_UNKNOWN;
2000+
exptype_T type = EXPR_UNKNOWN;
20012001
int len = 2;
20022002
int ic;
20032003

@@ -2011,46 +2011,46 @@ eval4(char_u **arg, typval_T *rettv, int evaluate)
20112011
switch (p[0])
20122012
{
20132013
case '=': if (p[1] == '=')
2014-
type = ETYPE_EQUAL;
2014+
type = EXPR_EQUAL;
20152015
else if (p[1] == '~')
2016-
type = ETYPE_MATCH;
2016+
type = EXPR_MATCH;
20172017
break;
20182018
case '!': if (p[1] == '=')
2019-
type = ETYPE_NEQUAL;
2019+
type = EXPR_NEQUAL;
20202020
else if (p[1] == '~')
2021-
type = ETYPE_NOMATCH;
2021+
type = EXPR_NOMATCH;
20222022
break;
20232023
case '>': if (p[1] != '=')
20242024
{
2025-
type = ETYPE_GREATER;
2025+
type = EXPR_GREATER;
20262026
len = 1;
20272027
}
20282028
else
2029-
type = ETYPE_GEQUAL;
2029+
type = EXPR_GEQUAL;
20302030
break;
20312031
case '<': if (p[1] != '=')
20322032
{
2033-
type = ETYPE_SMALLER;
2033+
type = EXPR_SMALLER;
20342034
len = 1;
20352035
}
20362036
else
2037-
type = ETYPE_SEQUAL;
2037+
type = EXPR_SEQUAL;
20382038
break;
20392039
case 'i': if (p[1] == 's')
20402040
{
20412041
if (p[2] == 'n' && p[3] == 'o' && p[4] == 't')
20422042
len = 5;
20432043
i = p[len];
20442044
if (!isalnum(i) && i != '_')
2045-
type = len == 2 ? ETYPE_IS : ETYPE_ISNOT;
2045+
type = len == 2 ? EXPR_IS : EXPR_ISNOT;
20462046
}
20472047
break;
20482048
}
20492049

20502050
/*
20512051
* If there is a comparative operator, use it.
20522052
*/
2053-
if (type != ETYPE_UNKNOWN)
2053+
if (type != EXPR_UNKNOWN)
20542054
{
20552055
// extra question mark appended: ignore case
20562056
if (p[len] == '?')
@@ -6189,25 +6189,25 @@ typval_compare(
61896189
varnumber_T n1, n2;
61906190
char_u *s1, *s2;
61916191
char_u buf1[NUMBUFLEN], buf2[NUMBUFLEN];
6192-
int type_is = type == ETYPE_IS || type == ETYPE_ISNOT;
6192+
int type_is = type == EXPR_IS || type == EXPR_ISNOT;
61936193

61946194
if (type_is && typ1->v_type != typ2->v_type)
61956195
{
61966196
// For "is" a different type always means FALSE, for "notis"
61976197
// it means TRUE.
6198-
n1 = (type == ETYPE_ISNOT);
6198+
n1 = (type == EXPR_ISNOT);
61996199
}
62006200
else if (typ1->v_type == VAR_BLOB || typ2->v_type == VAR_BLOB)
62016201
{
62026202
if (type_is)
62036203
{
62046204
n1 = (typ1->v_type == typ2->v_type
62056205
&& typ1->vval.v_blob == typ2->vval.v_blob);
6206-
if (type == ETYPE_ISNOT)
6206+
if (type == EXPR_ISNOT)
62076207
n1 = !n1;
62086208
}
62096209
else if (typ1->v_type != typ2->v_type
6210-
|| (type != ETYPE_EQUAL && type != ETYPE_NEQUAL))
6210+
|| (type != EXPR_EQUAL && type != EXPR_NEQUAL))
62116211
{
62126212
if (typ1->v_type != typ2->v_type)
62136213
emsg(_("E977: Can only compare Blob with Blob"));
@@ -6220,7 +6220,7 @@ typval_compare(
62206220
{
62216221
// Compare two Blobs for being equal or unequal.
62226222
n1 = blob_equal(typ1->vval.v_blob, typ2->vval.v_blob);
6223-
if (type == ETYPE_NEQUAL)
6223+
if (type == EXPR_NEQUAL)
62246224
n1 = !n1;
62256225
}
62266226
}
@@ -6230,11 +6230,11 @@ typval_compare(
62306230
{
62316231
n1 = (typ1->v_type == typ2->v_type
62326232
&& typ1->vval.v_list == typ2->vval.v_list);
6233-
if (type == ETYPE_ISNOT)
6233+
if (type == EXPR_ISNOT)
62346234
n1 = !n1;
62356235
}
62366236
else if (typ1->v_type != typ2->v_type
6237-
|| (type != ETYPE_EQUAL && type != ETYPE_NEQUAL))
6237+
|| (type != EXPR_EQUAL && type != EXPR_NEQUAL))
62386238
{
62396239
if (typ1->v_type != typ2->v_type)
62406240
emsg(_("E691: Can only compare List with List"));
@@ -6248,7 +6248,7 @@ typval_compare(
62486248
// Compare two Lists for being equal or unequal.
62496249
n1 = list_equal(typ1->vval.v_list, typ2->vval.v_list,
62506250
ic, FALSE);
6251-
if (type == ETYPE_NEQUAL)
6251+
if (type == EXPR_NEQUAL)
62526252
n1 = !n1;
62536253
}
62546254
}
@@ -6259,11 +6259,11 @@ typval_compare(
62596259
{
62606260
n1 = (typ1->v_type == typ2->v_type
62616261
&& typ1->vval.v_dict == typ2->vval.v_dict);
6262-
if (type == ETYPE_ISNOT)
6262+
if (type == EXPR_ISNOT)
62636263
n1 = !n1;
62646264
}
62656265
else if (typ1->v_type != typ2->v_type
6266-
|| (type != ETYPE_EQUAL && type != ETYPE_NEQUAL))
6266+
|| (type != EXPR_EQUAL && type != EXPR_NEQUAL))
62676267
{
62686268
if (typ1->v_type != typ2->v_type)
62696269
emsg(_("E735: Can only compare Dictionary with Dictionary"));
@@ -6277,16 +6277,16 @@ typval_compare(
62776277
// Compare two Dictionaries for being equal or unequal.
62786278
n1 = dict_equal(typ1->vval.v_dict, typ2->vval.v_dict,
62796279
ic, FALSE);
6280-
if (type == ETYPE_NEQUAL)
6280+
if (type == EXPR_NEQUAL)
62816281
n1 = !n1;
62826282
}
62836283
}
62846284

62856285
else if (typ1->v_type == VAR_FUNC || typ2->v_type == VAR_FUNC
62866286
|| typ1->v_type == VAR_PARTIAL || typ2->v_type == VAR_PARTIAL)
62876287
{
6288-
if (type != ETYPE_EQUAL && type != ETYPE_NEQUAL
6289-
&& type != ETYPE_IS && type != ETYPE_ISNOT)
6288+
if (type != EXPR_EQUAL && type != EXPR_NEQUAL
6289+
&& type != EXPR_IS && type != EXPR_ISNOT)
62906290
{
62916291
emsg(_("E694: Invalid operation for Funcrefs"));
62926292
clear_tv(typ1);
@@ -6312,7 +6312,7 @@ typval_compare(
63126312
}
63136313
else
63146314
n1 = tv_equal(typ1, typ2, ic, FALSE);
6315-
if (type == ETYPE_NEQUAL || type == ETYPE_ISNOT)
6315+
if (type == EXPR_NEQUAL || type == EXPR_ISNOT)
63166316
n1 = !n1;
63176317
}
63186318

@@ -6322,7 +6322,7 @@ typval_compare(
63226322
* When using "=~" or "!~", always compare as string.
63236323
*/
63246324
else if ((typ1->v_type == VAR_FLOAT || typ2->v_type == VAR_FLOAT)
6325-
&& type != ETYPE_MATCH && type != ETYPE_NOMATCH)
6325+
&& type != EXPR_MATCH && type != EXPR_NOMATCH)
63266326
{
63276327
float_T f1, f2;
63286328

@@ -6331,17 +6331,17 @@ typval_compare(
63316331
n1 = FALSE;
63326332
switch (type)
63336333
{
6334-
case ETYPE_IS:
6335-
case ETYPE_EQUAL: n1 = (f1 == f2); break;
6336-
case ETYPE_ISNOT:
6337-
case ETYPE_NEQUAL: n1 = (f1 != f2); break;
6338-
case ETYPE_GREATER: n1 = (f1 > f2); break;
6339-
case ETYPE_GEQUAL: n1 = (f1 >= f2); break;
6340-
case ETYPE_SMALLER: n1 = (f1 < f2); break;
6341-
case ETYPE_SEQUAL: n1 = (f1 <= f2); break;
6342-
case ETYPE_UNKNOWN:
6343-
case ETYPE_MATCH:
6344-
case ETYPE_NOMATCH: break; // avoid gcc warning
6334+
case EXPR_IS:
6335+
case EXPR_EQUAL: n1 = (f1 == f2); break;
6336+
case EXPR_ISNOT:
6337+
case EXPR_NEQUAL: n1 = (f1 != f2); break;
6338+
case EXPR_GREATER: n1 = (f1 > f2); break;
6339+
case EXPR_GEQUAL: n1 = (f1 >= f2); break;
6340+
case EXPR_SMALLER: n1 = (f1 < f2); break;
6341+
case EXPR_SEQUAL: n1 = (f1 <= f2); break;
6342+
case EXPR_UNKNOWN:
6343+
case EXPR_MATCH:
6344+
case EXPR_NOMATCH: break; // avoid gcc warning
63456345
}
63466346
}
63476347
#endif
@@ -6351,53 +6351,53 @@ typval_compare(
63516351
* When using "=~" or "!~", always compare as string.
63526352
*/
63536353
else if ((typ1->v_type == VAR_NUMBER || typ2->v_type == VAR_NUMBER)
6354-
&& type != ETYPE_MATCH && type != ETYPE_NOMATCH)
6354+
&& type != EXPR_MATCH && type != EXPR_NOMATCH)
63556355
{
63566356
n1 = tv_get_number(typ1);
63576357
n2 = tv_get_number(typ2);
63586358
switch (type)
63596359
{
6360-
case ETYPE_IS:
6361-
case ETYPE_EQUAL: n1 = (n1 == n2); break;
6362-
case ETYPE_ISNOT:
6363-
case ETYPE_NEQUAL: n1 = (n1 != n2); break;
6364-
case ETYPE_GREATER: n1 = (n1 > n2); break;
6365-
case ETYPE_GEQUAL: n1 = (n1 >= n2); break;
6366-
case ETYPE_SMALLER: n1 = (n1 < n2); break;
6367-
case ETYPE_SEQUAL: n1 = (n1 <= n2); break;
6368-
case ETYPE_UNKNOWN:
6369-
case ETYPE_MATCH:
6370-
case ETYPE_NOMATCH: break; // avoid gcc warning
6360+
case EXPR_IS:
6361+
case EXPR_EQUAL: n1 = (n1 == n2); break;
6362+
case EXPR_ISNOT:
6363+
case EXPR_NEQUAL: n1 = (n1 != n2); break;
6364+
case EXPR_GREATER: n1 = (n1 > n2); break;
6365+
case EXPR_GEQUAL: n1 = (n1 >= n2); break;
6366+
case EXPR_SMALLER: n1 = (n1 < n2); break;
6367+
case EXPR_SEQUAL: n1 = (n1 <= n2); break;
6368+
case EXPR_UNKNOWN:
6369+
case EXPR_MATCH:
6370+
case EXPR_NOMATCH: break; // avoid gcc warning
63716371
}
63726372
}
63736373
else
63746374
{
63756375
s1 = tv_get_string_buf(typ1, buf1);
63766376
s2 = tv_get_string_buf(typ2, buf2);
6377-
if (type != ETYPE_MATCH && type != ETYPE_NOMATCH)
6377+
if (type != EXPR_MATCH && type != EXPR_NOMATCH)
63786378
i = ic ? MB_STRICMP(s1, s2) : STRCMP(s1, s2);
63796379
else
63806380
i = 0;
63816381
n1 = FALSE;
63826382
switch (type)
63836383
{
6384-
case ETYPE_IS:
6385-
case ETYPE_EQUAL: n1 = (i == 0); break;
6386-
case ETYPE_ISNOT:
6387-
case ETYPE_NEQUAL: n1 = (i != 0); break;
6388-
case ETYPE_GREATER: n1 = (i > 0); break;
6389-
case ETYPE_GEQUAL: n1 = (i >= 0); break;
6390-
case ETYPE_SMALLER: n1 = (i < 0); break;
6391-
case ETYPE_SEQUAL: n1 = (i <= 0); break;
6392-
6393-
case ETYPE_MATCH:
6394-
case ETYPE_NOMATCH:
6384+
case EXPR_IS:
6385+
case EXPR_EQUAL: n1 = (i == 0); break;
6386+
case EXPR_ISNOT:
6387+
case EXPR_NEQUAL: n1 = (i != 0); break;
6388+
case EXPR_GREATER: n1 = (i > 0); break;
6389+
case EXPR_GEQUAL: n1 = (i >= 0); break;
6390+
case EXPR_SMALLER: n1 = (i < 0); break;
6391+
case EXPR_SEQUAL: n1 = (i <= 0); break;
6392+
6393+
case EXPR_MATCH:
6394+
case EXPR_NOMATCH:
63956395
n1 = pattern_match(s2, s1, ic);
6396-
if (type == ETYPE_NOMATCH)
6396+
if (type == EXPR_NOMATCH)
63976397
n1 = !n1;
63986398
break;
63996399

6400-
case ETYPE_UNKNOWN: break; // avoid gcc warning
6400+
case EXPR_UNKNOWN: break; // avoid gcc warning
64016401
}
64026402
}
64036403
clear_tv(typ1);

‎src/structs.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3662,17 +3662,17 @@ typedef struct {
36623662
*/
36633663
typedef enum
36643664
{
3665-
ETYPE_UNKNOWN = 0,
3666-
ETYPE_EQUAL, // ==
3667-
ETYPE_NEQUAL, // !=
3668-
ETYPE_GREATER, // >
3669-
ETYPE_GEQUAL, // >=
3670-
ETYPE_SMALLER, // <
3671-
ETYPE_SEQUAL, // <=
3672-
ETYPE_MATCH, // =~
3673-
ETYPE_NOMATCH, // !~
3674-
ETYPE_IS, // is
3675-
ETYPE_ISNOT, // isnot
3665+
EXPR_UNKNOWN = 0,
3666+
EXPR_EQUAL, // ==
3667+
EXPR_NEQUAL, // !=
3668+
EXPR_GREATER, // >
3669+
EXPR_GEQUAL, // >=
3670+
EXPR_SMALLER, // <
3671+
EXPR_SEQUAL, // <=
3672+
EXPR_MATCH, // =~
3673+
EXPR_NOMATCH, // !~
3674+
EXPR_IS, // is
3675+
EXPR_ISNOT, // isnot
36763676
} exptype_T;
36773677

36783678
/*

‎src/version.c‎

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

743743
static int included_patches[] =
744744
{ /* Add new patch number below this line */
745+
/**/
746+
69,
745747
/**/
746748
68,
747749
/**/

0 commit comments

Comments
 (0)