From 6eefd2422ef232aec2fe12465d9ec4018c63814d Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 19 Aug 2016 12:51:02 -0400 Subject: 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. --- src/backend/regex/regc_lex.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/backend/regex/regc_lex.c') diff --git a/src/backend/regex/regc_lex.c b/src/backend/regex/regc_lex.c index f62ec7dc810..cd34c8ae411 100644 --- a/src/backend/regex/regc_lex.c +++ b/src/backend/regex/regc_lex.c @@ -870,7 +870,7 @@ lexescape(struct vars * v) if (v->now == save || ((int) c > 0 && (int) c <= v->nsubexp)) { NOTE(REG_UBACKREF); - RETV(BACKREF, (chr) c); + RETV(BACKREF, c); } /* oops, doesn't look like it's a backref after all... */ v->now = save; @@ -986,10 +986,8 @@ lexdigits(struct vars * v, */ static int /* 1 normal, 0 failure */ brenext(struct vars * v, - chr pc) + chr c) { - chr c = (chr) pc; - switch (c) { case CHR('*'): @@ -1153,7 +1151,7 @@ chrnamed(struct vars * v, const chr *endp, /* just past end of name */ chr lastresort) /* what to return if name lookup fails */ { - celt c; + chr c; int errsave; int e; struct cvec *cv; @@ -1165,10 +1163,10 @@ chrnamed(struct vars * v, v->err = errsave; if (e != 0) - return (chr) lastresort; + return lastresort; cv = range(v, c, c, 0); if (cv->nchrs == 0) - return (chr) lastresort; + return lastresort; return cv->chrs[0]; } -- cgit v1.2.3