database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Consistently use named parameters in regex code.

Browse Source 
Make regex code consistently use named parameters in function
declarations.  Also make sure that parameter names from each function's
declaration match corresponding definition parameter names.

This makes Henry Spencer's regex code follow Postgres coding standards.

Author: Peter Geoghegan <pg@bowt.ie>
Reviewed-By: David Rowley <dgrowleyml@gmail.com>
Discussion: https://postgr.es/m/CAH2-WznJt9CMM9KJTMjJh_zbL5hD9oX44qdJ4aqZtjFi-zA3Tg@mail.gmail.com
This commit is contained in:
Peter Geoghegan
2022-09-19 15:10:24 -07:00
parent 55b4966365
commit bc2187ed63
5 changed files with 241 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

342
src/backend/regex/regcomp.c
View File

@ -38,158 +38,200 @@
* forward declarations, up here so forward datatypes etc. are defined early * forward declarations, up here so forward datatypes etc. are defined early
*/ */
/* === regcomp.c === */ /* === regcomp.c === */
static void moresubs(struct vars *, int); static void moresubs(struct vars *v, int wanted);
static int freev(struct vars *, int); static int freev(struct vars *v, int err);
static void makesearch(struct vars *, struct nfa *); static void makesearch(struct vars *v, struct nfa *nfa);
static struct subre *parse(struct vars *, int, int, struct state *, struct state *); static struct subre *parse(struct vars *v, int stopper, int type,
static struct subre *parsebranch(struct vars *, int, int, struct state *, struct state *, int); struct state *init, struct state *final);
static struct subre *parseqatom(struct vars *, int, int, struct state *, struct state *, struct subre *); static struct subre *parsebranch(struct vars *v, int stopper, int type,
static void nonword(struct vars *, int, struct state *, struct state *); struct state *left, struct state *right,
static void word(struct vars *, int, struct state *, struct state *); int partial);
static void charclass(struct vars *, enum char_classes, static struct subre *parseqatom(struct vars *v, int stopper, int type,
struct state *, struct state *); struct state *lp, struct state *rp,
static void charclasscomplement(struct vars *, enum char_classes, struct subre *top);
struct state *, struct state *); static void nonword(struct vars *v, int dir, struct state *lp,
static int scannum(struct vars *); struct state *rp);
static void repeat(struct vars *, struct state *, struct state *, int, int); static void word(struct vars *v, int dir, struct state *lp, struct state *rp);
static void bracket(struct vars *, struct state *, struct state *); static void charclass(struct vars *v, enum char_classes cls, struct state *lp,
static void cbracket(struct vars *, struct state *, struct state *); struct state *rp);
static void brackpart(struct vars *, struct state *, struct state *, bool *); static void charclasscomplement(struct vars *v, enum char_classes cls,
static const chr *scanplain(struct vars *); struct state *lp, struct state *rp);
static void onechr(struct vars *, chr, struct state *, struct state *); static int scannum(struct vars *v);
static void optimizebracket(struct vars *, struct state *, struct state *); static void repeat(struct vars *v, struct state *lp, struct state *rp,
static void wordchrs(struct vars *); int m, int n);
static void processlacon(struct vars *, struct state *, struct state *, int, static void bracket(struct vars *v, struct state *lp, struct state *rp);
struct state *, struct state *); static void cbracket(struct vars *v, struct state *lp, struct state *rp);
static struct subre *subre(struct vars *, int, int, struct state *, struct state *); static void brackpart(struct vars *v, struct state *lp, struct state *rp,
static void freesubre(struct vars *, struct subre *); bool *have_cclassc);
static void freesubreandsiblings(struct vars *, struct subre *); static const chr *scanplain(struct vars *v);
static void freesrnode(struct vars *, struct subre *); static void onechr(struct vars *v, chr c, struct state *lp, struct state *rp);
static void removecaptures(struct vars *, struct subre *); static void optimizebracket(struct vars *v, struct state *lp, struct state *rp);
static int numst(struct subre *, int); static void wordchrs(struct vars *v);
static void markst(struct subre *); static void processlacon(struct vars *v, struct state *begin,
static void cleanst(struct vars *); struct state *end, int latype,
static long nfatree(struct vars *, struct subre *, FILE *); struct state *lp, struct state *rp);
static long nfanode(struct vars *, struct subre *, int, FILE *); static struct subre *subre(struct vars *v, int op, int flags,
static int newlacon(struct vars *, struct state *, struct state *, int); struct state *begin, struct state *end);
static void freelacons(struct subre *, int); static void freesubre(struct vars *v, struct subre *sr);
static void rfree(regex_t *); static void freesubreandsiblings(struct vars *v, struct subre *sr);
static void freesrnode(struct vars *v, struct subre *sr);
static void removecaptures(struct vars *v, struct subre *t);
static int numst(struct subre *t, int start);
static void markst(struct subre *t);
static void cleanst(struct vars *v);
static long nfatree(struct vars *v, struct subre *t, FILE *f);
static long nfanode(struct vars *v, struct subre *t,
int converttosearch, FILE *f);
static int newlacon(struct vars *v, struct state *begin, struct state *end,
int latype);
static void freelacons(struct subre *subs, int n);
static void rfree(regex_t *re);
static int rcancelrequested(void); static int rcancelrequested(void);
static int rstacktoodeep(void); static int rstacktoodeep(void);
#ifdef REG_DEBUG #ifdef REG_DEBUG
static void dump(regex_t *, FILE *); static void dump(regex_t *re, FILE *f);
static void dumpst(struct subre *, FILE *, int); static void dumpst(struct subre *t, FILE *f, int nfapresent);
static void stdump(struct subre *, FILE *, int); static void stdump(struct subre *t, FILE *f, int nfapresent);
static const char *stid(struct subre *, char *, size_t); static const char *stid(struct subre *t, char *buf, size_t bufsize);
#endif #endif
/* === regc_lex.c === */ /* === regc_lex.c === */
static void lexstart(struct vars *); static void lexstart(struct vars *v);
static void prefixes(struct vars *); static void prefixes(struct vars *v);
static int next(struct vars *); static int next(struct vars *v);
static int lexescape(struct vars *); static int lexescape(struct vars *v);
static chr lexdigits(struct vars *, int, int, int); static chr lexdigits(struct vars *v, int base, int minlen, int maxlen);
static int brenext(struct vars *, chr); static int brenext(struct vars *v, chr c);
static void skip(struct vars *); static void skip(struct vars *v);
static chr newline(void); static chr newline(void);
static chr chrnamed(struct vars *, const chr *, const chr *, chr); static chr chrnamed(struct vars *v, const chr *startp, const chr *endp,
chr lastresort);
/* === regc_color.c === */ /* === regc_color.c === */
static void initcm(struct vars *, struct colormap *); static void initcm(struct vars *v, struct colormap *cm);
static void freecm(struct colormap *); static void freecm(struct colormap *cm);
static color maxcolor(struct colormap *); static color maxcolor(struct colormap *cm);
static color newcolor(struct colormap *); static color newcolor(struct colormap *cm);
static void freecolor(struct colormap *, color); static void freecolor(struct colormap *cm, color co);
static color pseudocolor(struct colormap *); static color pseudocolor(struct colormap *cm);
static color subcolor(struct colormap *, chr); static color subcolor(struct colormap *cm, chr c);
static color subcolorhi(struct colormap *, color *); static color subcolorhi(struct colormap *cm, color *pco);
static color newsub(struct colormap *, color); static color newsub(struct colormap *cm, color co);
static int newhicolorrow(struct colormap *, int); static int newhicolorrow(struct colormap *cm, int oldrow);
static void newhicolorcols(struct colormap *); static void newhicolorcols(struct colormap *cm);
static void subcolorcvec(struct vars *, struct cvec *, struct state *, struct state *); static void subcolorcvec(struct vars *v, struct cvec *cv, struct state *lp,
static void subcoloronechr(struct vars *, chr, struct state *, struct state *, color *); struct state *rp);
static void subcoloronerange(struct vars *, chr, chr, struct state *, struct state *, color *); static void subcoloronechr(struct vars *v, chr ch, struct state *lp,
static void subcoloronerow(struct vars *, int, struct state *, struct state *, color *); struct state *rp, color *lastsubcolor);
static void okcolors(struct nfa *, struct colormap *); static void subcoloronerange(struct vars *v, chr from, chr to,
static void colorchain(struct colormap *, struct arc *); struct state *lp, struct state *rp,
static void uncolorchain(struct colormap *, struct arc *); color *lastsubcolor);
static void rainbow(struct nfa *, struct colormap *, int, color, struct state *, struct state *); static void subcoloronerow(struct vars *v, int rownum, struct state *lp,
static void colorcomplement(struct nfa *, struct colormap *, int, struct state *, struct state *, struct state *); struct state *rp, color *lastsubcolor);
static void okcolors(struct nfa *nfa, struct colormap *cm);
static void colorchain(struct colormap *cm, struct arc *a);
static void uncolorchain(struct colormap *cm, struct arc *a);
static void rainbow(struct nfa *nfa, struct colormap *cm, int type, color but,
struct state *from, struct state *to);
static void colorcomplement(struct nfa *nfa, struct colormap *cm, int type,
struct state *of, struct state *from,
struct state *to);
#ifdef REG_DEBUG #ifdef REG_DEBUG
static void dumpcolors(struct colormap *, FILE *); static void dumpcolors(struct colormap *cm, FILE *f);
static void dumpchr(chr, FILE *); static void dumpchr(chr c, FILE *f);
#endif #endif
/* === regc_nfa.c === */ /* === regc_nfa.c === */
static struct nfa *newnfa(struct vars *, struct colormap *, struct nfa *); static struct nfa *newnfa(struct vars *v, struct colormap *cm,
static void freenfa(struct nfa *); struct nfa *parent);
static struct state *newstate(struct nfa *); static void freenfa(struct nfa *nfa);
static struct state *newfstate(struct nfa *, int flag); static struct state *newstate(struct nfa *nfa);
static void dropstate(struct nfa *, struct state *); static struct state *newfstate(struct nfa *nfa, int flag);
static void freestate(struct nfa *, struct state *); static void dropstate(struct nfa *nfa, struct state *s);
static void newarc(struct nfa *, int, color, struct state *, struct state *); static void freestate(struct nfa *nfa, struct state *s);
static void createarc(struct nfa *, int, color, struct state *, struct state *); static void newarc(struct nfa *nfa, int t, color co,
static struct arc *allocarc(struct nfa *); struct state *from, struct state *to);
static void freearc(struct nfa *, struct arc *); static void createarc(struct nfa *nfa, int t, color co,
static void changearcsource(struct arc *, struct state *); struct state *from, struct state *to);
static void changearctarget(struct arc *, struct state *); static struct arc *allocarc(struct nfa *nfa);
static int hasnonemptyout(struct state *); static void freearc(struct nfa *nfa, struct arc *victim);
static struct arc *findarc(struct state *, int, color); static void changearcsource(struct arc *a, struct state *newfrom);
static void cparc(struct nfa *, struct arc *, struct state *, struct state *); static void changearctarget(struct arc *a, struct state *newto);
static void sortins(struct nfa *, struct state *); static int hasnonemptyout(struct state *s);
static int sortins_cmp(const void *, const void *); static struct arc *findarc(struct state *s, int type, color co);
static void sortouts(struct nfa *, struct state *); static void cparc(struct nfa *nfa, struct arc *oa,
static int sortouts_cmp(const void *, const void *); struct state *from, struct state *to);
static void moveins(struct nfa *, struct state *, struct state *); static void sortins(struct nfa *nfa, struct state *s);
static void copyins(struct nfa *, struct state *, struct state *); static int sortins_cmp(const void *a, const void *b);
static void mergeins(struct nfa *, struct state *, struct arc **, int); static void sortouts(struct nfa *nfa, struct state *s);
static void moveouts(struct nfa *, struct state *, struct state *); static int sortouts_cmp(const void *a, const void *b);
static void copyouts(struct nfa *, struct state *, struct state *); static void moveins(struct nfa *nfa, struct state *oldState,
static void cloneouts(struct nfa *, struct state *, struct state *, struct state *, int); struct state *newState);
static void delsub(struct nfa *, struct state *, struct state *); static void copyins(struct nfa *nfa, struct state *oldState,
static void deltraverse(struct nfa *, struct state *, struct state *); struct state *newState);
static void dupnfa(struct nfa *, struct state *, struct state *, struct state *, struct state *); static void mergeins(struct nfa *nfa, struct state *s,
static void duptraverse(struct nfa *, struct state *, struct state *); struct arc **arcarray, int arccount);
static void removeconstraints(struct nfa *, struct state *, struct state *); static void moveouts(struct nfa *nfa, struct state *oldState,
static void removetraverse(struct nfa *, struct state *); struct state *newState);
static void cleartraverse(struct nfa *, struct state *); static void copyouts(struct nfa *nfa, struct state *oldState,
static struct state *single_color_transition(struct state *, struct state *); struct state *newState);
static void specialcolors(struct nfa *); static void cloneouts(struct nfa *nfa, struct state *old, struct state *from,
static long optimize(struct nfa *, FILE *); struct state *to, int type);
static void pullback(struct nfa *, FILE *); static void delsub(struct nfa *nfa, struct state *lp, struct state *rp);
static int pull(struct nfa *, struct arc *, struct state **); static void deltraverse(struct nfa *nfa, struct state *leftend,
static void pushfwd(struct nfa *, FILE *); struct state *s);
static int push(struct nfa *, struct arc *, struct state **); static void dupnfa(struct nfa *nfa, struct state *start, struct state *stop,
struct state *from, struct state *to);
static void duptraverse(struct nfa *nfa, struct state *s, struct state *stmp);
static void removeconstraints(struct nfa *nfa, struct state *start, struct state *stop);
static void removetraverse(struct nfa *nfa, struct state *s);
static void cleartraverse(struct nfa *nfa, struct state *s);
static struct state *single_color_transition(struct state *s1,
struct state *s2);
static void specialcolors(struct nfa *nfa);
static long optimize(struct nfa *nfa, FILE *f);
static void pullback(struct nfa *nfa, FILE *f);
static int pull(struct nfa *nfa, struct arc *con,
struct state **intermediates);
static void pushfwd(struct nfa *nfa, FILE *f);
static int push(struct nfa *nfa, struct arc *con,
struct state **intermediates);
#define INCOMPATIBLE 1 /* destroys arc */ #define INCOMPATIBLE 1 /* destroys arc */
#define SATISFIED 2 /* constraint satisfied */ #define SATISFIED 2 /* constraint satisfied */
#define COMPATIBLE 3 /* compatible but not satisfied yet */ #define COMPATIBLE 3 /* compatible but not satisfied yet */
#define REPLACEARC 4 /* replace arc's color with constraint color */ #define REPLACEARC 4 /* replace arc's color with constraint color */
static int combine(struct nfa *nfa, struct arc *con, struct arc *a); static int combine(struct nfa *nfa, struct arc *con, struct arc *a);
static void fixempties(struct nfa *, FILE *); static void fixempties(struct nfa *nfa, FILE *f);
static struct state *emptyreachable(struct nfa *, struct state *, static struct state *emptyreachable(struct nfa *nfa, struct state *s,
struct state *, struct arc **); struct state *lastfound,
static int isconstraintarc(struct arc *); struct arc **inarcsorig);
static int hasconstraintout(struct state *); static int isconstraintarc(struct arc *a);
static void fixconstraintloops(struct nfa *, FILE *); static int hasconstraintout(struct state *s);
static int findconstraintloop(struct nfa *, struct state *); static void fixconstraintloops(struct nfa *nfa, FILE *f);
static void breakconstraintloop(struct nfa *, struct state *); static int findconstraintloop(struct nfa *nfa, struct state *s);
static void clonesuccessorstates(struct nfa *, struct state *, struct state *, static void breakconstraintloop(struct nfa *nfa, struct state *sinitial);
struct state *, struct arc *, static void clonesuccessorstates(struct nfa *nfa, struct state *ssource,
char *, char *, int); struct state *sclone,
static void cleanup(struct nfa *); struct state *spredecessor,
static void markreachable(struct nfa *, struct state *, struct state *, struct state *); struct arc *refarc, char *curdonemap,
static void markcanreach(struct nfa *, struct state *, struct state *, struct state *); char *outerdonemap, int nstates);
static long analyze(struct nfa *); static void cleanup(struct nfa *nfa);
static void checkmatchall(struct nfa *); static void markreachable(struct nfa *nfa, struct state *s,
static bool checkmatchall_recurse(struct nfa *, struct state *, bool **); struct state *okay, struct state *mark);
static bool check_out_colors_match(struct state *, color, color); static void markcanreach(struct nfa *nfa, struct state *s, struct state *okay,
static bool check_in_colors_match(struct state *, color, color); struct state *mark);
static void compact(struct nfa *, struct cnfa *); static long analyze(struct nfa *nfa);
static void carcsort(struct carc *, size_t); static void checkmatchall(struct nfa *nfa);
static int carc_cmp(const void *, const void *); static bool checkmatchall_recurse(struct nfa *nfa, struct state *s,
static void freecnfa(struct cnfa *); bool **haspaths);
static void dumpnfa(struct nfa *, FILE *); static bool check_out_colors_match(struct state *s, color co1, color co2);
static bool check_in_colors_match(struct state *s, color co1, color co2);
static void compact(struct nfa *nfa, struct cnfa *cnfa);
static void carcsort(struct carc *first, size_t n);
static int carc_cmp(const void *a, const void *b);
static void freecnfa(struct cnfa *cnfa);
static void dumpnfa(struct nfa *nfa, FILE *f);
#ifdef REG_DEBUG #ifdef REG_DEBUG
static void dumpstate(struct state *, FILE *); static void dumpstate(struct state *, FILE *);
@ -199,12 +241,12 @@ static void dumpcnfa(struct cnfa *, FILE *);
static void dumpcstate(int, struct cnfa *, FILE *); static void dumpcstate(int, struct cnfa *, FILE *);
#endif #endif
/* === regc_cvec.c === */ /* === regc_cvec.c === */
static struct cvec *newcvec(int, int); static struct cvec *newcvec(int nchrs, int nranges);
static struct cvec *clearcvec(struct cvec *); static struct cvec *clearcvec(struct cvec *cv);
static void addchr(struct cvec *, chr); static void addchr(struct cvec *cv, chr c);
static void addrange(struct cvec *, chr, chr); static void addrange(struct cvec *cv, chr from, chr to);
static struct cvec *getcvec(struct vars *, int, int); static struct cvec *getcvec(struct vars *v, int nchrs, int nranges);
static void freecvec(struct cvec *); static void freecvec(struct cvec *cv);
/* === regc_pg_locale.c === */ /* === regc_pg_locale.c === */
static int pg_wc_isdigit(pg_wchar c); static int pg_wc_isdigit(pg_wchar c);
@ -221,16 +263,18 @@ static pg_wchar pg_wc_toupper(pg_wchar c);
static pg_wchar pg_wc_tolower(pg_wchar c); static pg_wchar pg_wc_tolower(pg_wchar c);
/* === regc_locale.c === */ /* === regc_locale.c === */
static chr element(struct vars *, const chr *, const chr *); static chr element(struct vars *v, const chr *startp, const chr *endp);
static struct cvec *range(struct vars *, chr, chr, int); static struct cvec *range(struct vars *v, chr a, chr b, int cases);
static int before(chr, chr); static int before(chr x, chr y);
static struct cvec *eclass(struct vars *, chr, int); static struct cvec *eclass(struct vars *v, chr c, int cases);
static enum char_classes lookupcclass(struct vars *, const chr *, const chr *); static enum char_classes lookupcclass(struct vars *v, const chr *startp,
static struct cvec *cclasscvec(struct vars *, enum char_classes, int); const chr *endp);
static int cclass_column_index(struct colormap *, chr); static struct cvec *cclasscvec(struct vars *v, enum char_classes cclasscode,
static struct cvec *allcases(struct vars *, chr); int cases);
static int cmp(const chr *, const chr *, size_t); static int cclass_column_index(struct colormap *cm, chr c);
static int casecmp(const chr *, const chr *, size_t); static struct cvec *allcases(struct vars *v, chr c);
static int cmp(const chr *x, const chr *y, size_t len);
static int casecmp(const chr *x, const chr *y, size_t len);
/* internal variables, bundled for easy passing around */ /* internal variables, bundled for easy passing around */

