pg_regc_locale.c: rename some static functions.

Use the more specific prefix "regc_" rather than the generic prefix
"pg_".

A subsequent commit will create generic versions of some of these
functions that can be called from other modules.

Discussion: https://postgr.es/m/0151ad01239e2cc7b3139644358cf8f7b9622ff7.camel@j-davis.com

diff --git a/src/backend/regex/regc_locale.c b/src/backend/regex/regc_locale.c
index 77d1ce28168b20ff2775024925139fe2e060f4ea..847abcc35b32151847f6225f19684484938a70db 100644 (file)
--- a/src/backend/regex/regc_locale.c
+++ b/src/backend/regex/regc_locale.c
@@ -453,7 +453,7 @@ range(struct vars *v,                       /* context */
 
        for (c = a; c <= b; c++)
        {
-               cc = pg_wc_tolower(c);
+               cc = regc_wc_tolower(c);
                if (cc != c &&
                        (before(cc, a) || before(b, cc)))
                {
@@ -464,7 +464,7 @@ range(struct vars *v,                       /* context */
                        }
                        addchr(cv, cc);
                }
-               cc = pg_wc_toupper(c);
+               cc = regc_wc_toupper(c);
                if (cc != c &&
                        (before(cc, a) || before(b, cc)))
                {
@@ -562,7 +562,7 @@ lookupcclass(struct vars *v,        /* context (for returning errors) */
  * Must include case counterparts if "cases" is true.
  *
  * The returned cvec might be either a transient cvec gotten from getcvec(),
- * or a permanently cached one from pg_ctype_get_cache().  This is okay
+ * or a permanently cached one from regc_ctype_get_cache().  This is okay
  * because callers are not supposed to explicitly free the result either way.
  */
 static struct cvec *
@@ -584,7 +584,7 @@ cclasscvec(struct vars *v,          /* context */
        /*
         * Now compute the character class contents.  For classes that are based
         * on the behavior of a <wctype.h> or <ctype.h> function, we use
-        * pg_ctype_get_cache so that we can cache the results.  Other classes
+        * regc_ctype_get_cache so that we can cache the results.  Other classes
         * have definitions that are hard-wired here, and for those we just
         * construct a transient cvec on the fly.
         *
@@ -594,16 +594,16 @@ cclasscvec(struct vars *v,                /* context */
        switch (cclasscode)
        {
                case CC_PRINT:
-                       cv = pg_ctype_get_cache(pg_wc_isprint, cclasscode);
+                       cv = regc_ctype_get_cache(regc_wc_isprint, cclasscode);
                        break;
                case CC_ALNUM:
-                       cv = pg_ctype_get_cache(pg_wc_isalnum, cclasscode);
+                       cv = regc_ctype_get_cache(regc_wc_isalnum, cclasscode);
                        break;
                case CC_ALPHA:
-                       cv = pg_ctype_get_cache(pg_wc_isalpha, cclasscode);
+                       cv = regc_ctype_get_cache(regc_wc_isalpha, cclasscode);
                        break;
                case CC_WORD:
-                       cv = pg_ctype_get_cache(pg_wc_isword, cclasscode);
+                       cv = regc_ctype_get_cache(regc_wc_isword, cclasscode);
                        break;
                case CC_ASCII:
                        /* hard-wired meaning */
@@ -624,10 +624,10 @@ cclasscvec(struct vars *v,                /* context */
                        addrange(cv, 0x7f, 0x9f);
                        break;
                case CC_DIGIT:
-                       cv = pg_ctype_get_cache(pg_wc_isdigit, cclasscode);
+                       cv = regc_ctype_get_cache(regc_wc_isdigit, cclasscode);
                        break;
                case CC_PUNCT:
-                       cv = pg_ctype_get_cache(pg_wc_ispunct, cclasscode);
+                       cv = regc_ctype_get_cache(regc_wc_ispunct, cclasscode);
                        break;
                case CC_XDIGIT:
 
@@ -645,16 +645,16 @@ cclasscvec(struct vars *v,                /* context */
                        }
                        break;
                case CC_SPACE:
-                       cv = pg_ctype_get_cache(pg_wc_isspace, cclasscode);
+                       cv = regc_ctype_get_cache(regc_wc_isspace, cclasscode);
                        break;
                case CC_LOWER:
-                       cv = pg_ctype_get_cache(pg_wc_islower, cclasscode);
+                       cv = regc_ctype_get_cache(regc_wc_islower, cclasscode);
                        break;
                case CC_UPPER:
-                       cv = pg_ctype_get_cache(pg_wc_isupper, cclasscode);
+                       cv = regc_ctype_get_cache(regc_wc_isupper, cclasscode);
                        break;
                case CC_GRAPH:
-                       cv = pg_ctype_get_cache(pg_wc_isgraph, cclasscode);
+                       cv = regc_ctype_get_cache(regc_wc_isgraph, cclasscode);
                        break;
        }
 
@@ -679,29 +679,29 @@ cclass_column_index(struct colormap *cm, chr c)
         * Note: we should not see requests to consider cclasses that are not
         * treated as locale-specific by cclasscvec(), above.
         */
-       if (cm->classbits[CC_PRINT] && pg_wc_isprint(c))
+       if (cm->classbits[CC_PRINT] && regc_wc_isprint(c))
                colnum |= cm->classbits[CC_PRINT];
-       if (cm->classbits[CC_ALNUM] && pg_wc_isalnum(c))
+       if (cm->classbits[CC_ALNUM] && regc_wc_isalnum(c))
                colnum |= cm->classbits[CC_ALNUM];
-       if (cm->classbits[CC_ALPHA] && pg_wc_isalpha(c))
+       if (cm->classbits[CC_ALPHA] && regc_wc_isalpha(c))
                colnum |= cm->classbits[CC_ALPHA];
-       if (cm->classbits[CC_WORD] && pg_wc_isword(c))
+       if (cm->classbits[CC_WORD] && regc_wc_isword(c))
                colnum |= cm->classbits[CC_WORD];
        assert(cm->classbits[CC_ASCII] == 0);
        assert(cm->classbits[CC_BLANK] == 0);
        assert(cm->classbits[CC_CNTRL] == 0);
-       if (cm->classbits[CC_DIGIT] && pg_wc_isdigit(c))
+       if (cm->classbits[CC_DIGIT] && regc_wc_isdigit(c))
                colnum |= cm->classbits[CC_DIGIT];
-       if (cm->classbits[CC_PUNCT] && pg_wc_ispunct(c))
+       if (cm->classbits[CC_PUNCT] && regc_wc_ispunct(c))
                colnum |= cm->classbits[CC_PUNCT];
        assert(cm->classbits[CC_XDIGIT] == 0);
-       if (cm->classbits[CC_SPACE] && pg_wc_isspace(c))
+       if (cm->classbits[CC_SPACE] && regc_wc_isspace(c))
                colnum |= cm->classbits[CC_SPACE];
-       if (cm->classbits[CC_LOWER] && pg_wc_islower(c))
+       if (cm->classbits[CC_LOWER] && regc_wc_islower(c))
                colnum |= cm->classbits[CC_LOWER];
-       if (cm->classbits[CC_UPPER] && pg_wc_isupper(c))
+       if (cm->classbits[CC_UPPER] && regc_wc_isupper(c))
                colnum |= cm->classbits[CC_UPPER];
-       if (cm->classbits[CC_GRAPH] && pg_wc_isgraph(c))
+       if (cm->classbits[CC_GRAPH] && regc_wc_isgraph(c))
                colnum |= cm->classbits[CC_GRAPH];
 
        return colnum;
@@ -721,8 +721,8 @@ allcases(struct vars *v,            /* context */
        chr                     lc,
                                uc;
 
-       lc = pg_wc_tolower(c);
-       uc = pg_wc_toupper(c);
+       lc = regc_wc_tolower(c);
+       uc = regc_wc_toupper(c);
 
        cv = getcvec(v, 2, 0);
        addchr(cv, lc);
@@ -760,7 +760,7 @@ casecmp(const chr *x, const chr *y, /* strings to compare */
 {
        for (; len > 0; len--, x++, y++)
        {
-               if ((*x != *y) && (pg_wc_tolower(*x) != pg_wc_tolower(*y)))
+               if ((*x != *y) && (regc_wc_tolower(*x) != regc_wc_tolower(*y)))
                        return 1;
        }
        return 0;

diff --git a/src/backend/regex/regc_pg_locale.c b/src/backend/regex/regc_pg_locale.c
index d9eab5357bc38ba519f4a49eaae8277c845f7590..2242e72194c01c8084644d0f17e996c72a5a5f0d 100644 (file)
--- a/src/backend/regex/regc_pg_locale.c
+++ b/src/backend/regex/regc_pg_locale.c
@@ -228,7 +228,7 @@ pg_set_regex_collation(Oid collation)
 }
 
 static int
-pg_wc_isdigit(pg_wchar c)
+regc_wc_isdigit(pg_wchar c)
 {
        if (pg_regex_locale->ctype_is_c)
                return (c <= (pg_wchar) 127 &&
@@ -238,7 +238,7 @@ pg_wc_isdigit(pg_wchar c)
 }
 
 static int
-pg_wc_isalpha(pg_wchar c)
+regc_wc_isalpha(pg_wchar c)
 {
        if (pg_regex_locale->ctype_is_c)
                return (c <= (pg_wchar) 127 &&
@@ -248,7 +248,7 @@ pg_wc_isalpha(pg_wchar c)
 }
 
 static int
-pg_wc_isalnum(pg_wchar c)
+regc_wc_isalnum(pg_wchar c)
 {
        if (pg_regex_locale->ctype_is_c)
                return (c <= (pg_wchar) 127 &&
@@ -258,16 +258,16 @@ pg_wc_isalnum(pg_wchar c)
 }
 
 static int
-pg_wc_isword(pg_wchar c)
+regc_wc_isword(pg_wchar c)
 {
        /* We define word characters as alnum class plus underscore */
        if (c == CHR('_'))
                return 1;
-       return pg_wc_isalnum(c);
+       return regc_wc_isalnum(c);
 }
 
 static int
-pg_wc_isupper(pg_wchar c)
+regc_wc_isupper(pg_wchar c)
 {
        if (pg_regex_locale->ctype_is_c)
                return (c <= (pg_wchar) 127 &&
@@ -277,7 +277,7 @@ pg_wc_isupper(pg_wchar c)
 }
 
 static int
-pg_wc_islower(pg_wchar c)
+regc_wc_islower(pg_wchar c)
 {
        if (pg_regex_locale->ctype_is_c)
                return (c <= (pg_wchar) 127 &&
@@ -287,7 +287,7 @@ pg_wc_islower(pg_wchar c)
 }
 
 static int
-pg_wc_isgraph(pg_wchar c)
+regc_wc_isgraph(pg_wchar c)
 {
        if (pg_regex_locale->ctype_is_c)
                return (c <= (pg_wchar) 127 &&
@@ -297,7 +297,7 @@ pg_wc_isgraph(pg_wchar c)
 }
 
 static int
-pg_wc_isprint(pg_wchar c)
+regc_wc_isprint(pg_wchar c)
 {
        if (pg_regex_locale->ctype_is_c)
                return (c <= (pg_wchar) 127 &&
@@ -307,7 +307,7 @@ pg_wc_isprint(pg_wchar c)
 }
 
 static int
-pg_wc_ispunct(pg_wchar c)
+regc_wc_ispunct(pg_wchar c)
 {
        if (pg_regex_locale->ctype_is_c)
                return (c <= (pg_wchar) 127 &&
@@ -317,7 +317,7 @@ pg_wc_ispunct(pg_wchar c)
 }
 
 static int
-pg_wc_isspace(pg_wchar c)
+regc_wc_isspace(pg_wchar c)
 {
        if (pg_regex_locale->ctype_is_c)
                return (c <= (pg_wchar) 127 &&
@@ -327,7 +327,7 @@ pg_wc_isspace(pg_wchar c)
 }
 
 static pg_wchar
-pg_wc_toupper(pg_wchar c)
+regc_wc_toupper(pg_wchar c)
 {
        if (pg_regex_locale->ctype_is_c)
        {
@@ -340,7 +340,7 @@ pg_wc_toupper(pg_wchar c)
 }
 
 static pg_wchar
-pg_wc_tolower(pg_wchar c)
+regc_wc_tolower(pg_wchar c)
 {
        if (pg_regex_locale->ctype_is_c)
        {
@@ -366,11 +366,11 @@ pg_wc_tolower(pg_wchar c)
  * the main regex code expects us to return a failure indication instead.
  */
 
-typedef int (*pg_wc_probefunc) (pg_wchar c);
+typedef int (*regc_wc_probefunc) (pg_wchar c);
 
 typedef struct pg_ctype_cache
 {
-       pg_wc_probefunc probefunc;      /* pg_wc_isalpha or a sibling */
+       regc_wc_probefunc probefunc;    /* regc_wc_isalpha or a sibling */
        pg_locale_t locale;                     /* locale this entry is for */
        struct cvec cv;                         /* cache entry contents */
        struct pg_ctype_cache *next;    /* chain link */
@@ -419,14 +419,14 @@ store_match(pg_ctype_cache *pcc, pg_wchar chr1, int nchrs)
 }
 
 /*
- * Given a probe function (e.g., pg_wc_isalpha) get a struct cvec for all
+ * Given a probe function (e.g., regc_wc_isalpha) get a struct cvec for all
  * chrs satisfying the probe function.  The active collation is the one
  * previously set by pg_set_regex_collation.  Return NULL if out of memory.
  *
  * Note that the result must not be freed or modified by caller.
  */
 static struct cvec *
-pg_ctype_get_cache(pg_wc_probefunc probefunc, int cclasscode)
+regc_ctype_get_cache(regc_wc_probefunc probefunc, int cclasscode)
 {
        pg_ctype_cache *pcc;
        pg_wchar        max_chr;

diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index 15b264e50f1a77ef36daf0cc82879f14f8d1c2c7..3e18e4a78a20211b609b8c10fac76544bc870ae7 100644 (file)
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -249,18 +249,18 @@ static struct cvec *getcvec(struct vars *v, int nchrs, int nranges);
 static void freecvec(struct cvec *cv);
 
 /* === regc_pg_locale.c === */
-static int     pg_wc_isdigit(pg_wchar c);
-static int     pg_wc_isalpha(pg_wchar c);
-static int     pg_wc_isalnum(pg_wchar c);
-static int     pg_wc_isword(pg_wchar c);
-static int     pg_wc_isupper(pg_wchar c);
-static int     pg_wc_islower(pg_wchar c);
-static int     pg_wc_isgraph(pg_wchar c);
-static int     pg_wc_isprint(pg_wchar c);
-static int     pg_wc_ispunct(pg_wchar c);
-static int     pg_wc_isspace(pg_wchar c);
-static pg_wchar pg_wc_toupper(pg_wchar c);
-static pg_wchar pg_wc_tolower(pg_wchar c);
+static int     regc_wc_isdigit(pg_wchar c);
+static int     regc_wc_isalpha(pg_wchar c);
+static int     regc_wc_isalnum(pg_wchar c);
+static int     regc_wc_isword(pg_wchar c);
+static int     regc_wc_isupper(pg_wchar c);
+static int     regc_wc_islower(pg_wchar c);
+static int     regc_wc_isgraph(pg_wchar c);
+static int     regc_wc_isprint(pg_wchar c);
+static int     regc_wc_ispunct(pg_wchar c);
+static int     regc_wc_isspace(pg_wchar c);
+static pg_wchar regc_wc_toupper(pg_wchar c);
+static pg_wchar regc_wc_tolower(pg_wchar c);
 
 /* === regc_locale.c === */
 static chr     element(struct vars *v, const chr *startp, const chr *endp);

diff --git a/src/include/regex/regcustom.h b/src/include/regex/regcustom.h
index af0fe97c796d2a5f3c47cb174a5c567299b901ad..1c0e92f168f5ed2732975001123795dc6ee98499 100644 (file)
--- a/src/include/regex/regcustom.h
+++ b/src/include/regex/regcustom.h
@@ -88,10 +88,10 @@ typedef unsigned uchr;                      /* unsigned type that will hold a chr */
 #define MAX_SIMPLE_CHR 0x7FF   /* suitable value for Unicode */
 
 /* functions operating on chr */
-#define iscalnum(x) pg_wc_isalnum(x)
-#define iscalpha(x) pg_wc_isalpha(x)
-#define iscdigit(x) pg_wc_isdigit(x)
-#define iscspace(x) pg_wc_isspace(x)
+#define iscalnum(x) regc_wc_isalnum(x)
+#define iscalpha(x) regc_wc_isalpha(x)
+#define iscdigit(x) regc_wc_isdigit(x)
+#define iscspace(x) regc_wc_isspace(x)
 
 /* and pick up the standard header */
 #include "regex.h"