diff options
author | Bruce Momjian <bruce@momjian.us> | 2003-08-04 00:43:34 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2003-08-04 00:43:34 +0000 |
commit | 089003fb462fcce46c02bf47322b429f73c33c50 (patch) | |
tree | 77d78bc3a149df06f5603f60200a6ab363336624 /src/backend/regex/regc_nfa.c | |
parent | 63354a0228a1dbc4a0d5ddc8ecdd8326349d2100 (diff) | |
download | postgresql-089003fb462fcce46c02bf47322b429f73c33c50.tar.gz postgresql-089003fb462fcce46c02bf47322b429f73c33c50.zip |
pgindent run.
Diffstat (limited to 'src/backend/regex/regc_nfa.c')
-rw-r--r-- | src/backend/regex/regc_nfa.c | 858 |
1 files changed, 468 insertions, 390 deletions
diff --git a/src/backend/regex/regc_nfa.c b/src/backend/regex/regc_nfa.c index 43e01ebe92b..51fd8bfb859 100644 --- a/src/backend/regex/regc_nfa.c +++ b/src/backend/regex/regc_nfa.c @@ -2,21 +2,21 @@ * NFA utilities. * This file is #included by regcomp.c. * - * Copyright (c) 1998, 1999 Henry Spencer. All rights reserved. - * + * Copyright (c) 1998, 1999 Henry Spencer. All rights reserved. + * * Development of this software was funded, in part, by Cray Research Inc., * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics * Corporation, none of whom are responsible for the results. The author - * thanks all of them. - * + * thanks all of them. + * * Redistribution and use in source and binary forms -- with or without * modification -- are permitted for any purpose, provided that * redistributions in source form retain this entire copyright notice and * indicate the origin and nature of any modifications. - * + * * I'd appreciate being given credit for this package in the documentation * of software which uses it, but that is not a requirement. - * + * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL @@ -28,7 +28,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Header: /cvsroot/pgsql/src/backend/regex/regc_nfa.c,v 1.1 2003/02/05 17:41:32 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/regex/regc_nfa.c,v 1.2 2003/08/04 00:43:21 momjian Exp $ * * * One or two things that technically ought to be in here @@ -36,21 +36,21 @@ * the color chains. */ -#define NISERR() VISERR(nfa->v) -#define NERR(e) VERR(nfa->v, (e)) +#define NISERR() VISERR(nfa->v) +#define NERR(e) VERR(nfa->v, (e)) /* * newnfa - set up an NFA */ -static struct nfa * /* the NFA, or NULL */ -newnfa(struct vars *v, - struct colormap *cm, - struct nfa *parent) /* NULL if primary NFA */ +static struct nfa * /* the NFA, or NULL */ +newnfa(struct vars * v, + struct colormap * cm, + struct nfa * parent) /* NULL if primary NFA */ { struct nfa *nfa; - nfa = (struct nfa *)MALLOC(sizeof(struct nfa)); + nfa = (struct nfa *) MALLOC(sizeof(struct nfa)); if (nfa == NULL) return NULL; @@ -66,9 +66,10 @@ newnfa(struct vars *v, nfa->pre = newfstate(nfa, '>'); /* number 1 */ nfa->parent = parent; - nfa->init = newstate(nfa); /* may become invalid later */ + nfa->init = newstate(nfa); /* may become invalid later */ nfa->final = newstate(nfa); - if (ISERR()) { + if (ISERR()) + { freenfa(nfa); return NULL; } @@ -79,7 +80,8 @@ newnfa(struct vars *v, newarc(nfa, '$', 1, nfa->final, nfa->post); newarc(nfa, '$', 0, nfa->final, nfa->post); - if (ISERR()) { + if (ISERR()) + { freenfa(nfa); return NULL; } @@ -90,15 +92,17 @@ newnfa(struct vars *v, * freenfa - free an entire NFA */ static void -freenfa(struct nfa *nfa) +freenfa(struct nfa * nfa) { struct state *s; - while ((s = nfa->states) != NULL) { - s->nins = s->nouts = 0; /* don't worry about arcs */ + while ((s = nfa->states) != NULL) + { + s->nins = s->nouts = 0; /* don't worry about arcs */ freestate(nfa, s); } - while ((s = nfa->free) != NULL) { + while ((s = nfa->free) != NULL) + { nfa->free = s->next; destroystate(nfa, s); } @@ -113,17 +117,21 @@ freenfa(struct nfa *nfa) /* * newstate - allocate an NFA state, with zero flag value */ -static struct state * /* NULL on error */ -newstate(struct nfa *nfa) +static struct state * /* NULL on error */ +newstate(struct nfa * nfa) { struct state *s; - if (nfa->free != NULL) { + if (nfa->free != NULL) + { s = nfa->free; nfa->free = s->next; - } else { - s = (struct state *)MALLOC(sizeof(struct state)); - if (s == NULL) { + } + else + { + s = (struct state *) MALLOC(sizeof(struct state)); + if (s == NULL) + { NERR(REG_ESPACE); return NULL; } @@ -143,7 +151,8 @@ newstate(struct nfa *nfa) s->outs = NULL; s->tmp = NULL; s->next = NULL; - if (nfa->slast != NULL) { + if (nfa->slast != NULL) + { assert(nfa->slast->next == NULL); nfa->slast->next = s; } @@ -155,14 +164,14 @@ newstate(struct nfa *nfa) /* * newfstate - allocate an NFA state with a specified flag value */ -static struct state * /* NULL on error */ -newfstate(struct nfa *nfa, int flag) +static struct state * /* NULL on error */ +newfstate(struct nfa * nfa, int flag) { struct state *s; s = newstate(nfa); if (s != NULL) - s->flag = (char)flag; + s->flag = (char) flag; return s; } @@ -170,8 +179,8 @@ newfstate(struct nfa *nfa, int flag) * dropstate - delete a state's inarcs and outarcs and free it */ static void -dropstate(struct nfa *nfa, - struct state *s) +dropstate(struct nfa * nfa, + struct state * s) { struct arc *a; @@ -186,8 +195,8 @@ dropstate(struct nfa *nfa, * freestate - free a state, which has no in-arcs or out-arcs */ static void -freestate(struct nfa *nfa, - struct state *s) +freestate(struct nfa * nfa, + struct state * s) { assert(s != NULL); assert(s->nins == 0 && s->nouts == 0); @@ -196,18 +205,21 @@ freestate(struct nfa *nfa, s->flag = 0; if (s->next != NULL) s->next->prev = s->prev; - else { + else + { assert(s == nfa->slast); nfa->slast = s->prev; } if (s->prev != NULL) s->prev->next = s->next; - else { + else + { assert(s == nfa->states); nfa->states = s->next; } s->prev = NULL; - s->next = nfa->free; /* don't delete it, put it on the free list */ + s->next = nfa->free; /* don't delete it, put it on the free + * list */ nfa->free = s; } @@ -215,14 +227,15 @@ freestate(struct nfa *nfa, * destroystate - really get rid of an already-freed state */ static void -destroystate(struct nfa *nfa, - struct state *s) +destroystate(struct nfa * nfa, + struct state * s) { struct arcbatch *ab; struct arcbatch *abnext; assert(s->no == FREESTATE); - for (ab = s->oas.next; ab != NULL; ab = abnext) { + for (ab = s->oas.next; ab != NULL; ab = abnext) + { abnext = ab->next; FREE(ab); } @@ -236,11 +249,11 @@ destroystate(struct nfa *nfa, * newarc - set up a new arc within an NFA */ static void -newarc(struct nfa *nfa, +newarc(struct nfa * nfa, int t, pcolor co, - struct state *from, - struct state *to) + struct state * from, + struct state * to) { struct arc *a; @@ -257,13 +270,13 @@ newarc(struct nfa *nfa, assert(a != NULL); a->type = t; - a->co = (color)co; + a->co = (color) co; a->to = to; a->from = from; /* - * Put the new arc on the beginning, not the end, of the chains. - * Not only is this easier, it has the very useful side effect that + * Put the new arc on the beginning, not the end, of the chains. Not + * only is this easier, it has the very useful side effect that * deleting the most-recently-added arc is the cheapest case rather * than the most expensive one. */ @@ -284,36 +297,40 @@ newarc(struct nfa *nfa, /* * allocarc - allocate a new out-arc within a state */ -static struct arc * /* NULL for failure */ -allocarc(struct nfa *nfa, - struct state *s) +static struct arc * /* NULL for failure */ +allocarc(struct nfa * nfa, + struct state * s) { struct arc *a; struct arcbatch *new; - int i; + int i; /* shortcut */ - if (s->free == NULL && s->noas < ABSIZE) { + if (s->free == NULL && s->noas < ABSIZE) + { a = &s->oas.a[s->noas]; s->noas++; return a; } /* if none at hand, get more */ - if (s->free == NULL) { - new = (struct arcbatch *)MALLOC(sizeof(struct arcbatch)); - if (new == NULL) { + if (s->free == NULL) + { + new = (struct arcbatch *) MALLOC(sizeof(struct arcbatch)); + if (new == NULL) + { NERR(REG_ESPACE); return NULL; } new->next = s->oas.next; s->oas.next = new; - for (i = 0; i < ABSIZE; i++) { + for (i = 0; i < ABSIZE; i++) + { new->a[i].type = 0; - new->a[i].freechain = &new->a[i+1]; + new->a[i].freechain = &new->a[i + 1]; } - new->a[ABSIZE-1].freechain = NULL; + new->a[ABSIZE - 1].freechain = NULL; s->free = &new->a[0]; } assert(s->free != NULL); @@ -327,8 +344,8 @@ allocarc(struct nfa *nfa, * freearc - free an arc */ static void -freearc(struct nfa *nfa, - struct arc *victim) +freearc(struct nfa * nfa, + struct arc * victim) { struct state *from = victim->from; struct state *to = victim->to; @@ -344,9 +361,10 @@ freearc(struct nfa *nfa, assert(from != NULL); assert(from->outs != NULL); a = from->outs; - if (a == victim) /* simple case: first in chain */ + if (a == victim) /* simple case: first in chain */ from->outs = victim->outchain; - else { + else + { for (; a != NULL && a->outchain != victim; a = a->outchain) continue; assert(a != NULL); @@ -358,9 +376,10 @@ freearc(struct nfa *nfa, assert(to != NULL); assert(to->ins != NULL); a = to->ins; - if (a == victim) /* simple case: first in chain */ + if (a == victim) /* simple case: first in chain */ to->ins = victim->inchain; - else { + else + { for (; a != NULL && a->inchain != victim; a = a->inchain) continue; assert(a != NULL); @@ -383,7 +402,7 @@ freearc(struct nfa *nfa, * If there is more than one such arc, the result is random. */ static struct arc * -findarc(struct state *s, +findarc(struct state * s, int type, pcolor co) { @@ -399,10 +418,10 @@ findarc(struct state *s, * cparc - allocate a new arc within an NFA, copying details from old one */ static void -cparc(struct nfa *nfa, - struct arc *oa, - struct state *from, - struct state *to) +cparc(struct nfa * nfa, + struct arc * oa, + struct state * from, + struct state * to) { newarc(nfa, oa->type, oa->co, from, to); } @@ -416,15 +435,16 @@ cparc(struct nfa *nfa, * ones to exploit the suppression built into newarc. */ static void -moveins(struct nfa *nfa, - struct state *old, - struct state *new) +moveins(struct nfa * nfa, + struct state * old, + struct state * new) { struct arc *a; assert(old != new); - while ((a = old->ins) != NULL) { + while ((a = old->ins) != NULL) + { cparc(nfa, a, a->from, new); freearc(nfa, a); } @@ -436,9 +456,9 @@ moveins(struct nfa *nfa, * copyins - copy all in arcs of a state to another state */ static void -copyins(struct nfa *nfa, - struct state *old, - struct state *new) +copyins(struct nfa * nfa, + struct state * old, + struct state * new) { struct arc *a; @@ -452,15 +472,16 @@ copyins(struct nfa *nfa, * moveouts - move all out arcs of a state to another state */ static void -moveouts(struct nfa *nfa, - struct state *old, - struct state *new) +moveouts(struct nfa * nfa, + struct state * old, + struct state * new) { struct arc *a; assert(old != new); - while ((a = old->outs) != NULL) { + while ((a = old->outs) != NULL) + { cparc(nfa, a, new, a->to); freearc(nfa, a); } @@ -470,9 +491,9 @@ moveouts(struct nfa *nfa, * copyouts - copy all out arcs of a state to another state */ static void -copyouts(struct nfa *nfa, - struct state *old, - struct state *new) +copyouts(struct nfa * nfa, + struct state * old, + struct state * new) { struct arc *a; @@ -486,10 +507,10 @@ copyouts(struct nfa *nfa, * cloneouts - copy out arcs of a state to another state pair, modifying type */ static void -cloneouts(struct nfa *nfa, - struct state *old, - struct state *from, - struct state *to, +cloneouts(struct nfa * nfa, + struct state * old, + struct state * from, + struct state * to, int type) { struct arc *a; @@ -507,20 +528,20 @@ cloneouts(struct nfa *nfa, * states using their tmp pointer. */ static void -delsub(struct nfa *nfa, - struct state *lp, /* the sub-NFA goes from here... */ - struct state *rp) /* ...to here, *not* inclusive */ +delsub(struct nfa * nfa, + struct state * lp, /* the sub-NFA goes from here... */ + struct state * rp) /* ...to here, *not* inclusive */ { assert(lp != rp); - rp->tmp = rp; /* mark end */ + rp->tmp = rp; /* mark end */ deltraverse(nfa, lp, lp); assert(lp->nouts == 0 && rp->nins == 0); /* did the job */ - assert(lp->no != FREESTATE && rp->no != FREESTATE); /* no more */ + assert(lp->no != FREESTATE && rp->no != FREESTATE); /* no more */ - rp->tmp = NULL; /* unmark end */ - lp->tmp = NULL; /* and begin, marked by deltraverse */ + rp->tmp = NULL; /* unmark end */ + lp->tmp = NULL; /* and begin, marked by deltraverse */ } /* @@ -528,36 +549,38 @@ delsub(struct nfa *nfa, * This routine's basic job is to destroy all out-arcs of the state. */ static void -deltraverse(struct nfa *nfa, - struct state *leftend, - struct state *s) +deltraverse(struct nfa * nfa, + struct state * leftend, + struct state * s) { struct arc *a; struct state *to; if (s->nouts == 0) - return; /* nothing to do */ + return; /* nothing to do */ if (s->tmp != NULL) - return; /* already in progress */ + return; /* already in progress */ - s->tmp = s; /* mark as in progress */ + s->tmp = s; /* mark as in progress */ - while ((a = s->outs) != NULL) { + while ((a = s->outs) != NULL) + { to = a->to; deltraverse(nfa, leftend, to); assert(to->nouts == 0 || to->tmp != NULL); freearc(nfa, a); - if (to->nins == 0 && to->tmp == NULL) { + if (to->nins == 0 && to->tmp == NULL) + { assert(to->nouts == 0); freestate(nfa, to); } } - assert(s->no != FREESTATE); /* we're still here */ - assert(s == leftend || s->nins != 0); /* and still reachable */ + assert(s->no != FREESTATE); /* we're still here */ + assert(s == leftend || s->nins != 0); /* and still reachable */ assert(s->nouts == 0); /* but have no outarcs */ - s->tmp = NULL; /* we're done here */ + s->tmp = NULL; /* we're done here */ } /* @@ -568,13 +591,14 @@ deltraverse(struct nfa *nfa, * it's a state pointer, didn't you? :-)) */ static void -dupnfa(struct nfa *nfa, - struct state *start, /* duplicate of subNFA starting here */ - struct state *stop, /* and stopping here */ - struct state *from, /* stringing duplicate from here */ - struct state *to) /* to here */ +dupnfa(struct nfa * nfa, + struct state * start, /* duplicate of subNFA starting here */ + struct state * stop, /* and stopping here */ + struct state * from, /* stringing duplicate from here */ + struct state * to) /* to here */ { - if (start == stop) { + if (start == stop) + { newarc(nfa, EMPTY, 0, from, to); return; } @@ -591,23 +615,25 @@ dupnfa(struct nfa *nfa, * duptraverse - recursive heart of dupnfa */ static void -duptraverse(struct nfa *nfa, - struct state *s, - struct state *stmp) /* s's duplicate, or NULL */ +duptraverse(struct nfa * nfa, + struct state * s, + struct state * stmp) /* s's duplicate, or NULL */ { struct arc *a; if (s->tmp != NULL) - return; /* already done */ + return; /* already done */ s->tmp = (stmp == NULL) ? newstate(nfa) : stmp; - if (s->tmp == NULL) { + if (s->tmp == NULL) + { assert(NISERR()); return; } - for (a = s->outs; a != NULL && !NISERR(); a = a->outchain) { - duptraverse(nfa, a->to, (struct state *)NULL); + for (a = s->outs; a != NULL && !NISERR(); a = a->outchain) + { + duptraverse(nfa, a->to, (struct state *) NULL); assert(a->to->tmp != NULL); cparc(nfa, a, s->tmp, a->to->tmp); } @@ -617,8 +643,8 @@ duptraverse(struct nfa *nfa, * cleartraverse - recursive cleanup for algorithms that leave tmp ptrs set */ static void -cleartraverse(struct nfa *nfa, - struct state *s) +cleartraverse(struct nfa * nfa, + struct state * s) { struct arc *a; @@ -634,15 +660,18 @@ cleartraverse(struct nfa *nfa, * specialcolors - fill in special colors for an NFA */ static void -specialcolors(struct nfa *nfa) +specialcolors(struct nfa * nfa) { /* false colors for BOS, BOL, EOS, EOL */ - if (nfa->parent == NULL) { + if (nfa->parent == NULL) + { nfa->bos[0] = pseudocolor(nfa->cm); nfa->bos[1] = pseudocolor(nfa->cm); nfa->eos[0] = pseudocolor(nfa->cm); nfa->eos[1] = pseudocolor(nfa->cm); - } else { + } + else + { assert(nfa->parent->bos[0] != COLORLESS); nfa->bos[0] = nfa->parent->bos[0]; assert(nfa->parent->bos[1] != COLORLESS); @@ -657,57 +686,60 @@ specialcolors(struct nfa *nfa) /* * optimize - optimize an NFA */ -static long /* re_info bits */ -optimize(struct nfa *nfa, +static long /* re_info bits */ +optimize(struct nfa * nfa, FILE *f) /* for debug output; NULL none */ { #ifdef REG_DEBUG - int verbose = (f != NULL) ? 1 : 0; + int verbose = (f != NULL) ? 1 : 0; if (verbose) fprintf(f, "\ninitial cleanup:\n"); #endif - cleanup(nfa); /* may simplify situation */ + cleanup(nfa); /* may simplify situation */ #ifdef REG_DEBUG if (verbose) dumpnfa(nfa, f); if (verbose) fprintf(f, "\nempties:\n"); #endif - fixempties(nfa, f); /* get rid of EMPTY arcs */ + fixempties(nfa, f); /* get rid of EMPTY arcs */ #ifdef REG_DEBUG if (verbose) fprintf(f, "\nconstraints:\n"); #endif - pullback(nfa, f); /* pull back constraints backward */ - pushfwd(nfa, f); /* push fwd constraints forward */ + pullback(nfa, f); /* pull back constraints backward */ + pushfwd(nfa, f); /* push fwd constraints forward */ #ifdef REG_DEBUG if (verbose) fprintf(f, "\nfinal cleanup:\n"); #endif - cleanup(nfa); /* final tidying */ - return analyze(nfa); /* and analysis */ + cleanup(nfa); /* final tidying */ + return analyze(nfa); /* and analysis */ } /* * pullback - pull back constraints backward to (with luck) eliminate them */ static void -pullback(struct nfa *nfa, - FILE *f) /* for debug output; NULL none */ +pullback(struct nfa * nfa, + FILE *f) /* for debug output; NULL none */ { struct state *s; struct state *nexts; struct arc *a; struct arc *nexta; - int progress; + int progress; /* find and pull until there are no more */ - do { + do + { progress = 0; - for (s = nfa->states; s != NULL && !NISERR(); s = nexts) { + for (s = nfa->states; s != NULL && !NISERR(); s = nexts) + { nexts = s->next; - for (a = s->outs; a != NULL && !NISERR(); a = nexta) { + for (a = s->outs; a != NULL && !NISERR(); a = nexta) + { nexta = a->outchain; if (a->type == '^' || a->type == BEHIND) if (pull(nfa, a)) @@ -721,9 +753,11 @@ pullback(struct nfa *nfa, if (NISERR()) return; - for (a = nfa->pre->outs; a != NULL; a = nexta) { + for (a = nfa->pre->outs; a != NULL; a = nexta) + { nexta = a->outchain; - if (a->type == '^') { + if (a->type == '^') + { assert(a->co == 0 || a->co == 1); newarc(nfa, PLAIN, nfa->bos[a->co], a->from, a->to); freearc(nfa, a); @@ -737,9 +771,9 @@ pullback(struct nfa *nfa, * one state -- the constraint's from state -- and only if the constraint * was that state's last outarc. */ -static int /* 0 couldn't, 1 could */ -pull(struct nfa *nfa, - struct arc *con) +static int /* 0 couldn't, 1 could */ +pull(struct nfa * nfa, + struct arc * con) { struct state *from = con->from; struct state *to = con->to; @@ -747,25 +781,28 @@ pull(struct nfa *nfa, struct arc *nexta; struct state *s; - if (from == to) { /* circular constraint is pointless */ + if (from == to) + { /* circular constraint is pointless */ freearc(nfa, con); return 1; } - if (from->flag) /* can't pull back beyond start */ + if (from->flag) /* can't pull back beyond start */ return 0; - if (from->nins == 0) { /* unreachable */ + if (from->nins == 0) + { /* unreachable */ freearc(nfa, con); return 1; } /* first, clone from state if necessary to avoid other outarcs */ - if (from->nouts > 1) { + if (from->nouts > 1) + { s = newstate(nfa); if (NISERR()) return 0; assert(to != from); /* con is not an inarc */ - copyins(nfa, from, s); /* duplicate inarcs */ - cparc(nfa, con, s, to); /* move constraint arc */ + copyins(nfa, from, s); /* duplicate inarcs */ + cparc(nfa, con, s, to); /* move constraint arc */ freearc(nfa, con); from = s; con = from->outs; @@ -773,27 +810,29 @@ pull(struct nfa *nfa, assert(from->nouts == 1); /* propagate the constraint into the from state's inarcs */ - for (a = from->ins; a != NULL; a = nexta) { + for (a = from->ins; a != NULL; a = nexta) + { nexta = a->inchain; - switch (combine(con, a)) { - case INCOMPATIBLE: /* destroy the arc */ - freearc(nfa, a); - break; - case SATISFIED: /* no action needed */ - break; - case COMPATIBLE: /* swap the two arcs, more or less */ - s = newstate(nfa); - if (NISERR()) - return 0; - cparc(nfa, a, s, to); /* anticipate move */ - cparc(nfa, con, a->from, s); - if (NISERR()) - return 0; - freearc(nfa, a); - break; - default: - assert(NOTREACHED); - break; + switch (combine(con, a)) + { + case INCOMPATIBLE: /* destroy the arc */ + freearc(nfa, a); + break; + case SATISFIED: /* no action needed */ + break; + case COMPATIBLE: /* swap the two arcs, more or less */ + s = newstate(nfa); + if (NISERR()) + return 0; + cparc(nfa, a, s, to); /* anticipate move */ + cparc(nfa, con, a->from, s); + if (NISERR()) + return 0; + freearc(nfa, a); + break; + default: + assert(NOTREACHED); + break; } } @@ -807,21 +846,24 @@ pull(struct nfa *nfa, * pushfwd - push forward constraints forward to (with luck) eliminate them */ static void -pushfwd(struct nfa *nfa, - FILE *f) /* for debug output; NULL none */ +pushfwd(struct nfa * nfa, + FILE *f) /* for debug output; NULL none */ { struct state *s; struct state *nexts; struct arc *a; struct arc *nexta; - int progress; + int progress; /* find and push until there are no more */ - do { + do + { progress = 0; - for (s = nfa->states; s != NULL && !NISERR(); s = nexts) { + for (s = nfa->states; s != NULL && !NISERR(); s = nexts) + { nexts = s->next; - for (a = s->ins; a != NULL && !NISERR(); a = nexta) { + for (a = s->ins; a != NULL && !NISERR(); a = nexta) + { nexta = a->inchain; if (a->type == '$' || a->type == AHEAD) if (push(nfa, a)) @@ -835,9 +877,11 @@ pushfwd(struct nfa *nfa, if (NISERR()) return; - for (a = nfa->post->ins; a != NULL; a = nexta) { + for (a = nfa->post->ins; a != NULL; a = nexta) + { nexta = a->inchain; - if (a->type == '$') { + if (a->type == '$') + { assert(a->co == 0 || a->co == 1); newarc(nfa, PLAIN, nfa->eos[a->co], a->from, a->to); freearc(nfa, a); @@ -851,9 +895,9 @@ pushfwd(struct nfa *nfa, * one state -- the constraint's to state -- and only if the constraint * was that state's last inarc. */ -static int /* 0 couldn't, 1 could */ -push(struct nfa *nfa, - struct arc *con) +static int /* 0 couldn't, 1 could */ +push(struct nfa * nfa, + struct arc * con) { struct state *from = con->from; struct state *to = con->to; @@ -861,24 +905,27 @@ push(struct nfa *nfa, struct arc *nexta; struct state *s; - if (to == from) { /* circular constraint is pointless */ + if (to == from) + { /* circular constraint is pointless */ freearc(nfa, con); return 1; } - if (to->flag) /* can't push forward beyond end */ + if (to->flag) /* can't push forward beyond end */ return 0; - if (to->nouts == 0) { /* dead end */ + if (to->nouts == 0) + { /* dead end */ freearc(nfa, con); return 1; } /* first, clone to state if necessary to avoid other inarcs */ - if (to->nins > 1) { + if (to->nins > 1) + { s = newstate(nfa); if (NISERR()) return 0; - copyouts(nfa, to, s); /* duplicate outarcs */ - cparc(nfa, con, from, s); /* move constraint */ + copyouts(nfa, to, s); /* duplicate outarcs */ + cparc(nfa, con, from, s); /* move constraint */ freearc(nfa, con); to = s; con = to->ins; @@ -886,88 +933,91 @@ push(struct nfa *nfa, assert(to->nins == 1); /* propagate the constraint into the to state's outarcs */ - for (a = to->outs; a != NULL; a = nexta) { + for (a = to->outs; a != NULL; a = nexta) + { nexta = a->outchain; - switch (combine(con, a)) { - case INCOMPATIBLE: /* destroy the arc */ - freearc(nfa, a); - break; - case SATISFIED: /* no action needed */ - break; - case COMPATIBLE: /* swap the two arcs, more or less */ - s = newstate(nfa); - if (NISERR()) - return 0; - cparc(nfa, con, s, a->to); /* anticipate move */ - cparc(nfa, a, from, s); - if (NISERR()) - return 0; - freearc(nfa, a); - break; - default: - assert(NOTREACHED); - break; + switch (combine(con, a)) + { + case INCOMPATIBLE: /* destroy the arc */ + freearc(nfa, a); + break; + case SATISFIED: /* no action needed */ + break; + case COMPATIBLE: /* swap the two arcs, more or less */ + s = newstate(nfa); + if (NISERR()) + return 0; + cparc(nfa, con, s, a->to); /* anticipate move */ + cparc(nfa, a, from, s); + if (NISERR()) + return 0; + freearc(nfa, a); + break; + default: + assert(NOTREACHED); + break; } } /* remaining outarcs, if any, incorporate the constraint */ moveouts(nfa, to, from); - dropstate(nfa, to); /* will free the constraint */ + dropstate(nfa, to); /* will free the constraint */ return 1; } /* * combine - constraint lands on an arc, what happens? * - * #def INCOMPATIBLE 1 // destroys arc - * #def SATISFIED 2 // constraint satisfied - * #def COMPATIBLE 3 // compatible but not satisfied yet + * #def INCOMPATIBLE 1 // destroys arc + * #def SATISFIED 2 // constraint satisfied + * #def COMPATIBLE 3 // compatible but not satisfied yet */ static int -combine(struct arc *con, - struct arc *a) +combine(struct arc * con, + struct arc * a) { -# define CA(ct,at) (((ct)<<CHAR_BIT) | (at)) - - switch (CA(con->type, a->type)) { - case CA('^', PLAIN): /* newlines are handled separately */ - case CA('$', PLAIN): - return INCOMPATIBLE; - break; - case CA(AHEAD, PLAIN): /* color constraints meet colors */ - case CA(BEHIND, PLAIN): - if (con->co == a->co) - return SATISFIED; - return INCOMPATIBLE; - break; - case CA('^', '^'): /* collision, similar constraints */ - case CA('$', '$'): - case CA(AHEAD, AHEAD): - case CA(BEHIND, BEHIND): - if (con->co == a->co) /* true duplication */ - return SATISFIED; - return INCOMPATIBLE; - break; - case CA('^', BEHIND): /* collision, dissimilar constraints */ - case CA(BEHIND, '^'): - case CA('$', AHEAD): - case CA(AHEAD, '$'): - return INCOMPATIBLE; - break; - case CA('^', '$'): /* constraints passing each other */ - case CA('^', AHEAD): - case CA(BEHIND, '$'): - case CA(BEHIND, AHEAD): - case CA('$', '^'): - case CA('$', BEHIND): - case CA(AHEAD, '^'): - case CA(AHEAD, BEHIND): - case CA('^', LACON): - case CA(BEHIND, LACON): - case CA('$', LACON): - case CA(AHEAD, LACON): - return COMPATIBLE; - break; +#define CA(ct,at) (((ct)<<CHAR_BIT) | (at)) + + switch (CA(con->type, a->type)) + { + case CA('^', PLAIN): /* newlines are handled separately */ + case CA('$', PLAIN): + return INCOMPATIBLE; + break; + case CA(AHEAD, PLAIN): /* color constraints meet colors */ + case CA(BEHIND, PLAIN): + if (con->co == a->co) + return SATISFIED; + return INCOMPATIBLE; + break; + case CA('^', '^'): /* collision, similar constraints */ + case CA('$', '$'): + case CA(AHEAD, AHEAD): + case CA(BEHIND, BEHIND): + if (con->co == a->co) /* true duplication */ + return SATISFIED; + return INCOMPATIBLE; + break; + case CA('^', BEHIND): /* collision, dissimilar constraints */ + case CA(BEHIND, '^'): + case CA('$', AHEAD): + case CA(AHEAD, '$'): + return INCOMPATIBLE; + break; + case CA('^', '$'): /* constraints passing each other */ + case CA('^', AHEAD): + case CA(BEHIND, '$'): + case CA(BEHIND, AHEAD): + case CA('$', '^'): + case CA('$', BEHIND): + case CA(AHEAD, '^'): + case CA(AHEAD, BEHIND): + case CA('^', LACON): + case CA(BEHIND, LACON): + case CA('$', LACON): + case CA(AHEAD, LACON): + return COMPATIBLE; + break; } assert(NOTREACHED); return INCOMPATIBLE; /* for benefit of blind compilers */ @@ -977,21 +1027,24 @@ combine(struct arc *con, * fixempties - get rid of EMPTY arcs */ static void -fixempties(struct nfa *nfa, - FILE *f) /* for debug output; NULL none */ +fixempties(struct nfa * nfa, + FILE *f) /* for debug output; NULL none */ { struct state *s; struct state *nexts; struct arc *a; struct arc *nexta; - int progress; + int progress; /* find and eliminate empties until there are no more */ - do { + do + { progress = 0; - for (s = nfa->states; s != NULL && !NISERR(); s = nexts) { + for (s = nfa->states; s != NULL && !NISERR(); s = nexts) + { nexts = s->next; - for (a = s->outs; a != NULL && !NISERR(); a = nexta) { + for (a = s->outs; a != NULL && !NISERR(); a = nexta) + { nexta = a->outchain; if (a->type == EMPTY && unempty(nfa, a)) progress = 1; @@ -1009,46 +1062,55 @@ fixempties(struct nfa *nfa, * Actually, as it stands this function always succeeds, but the return * value is kept with an eye on possible future changes. */ -static int /* 0 couldn't, 1 could */ -unempty(struct nfa *nfa, - struct arc *a) +static int /* 0 couldn't, 1 could */ +unempty(struct nfa * nfa, + struct arc * a) { struct state *from = a->from; struct state *to = a->to; - int usefrom; /* work on from, as opposed to to? */ + int usefrom; /* work on from, as opposed to to? */ assert(a->type == EMPTY); assert(from != nfa->pre && to != nfa->post); - if (from == to) { /* vacuous loop */ + if (from == to) + { /* vacuous loop */ freearc(nfa, a); return 1; } /* decide which end to work on */ - usefrom = 1; /* default: attack from */ + usefrom = 1; /* default: attack from */ if (from->nouts > to->nins) usefrom = 0; - else if (from->nouts == to->nins) { + else if (from->nouts == to->nins) + { /* decide on secondary issue: move/copy fewest arcs */ if (from->nins > to->nouts) usefrom = 0; } - + freearc(nfa, a); - if (usefrom) { - if (from->nouts == 0) { + if (usefrom) + { + if (from->nouts == 0) + { /* was the state's only outarc */ moveins(nfa, from, to); freestate(nfa, from); - } else + } + else copyins(nfa, from, to); - } else { - if (to->nins == 0) { + } + else + { + if (to->nins == 0) + { /* was the state's only inarc */ moveouts(nfa, to, from); freestate(nfa, to); - } else + } + else copyouts(nfa, to, from); } @@ -1059,17 +1121,18 @@ unempty(struct nfa *nfa, * cleanup - clean up NFA after optimizations */ static void -cleanup(struct nfa *nfa) +cleanup(struct nfa * nfa) { struct state *s; struct state *nexts; - int n; + int n; /* clear out unreachable or dead-end states */ /* use pre to mark reachable, then post to mark can-reach-post */ - markreachable(nfa, nfa->pre, (struct state *)NULL, nfa->pre); + markreachable(nfa, nfa->pre, (struct state *) NULL, nfa->pre); markcanreach(nfa, nfa->post, nfa->pre, nfa->post); - for (s = nfa->states; s != NULL; s = nexts) { + for (s = nfa->states; s != NULL; s = nexts) + { nexts = s->next; if (s->tmp != nfa->post && !s->flag) dropstate(nfa, s); @@ -1090,10 +1153,11 @@ cleanup(struct nfa *nfa) * markreachable - recursive marking of reachable states */ static void -markreachable(struct nfa *nfa, - struct state *s, - struct state *okay, /* consider only states with this mark */ - struct state *mark) /* the value to mark with */ +markreachable(struct nfa * nfa, + struct state * s, + struct state * okay, /* consider only states with this + * mark */ + struct state * mark) /* the value to mark with */ { struct arc *a; @@ -1109,10 +1173,11 @@ markreachable(struct nfa *nfa, * markcanreach - recursive marking of states which can reach here */ static void -markcanreach(struct nfa *nfa, - struct state *s, - struct state *okay, /* consider only states with this mark */ - struct state *mark) /* the value to mark with */ +markcanreach(struct nfa * nfa, + struct state * s, + struct state * okay, /* consider only states with this + * mark */ + struct state * mark) /* the value to mark with */ { struct arc *a; @@ -1127,8 +1192,8 @@ markcanreach(struct nfa *nfa, /* * analyze - ascertain potentially-useful facts about an optimized NFA */ -static long /* re_info bits to be ORed in */ -analyze(struct nfa *nfa) +static long /* re_info bits to be ORed in */ +analyze(struct nfa * nfa) { struct arc *a; struct arc *aa; @@ -1146,29 +1211,31 @@ analyze(struct nfa *nfa) * compact - compact an NFA */ static void -compact(struct nfa *nfa, - struct cnfa *cnfa) +compact(struct nfa * nfa, + struct cnfa * cnfa) { struct state *s; struct arc *a; - size_t nstates; - size_t narcs; + size_t nstates; + size_t narcs; struct carc *ca; struct carc *first; - assert (!NISERR()); + assert(!NISERR()); nstates = 0; narcs = 0; - for (s = nfa->states; s != NULL; s = s->next) { + for (s = nfa->states; s != NULL; s = s->next) + { nstates++; narcs += 1 + s->nouts + 1; /* 1 as a fake for flags, nouts for arcs, 1 as endmarker */ } - cnfa->states = (struct carc **)MALLOC(nstates * sizeof(struct carc *)); - cnfa->arcs = (struct carc *)MALLOC(narcs * sizeof(struct carc)); - if (cnfa->states == NULL || cnfa->arcs == NULL) { + cnfa->states = (struct carc **) MALLOC(nstates * sizeof(struct carc *)); + cnfa->arcs = (struct carc *) MALLOC(narcs * sizeof(struct carc)); + if (cnfa->states == NULL || cnfa->arcs == NULL) + { if (cnfa->states != NULL) FREE(cnfa->states); if (cnfa->arcs != NULL) @@ -1187,31 +1254,33 @@ compact(struct nfa *nfa, cnfa->flags = 0; ca = cnfa->arcs; - for (s = nfa->states; s != NULL; s = s->next) { - assert((size_t)s->no < nstates); + for (s = nfa->states; s != NULL; s = s->next) + { + assert((size_t) s->no < nstates); cnfa->states[s->no] = ca; - ca->co = 0; /* clear and skip flags "arc" */ + ca->co = 0; /* clear and skip flags "arc" */ ca++; first = ca; for (a = s->outs; a != NULL; a = a->outchain) - switch (a->type) { - case PLAIN: - ca->co = a->co; - ca->to = a->to->no; - ca++; - break; - case LACON: - assert(s->no != cnfa->pre); - ca->co = (color)(cnfa->ncolors + a->co); - ca->to = a->to->no; - ca++; - cnfa->flags |= HASLACONS; - break; - default: - assert(NOTREACHED); - break; + switch (a->type) + { + case PLAIN: + ca->co = a->co; + ca->to = a->to->no; + ca++; + break; + case LACON: + assert(s->no != cnfa->pre); + ca->co = (color) (cnfa->ncolors + a->co); + ca->to = a->to->no; + ca++; + cnfa->flags |= HASLACONS; + break; + default: + assert(NOTREACHED); + break; } - carcsort(first, ca-1); + carcsort(first, ca - 1); ca->co = COLORLESS; ca->to = 0; ca++; @@ -1232,8 +1301,8 @@ compact(struct nfa *nfa, * you're in real trouble anyway. */ static void -carcsort(struct carc *first, - struct carc *last) +carcsort(struct carc * first, + struct carc * last) { struct carc *p; struct carc *q; @@ -1245,7 +1314,8 @@ carcsort(struct carc *first, for (p = first; p <= last; p++) for (q = p; q <= last; q++) if (p->co > q->co || - (p->co == q->co && p->to > q->to)) { + (p->co == q->co && p->to > q->to)) + { assert(p != q); tmp = *p; *p = *q; @@ -1257,9 +1327,9 @@ carcsort(struct carc *first, * freecnfa - free a compacted NFA */ static void -freecnfa(struct cnfa *cnfa) +freecnfa(struct cnfa * cnfa) { - assert(cnfa->nstates != 0); /* not empty already */ + assert(cnfa->nstates != 0); /* not empty already */ cnfa->nstates = 0; FREE(cnfa->states); FREE(cnfa->arcs); @@ -1269,7 +1339,7 @@ freecnfa(struct cnfa *cnfa) * dumpnfa - dump an NFA in human-readable form */ static void -dumpnfa(struct nfa *nfa, +dumpnfa(struct nfa * nfa, FILE *f) { #ifdef REG_DEBUG @@ -1277,13 +1347,13 @@ dumpnfa(struct nfa *nfa, fprintf(f, "pre %d, post %d", nfa->pre->no, nfa->post->no); if (nfa->bos[0] != COLORLESS) - fprintf(f, ", bos [%ld]", (long)nfa->bos[0]); + fprintf(f, ", bos [%ld]", (long) nfa->bos[0]); if (nfa->bos[1] != COLORLESS) - fprintf(f, ", bol [%ld]", (long)nfa->bos[1]); + fprintf(f, ", bol [%ld]", (long) nfa->bos[1]); if (nfa->eos[0] != COLORLESS) - fprintf(f, ", eos [%ld]", (long)nfa->eos[0]); + fprintf(f, ", eos [%ld]", (long) nfa->eos[0]); if (nfa->eos[1] != COLORLESS) - fprintf(f, ", eol [%ld]", (long)nfa->eos[1]); + fprintf(f, ", eol [%ld]", (long) nfa->eos[1]); fprintf(f, "\n"); for (s = nfa->states; s != NULL; s = s->next) dumpstate(s, f); @@ -1293,19 +1363,19 @@ dumpnfa(struct nfa *nfa, #endif } -#ifdef REG_DEBUG /* subordinates of dumpnfa */ +#ifdef REG_DEBUG /* subordinates of dumpnfa */ /* * dumpstate - dump an NFA state in human-readable form */ static void -dumpstate(struct state *s, +dumpstate(struct state * s, FILE *f) { struct arc *a; fprintf(f, "%d%s%c", s->no, (s->tmp != NULL) ? "T" : "", - (s->flag) ? s->flag : '.'); + (s->flag) ? s->flag : '.'); if (s->prev != NULL && s->prev->next != s) fprintf(f, "\tstate chain bad\n"); if (s->nouts == 0) @@ -1313,7 +1383,8 @@ dumpstate(struct state *s, else dumparcs(s, f); fflush(f); - for (a = s->ins; a != NULL; a = a->inchain) { + for (a = s->ins; a != NULL; a = a->inchain) + { if (a->to != s) fprintf(f, "\tlink from %d to %d on %d's in-chain\n", a->from->no, a->to->no, s->no); @@ -1324,10 +1395,10 @@ dumpstate(struct state *s, * dumparcs - dump out-arcs in human-readable form */ static void -dumparcs(struct state *s, +dumparcs(struct state * s, FILE *f) { - int pos; + int pos; assert(s->nouts > 0); /* printing arcs in reverse order is usually clearer */ @@ -1339,19 +1410,21 @@ dumparcs(struct state *s, /* * dumprarcs - dump remaining outarcs, recursively, in reverse order */ -static int /* resulting print position */ -dumprarcs(struct arc *a, - struct state *s, +static int /* resulting print position */ +dumprarcs(struct arc * a, + struct state * s, FILE *f, - int pos) /* initial print position */ + int pos) /* initial print position */ { if (a->outchain != NULL) pos = dumprarcs(a->outchain, s, f, pos); dumparc(a, s, f); - if (pos == 5) { + if (pos == 5) + { fprintf(f, "\n"); pos = 1; - } else + } + else pos++; return pos; } @@ -1360,83 +1433,85 @@ dumprarcs(struct arc *a, * dumparc - dump one outarc in readable form, including prefixing tab */ static void -dumparc(struct arc *a, - struct state *s, +dumparc(struct arc * a, + struct state * s, FILE *f) { struct arc *aa; struct arcbatch *ab; fprintf(f, "\t"); - switch (a->type) { - case PLAIN: - fprintf(f, "[%ld]", (long)a->co); - break; - case AHEAD: - fprintf(f, ">%ld>", (long)a->co); - break; - case BEHIND: - fprintf(f, "<%ld<", (long)a->co); - break; - case LACON: - fprintf(f, ":%ld:", (long)a->co); - break; - case '^': - case '$': - fprintf(f, "%c%d", a->type, (int)a->co); - break; - case EMPTY: - break; - default: - fprintf(f, "0x%x/0%lo", a->type, (long)a->co); - break; + switch (a->type) + { + case PLAIN: + fprintf(f, "[%ld]", (long) a->co); + break; + case AHEAD: + fprintf(f, ">%ld>", (long) a->co); + break; + case BEHIND: + fprintf(f, "<%ld<", (long) a->co); + break; + case LACON: + fprintf(f, ":%ld:", (long) a->co); + break; + case '^': + case '$': + fprintf(f, "%c%d", a->type, (int) a->co); + break; + case EMPTY: + break; + default: + fprintf(f, "0x%x/0%lo", a->type, (long) a->co); + break; } if (a->from != s) fprintf(f, "?%d?", a->from->no); - for (ab = &a->from->oas; ab != NULL; ab = ab->next) { + for (ab = &a->from->oas; ab != NULL; ab = ab->next) + { for (aa = &ab->a[0]; aa < &ab->a[ABSIZE]; aa++) if (aa == a) - break; /* NOTE BREAK OUT */ + break; /* NOTE BREAK OUT */ if (aa < &ab->a[ABSIZE]) /* propagate break */ - break; /* NOTE BREAK OUT */ + break; /* NOTE BREAK OUT */ } if (ab == NULL) - fprintf(f, "?!?"); /* not in allocated space */ + fprintf(f, "?!?"); /* not in allocated space */ fprintf(f, "->"); - if (a->to == NULL) { + if (a->to == NULL) + { fprintf(f, "NULL"); return; } fprintf(f, "%d", a->to->no); for (aa = a->to->ins; aa != NULL; aa = aa->inchain) if (aa == a) - break; /* NOTE BREAK OUT */ + break; /* NOTE BREAK OUT */ if (aa == NULL) - fprintf(f, "?!?"); /* missing from in-chain */ + fprintf(f, "?!?"); /* missing from in-chain */ } - -#endif /* REG_DEBUG */ +#endif /* REG_DEBUG */ /* * dumpcnfa - dump a compacted NFA in human-readable form */ #ifdef REG_DEBUG static void -dumpcnfa(struct cnfa *cnfa, +dumpcnfa(struct cnfa * cnfa, FILE *f) { - int st; + int st; fprintf(f, "pre %d, post %d", cnfa->pre, cnfa->post); if (cnfa->bos[0] != COLORLESS) - fprintf(f, ", bos [%ld]", (long)cnfa->bos[0]); + fprintf(f, ", bos [%ld]", (long) cnfa->bos[0]); if (cnfa->bos[1] != COLORLESS) - fprintf(f, ", bol [%ld]", (long)cnfa->bos[1]); + fprintf(f, ", bol [%ld]", (long) cnfa->bos[1]); if (cnfa->eos[0] != COLORLESS) - fprintf(f, ", eos [%ld]", (long)cnfa->eos[0]); + fprintf(f, ", eos [%ld]", (long) cnfa->eos[0]); if (cnfa->eos[1] != COLORLESS) - fprintf(f, ", eol [%ld]", (long)cnfa->eos[1]); - if (cnfa->flags&HASLACONS) + fprintf(f, ", eol [%ld]", (long) cnfa->eos[1]); + if (cnfa->flags & HASLACONS) fprintf(f, ", haslacons"); fprintf(f, "\n"); for (st = 0; st < cnfa->nstates; st++) @@ -1445,32 +1520,35 @@ dumpcnfa(struct cnfa *cnfa, } #endif -#ifdef REG_DEBUG /* subordinates of dumpcnfa */ +#ifdef REG_DEBUG /* subordinates of dumpcnfa */ /* * dumpcstate - dump a compacted-NFA state in human-readable form */ static void dumpcstate(int st, - struct carc *ca, - struct cnfa *cnfa, + struct carc * ca, + struct cnfa * cnfa, FILE *f) { - int i; - int pos; + int i; + int pos; fprintf(f, "%d%s", st, (ca[0].co) ? ":" : "."); pos = 1; - for (i = 1; ca[i].co != COLORLESS; i++) { + for (i = 1; ca[i].co != COLORLESS; i++) + { if (ca[i].co < cnfa->ncolors) - fprintf(f, "\t[%ld]->%d", (long)ca[i].co, ca[i].to); + fprintf(f, "\t[%ld]->%d", (long) ca[i].co, ca[i].to); else - fprintf(f, "\t:%ld:->%d", (long)ca[i].co-cnfa->ncolors, - ca[i].to); - if (pos == 5) { + fprintf(f, "\t:%ld:->%d", (long) ca[i].co - cnfa->ncolors, + ca[i].to); + if (pos == 5) + { fprintf(f, "\n"); pos = 1; - } else + } + else pos++; } if (i == 1 || pos != 1) @@ -1478,4 +1556,4 @@ dumpcstate(int st, fflush(f); } -#endif /* REG_DEBUG */ +#endif /* REG_DEBUG */ |