8000 Remove typedef celt from the regex library, along with macro NOCELT. · linearregression/postgres@6eefd24 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6eefd24

Browse files
tglsfdctglsfdc
committed
Remove typedef celt from the regex library, along with macro NOCELT.
The regex library used to have a notion of a "collating element" that was distinct from a "character", but Henry Spencer never actually implemented his planned support for multi-character collating elements, and the Tcl crew ripped out most of the stubs for that years ago. The only thing left that distinguished the "celt" typedef from the "chr" typedef was that "celt" was supposed to also be able to hold the not-a-character "NOCELT" value. However, NOCELT was not used anywhere after the MCCE stub removal changes, which means there's no need for celt to be different from chr. Removing the separate typedef simplifies matters and also removes a trap for the unwary, in that celt is signed while chr may not be, so comparisons could mean different things. There's no bug there today because we restrict CHR_MAX to be less than INT_MAX, but I think there may have been such bugs before we did that, and there could be again if anyone ever decides to fool with the range of chr. This patch also removes assorted unnecessary casts to "chr" of values that are already chrs. Many of these seem to be leftover from days when the code was compatible with pre-ANSI C.
1 parent 5285c5e commit 6eefd24

File tree

5 files changed

+33
-38
lines changed

5 files changed

+33
-38
lines changed

‎src/backend/regex/regc_cvec.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ addchr(struct cvec * cv, /* character vector */
7878
chr c) /* character to add */
7979
{
8080
assert(cv->nchrs < cv->chrspace);
81-
cv->chrs[cv->nchrs++] = (chr) c;
81+
cv->chrs[cv->nchrs++] = c;
8282
}
8383

8484
/*
@@ -90,8 +90,8 @@ addrange(struct cvec * cv, /* character vector */
9090
chr to) /* last character of range */
9191
{
9292
assert(cv->nranges < cv->rangespace);
93-
cv->ranges[cv->nranges * 2] = (chr) from;
94-
cv->ranges[cv->nranges * 2 + 1] = (chr) to;
93+
cv->ranges[cv->nranges * 2] = from;
94+
cv->ranges[cv->nranges * 2 + 1] = to;
9595
cv->nranges++;
9696
}
9797