65
src/backend/regex/regexec.c
View File

@ -137,36 +137,45 @@ struct vars
* forward declarations * forward declarations
*/ */
/* === regexec.c === */ /* === regexec.c === */
static struct dfa *getsubdfa(struct vars *, struct subre *); static struct dfa *getsubdfa(struct vars *v, struct subre *t);
static struct dfa *getladfa(struct vars *, int); static struct dfa *getladfa(struct vars *v, int n);
static int find(struct vars *, struct cnfa *, struct colormap *); static int find(struct vars *v, struct cnfa *cnfa, struct colormap *cm);
static int cfind(struct vars *, struct cnfa *, struct colormap *); static int cfind(struct vars *v, struct cnfa *cnfa, struct colormap *cm);
static int cfindloop(struct vars *, struct cnfa *, struct colormap *, struct dfa *, struct dfa *, chr **); static int cfindloop(struct vars *v, struct cnfa *cnfa, struct colormap *cm,
static void zapallsubs(regmatch_t *, size_t); struct dfa *d, struct dfa *s, chr **coldp);
static void zaptreesubs(struct vars *, struct subre *); static void zapallsubs(regmatch_t *p, size_t n);
static void subset(struct vars *, struct subre *, chr *, chr *); static void zaptreesubs(struct vars *v, struct subre *t);
static int cdissect(struct vars *, struct subre *, chr *, chr *); static void subset(struct vars *v, struct subre *sub, chr *begin, chr *end);
static int ccondissect(struct vars *, struct subre *, chr *, chr *); static int cdissect(struct vars *v, struct subre *t, chr *begin, chr *end);
static int crevcondissect(struct vars *, struct subre *, chr *, chr *); static int ccondissect(struct vars *v, struct subre *t, chr *begin, chr *end);
static int cbrdissect(struct vars *, struct subre *, chr *, chr *); static int crevcondissect(struct vars *v, struct subre *t, chr *begin, chr *end);
static int caltdissect(struct vars *, struct subre *, chr *, chr *); static int cbrdissect(struct vars *v, struct subre *t, chr *begin, chr *end);
static int citerdissect(struct vars *, struct subre *, chr *, chr *); static int caltdissect(struct vars *v, struct subre *t, chr *begin, chr *end);
static int creviterdissect(struct vars *, struct subre *, chr *, chr *); static int citerdissect(struct vars *v, struct subre *t, chr *begin, chr *end);
static int creviterdissect(struct vars *v, struct subre *t, chr *begin, chr *end);
/* === rege_dfa.c === */ /* === rege_dfa.c === */
static chr *longest(struct vars *, struct dfa *, chr *, chr *, int *); static chr *longest(struct vars *v, struct dfa *d,
static chr *shortest(struct vars *, struct dfa *, chr *, chr *, chr *, chr **, int *); chr *start, chr *stop, int *hitstopp);
static int matchuntil(struct vars *, struct dfa *, chr *, struct sset **, chr **); static chr *shortest(struct vars *v, struct dfa *d, chr *start, chr *min,
static chr *dfa_backref(struct vars *, struct dfa *, chr *, chr *, chr *, bool); chr *max, chr **coldp, int *hitstopp);
static chr *lastcold(struct vars *, struct dfa *); static int matchuntil(struct vars *v, struct dfa *d, chr *probe,
static struct dfa *newdfa(struct vars *, struct cnfa *, struct colormap *, struct smalldfa *); struct sset **lastcss, chr **lastcp);
static void freedfa(struct dfa *); static chr *dfa_backref(struct vars *v, struct dfa *d, chr *start,
static unsigned hash(unsigned *, int); chr *min, chr *max, bool shortest);
static struct sset *initialize(struct vars *, struct dfa *, chr *); static chr *lastcold(struct vars *v, struct dfa *d);
static struct sset *miss(struct vars *, struct dfa *, struct sset *, color, chr *, chr *); static struct dfa *newdfa(struct vars *v, struct cnfa *cnfa,
static int lacon(struct vars *, struct cnfa *, chr *, color); struct colormap *cm, struct smalldfa *sml);
static struct sset *getvacant(struct vars *, struct dfa *, chr *, chr *); static void freedfa(struct dfa *d);
static struct sset *pickss(struct vars *, struct dfa *, chr *, chr *); static unsigned hash(unsigned *uv, int n);
static struct sset *initialize(struct vars *v, struct dfa *d, chr *start);
static struct sset *miss(struct vars *v, struct dfa *d, struct sset *css,
color co, chr *cp, chr *start);
static int lacon(struct vars *v, struct cnfa *pcnfa, chr *cp, color co);
static struct sset *getvacant(struct vars *v, struct dfa *d, chr *cp,
chr *start);
static struct sset *pickss(struct vars *v, struct dfa *d, chr *cp,
chr *start);
/* /*

2
src/backend/utils/adt/regexp.c
View File

@ -112,7 +112,7 @@ static cached_re_str re_array[MAX_CACHED_RES]; /* cached re's */
/* Local functions */ /* Local functions */
static regexp_matches_ctx *setup_regexp_matches(text *orig_str, text *pattern, static regexp_matches_ctx *setup_regexp_matches(text *orig_str, text *pattern,
pg_re_flags *flags, pg_re_flags *re_flags,
int start_search, int start_search,
Oid collation, Oid collation,
bool use_subpatterns, bool use_subpatterns,

14
src/include/regex/regex.h
View File

@ -171,11 +171,15 @@ typedef struct
*/ */
/* regcomp.c */ /* regcomp.c */
extern int pg_regcomp(regex_t *, const pg_wchar *, size_t, int, Oid); extern int pg_regcomp(regex_t *re, const pg_wchar *string, size_t len,
extern int pg_regexec(regex_t *, const pg_wchar *, size_t, size_t, rm_detail_t *, size_t, regmatch_t[], int); int flags, Oid collation);
extern int pg_regprefix(regex_t *, pg_wchar **, size_t *); extern int pg_regexec(regex_t *re, const pg_wchar *string, size_t len,
extern void pg_regfree(regex_t *); size_t search_start, rm_detail_t *details,
extern size_t pg_regerror(int, const regex_t *, char *, size_t); size_t nmatch, regmatch_t pmatch[], int flags);
extern int pg_regprefix(regex_t *re, pg_wchar **string, size_t *slength);
extern void pg_regfree(regex_t *re);
extern size_t pg_regerror(int errcode, const regex_t *preg, char *errbuf,
size_t errbuf_size);
/* regexp.c */ /* regexp.c */
extern regex_t *RE_compile_and_cache(text *text_re, int cflags, Oid collation); extern regex_t *RE_compile_and_cache(text *text_re, int cflags, Oid collation);

2
src/test/modules/test_regex/test_regex.c
View File

@ -60,7 +60,7 @@ static void test_re_compile(text *text_re, int cflags, Oid collation,
static void parse_test_flags(test_re_flags *flags, text *opts); static void parse_test_flags(test_re_flags *flags, text *opts);
static test_regex_ctx *setup_test_matches(text *orig_str, static test_regex_ctx *setup_test_matches(text *orig_str,
regex_t *cpattern, regex_t *cpattern,
test_re_flags *flags, test_re_flags *re_flags,
Oid collation, Oid collation,
bool use_subpatterns); bool use_subpatterns);
static ArrayType *build_test_info_result(regex_t *cpattern, static ArrayType *build_test_info_result(regex_t *cpattern,