‎src/backend/regex/regc_lex.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ lexescape(struct vars * v)
870870
if (v->now == save || ((int) c > 0 && (int) c <= v->nsubexp))
871871
{
872872
NOTE(REG_UBACKREF);
873-
RETV(BACKREF, (chr) c);
873+
RETV(BACKREF, c);
874874
}
875875
/* oops, doesn't look like it's a backref after all... */
876876
v->now = save;
@@ -986,10 +986,8 @@ lexdigits(struct vars * v,
986986
*/
987987
static int /* 1 normal, 0 failure */
988988
brenext(struct vars * v,
989-
chr pc)
989+
chr c)
990990
{
991-
chr c = (chr) pc;
992-
993991
switch (c)
994992
{
995993
case CHR('*'):
@@ -1153,7 +1151,7 @@ chrnamed(struct vars * v,
11531151
const chr *endp, /* just past end of name */
11541152
chr lastresort) /* what to return if name lookup fails */
11551153
{
1156-
celt c;
1154+
chr c;
11571155
int errsave;
11581156
int e;
11591157
struct cvec *cv;
@@ -1165,10 +1163,10 @@ chrnamed(struct vars * v,
11651163
v->err = errsave;
11661164

11671165
if (e != 0)
1168-
return (chr) lastresort;
1166+
return lastresort;
11691167

11701168
cv = range(v, c, c, 0);
11711169
if (cv->nchrs == 0)
1172-
return (chr) lastresort;
1170+
return lastresort;
11731171
return cv->chrs[0];
11741172
}

‎src/backend/regex/regc_locale.c

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -361,9 +361,9 @@ static const struct cname
361361

362362

363363
/*
364-
* element - map collating-element name to celt
364+
* element - map collating-element name to chr
365365
*/
366-
static celt
366+
static chr
367367
element(struct vars * v, /* context */
368368
const chr *startp, /* points to start of name */
369369
const chr *endp) /* points just past end of name */
@@ -401,13 +401,13 @@ element(struct vars * v, /* context */
401401
*/
402402
static struct cvec *
403403
range(struct vars * v, /* context */
404-
celt a, /* range start */
405-
celt b, /* range end, might equal a */
404+
chr a, /* range start */
405+
chr b, /* range end, might equal a */
406406
int cases) /* case-independent? */
407407
{
408408
int nchrs;
409409
struct cvec *cv;
410-
celt c,
410+
chr c,
411411
cc;
412412

413413
if (a != b && !before(a, b))
@@ -444,7 +444,7 @@ range(struct vars * v, /* context */
444444

445445
for (c = a; c <= b; c++)
446446
{
447-
cc = pg_wc_tolower((chr) c);
447+
cc = pg_wc_tolower(c);
448448
if (cc != c &&
449449
(before(cc, a) || before(b, cc)))
450450
{
@@ -455,7 +455,7 @@ range(struct vars * v, /* context */
455455
}
456456
addchr(cv, cc);
457457
}
458-
cc = pg_wc_toupper((chr) c);
458+
cc = pg_wc_toupper(c);
459459
if (cc != c &&
460460
(before(cc, a) || before(b, cc)))
461461
{
@@ -477,10 +477,10 @@ range(struct vars * v, /* context */
477477
}
478478

479479
/*
480-
* before - is celt x before celt y, for purposes of range legality?
480+
* before - is chr x before chr y, for purposes of range legality?
481481
*/
482482
static int /* predicate */
483-
before(celt x, celt y)
483+
before(chr x, chr y)
484484
{
485485
if (x < y)
486486
return 1;
@@ -493,7 +493,7 @@ before(celt x, celt y)
493493
*/
494494
static struct cvec *
495495
eclass(struct vars * v, /* context */
496-
celt c, /* Collating element representing the
496+
chr c, /* Collating element representing the
497497
* equivalence class. */
498498
int cases) /* all cases? */
499499
{
@@ -503,12 +503,12 @@ eclass(struct vars * v, /* context */
503503
if ((v->cflags & REG_FAKE) && c == 'x')
504504
{
505505
cv = getcvec(v, 4, 0);
506-
addchr(cv, (chr) 'x');
507-
addchr(cv, (chr) 'y');
506+
addchr(cv, CHR('x'));
507+
addchr(cv, CHR('y'));
508508
if (cases)
509509
{
510-
addchr(cv, (chr) 'X');
511-
addchr(cv, (chr) 'Y');
510+
addchr(cv, CHR('X'));
511+
addchr(cv, CHR('Y'));
512512
}
513513
return cv;
514514
}
@@ -518,7 +518,7 @@ eclass(struct vars * v, /* context */
518518
return allcases(v, c);
519519
cv = getcvec(v, 1, 0);
520520
assert(cv != NULL);
521-
addchr(cv, (chr) c);
521+
addchr(cv, c);
522522
return cv;
523523
}
524524

@@ -673,15 +673,14 @@ cclass(struct vars * v, /* context */
673673
*/
674674
static struct cvec *
675675
allcases(struct vars * v, /* context */
676-
chr pc) /* character to get case equivs of */
676+
chr c) /* character to get case equivs of */
677677
{
678678
struct cvec *cv;
679-
chr c = (chr) pc;
680679
chr lc,
681680
uc;
682681

683-
lc = pg_wc_tolower((chr) c);
684-
uc = pg_wc_toupper((chr) c);
682+
lc = pg_wc_tolower(c);
683+
uc = pg_wc_toupper(c);
685684

686685
cv = getcvec(v, 2, 0);
687686
addchr(cv, lc);

‎src/backend/regex/regcomp.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,10 @@ static pg_wchar pg_wc_toupper(pg_wchar c);
210210
static pg_wchar pg_wc_tolower(pg_wchar c);
211211

212212
/* === regc_locale.c === */
213-
static celt element(struct vars *, const chr *, const chr *);
214-
static struct cvec *range(struct vars *, celt, celt, int);
215-
static int before(celt, celt);
216-
static struct cvec *eclass(struct vars *, celt, int);
213+
static chr element(struct vars *, const chr *, const chr *);
214+
static struct cvec *range(struct vars *, chr, chr, int);
215+
static int before(chr, chr);
216+
static struct cvec *eclass(struct vars *, chr, int);
217217
static struct cvec *cclass(struct vars *, const chr *, const chr *, int);
218218
static struct cvec *allcases(struct vars *, chr);
219219
static int cmp(const chr *, const chr *, size_t);
@@ -1424,8 +1424,8 @@ brackpart(struct vars * v,
14241424
struct state * lp,
14251425
struct state * rp)
14261426
{
1427-
celt startc;
1428-
celt endc;
1427+
chr startc;
1428+
chr endc;
14291429
struct cvec *cv;
14301430
const chr *startp;
14311431
const chr *endp;

‎src/include/regex/regcustom.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,13 @@
5858
/* internal character type and related */
5959
typedef pg_wchar chr; /* the type itself */
6060
typedef unsigned uchr; /* unsigned type that will hold a chr */
61-
typedef int celt; /* type to hold chr, or NOCELT */
6261

63-
#define NOCELT (-1) /* celt value which is not valid chr */
6462
#define CHR(c) ((unsigned char) (c)) /* turn char literal into chr literal */
6563
#define DIGITVAL(c) ((c)-'0') /* turn chr digit into its value */
6664
#define CHRBITS 32 /* bits in a chr; must not use sizeof */
6765
#define CHR_MIN 0x00000000 /* smallest and largest chr; the value */
6866
#define CHR_MAX 0x7ffffffe /* CHR_MAX-CHR_MIN+1 must fit in an int, and
69-
* CHR_MAX+1 must fit in both chr and celt */
67+
* CHR_MAX+1 must fit in a chr variable */
7068

7169
/*
7270
* Check if a chr value is in range. Ideally we'd just write this as

0 commit comments

Comments
 (0)
0