Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import regex from tcl 8.4.5

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/RXSPENCER@4096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
1999-10-21 02:16:20 +00:00
parent bcdf529fe2
commit 9e0b898ade
1 changed files with 284 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

374
src/regex/regc_color.c
View File

@@ -28,7 +28,6 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Header$
* *
* *
* Note that there are some incestuous relationships between this code and * Note that there are some incestuous relationships between this code and
@@ -43,11 +42,13 @@
/* /*
* initcm - set up new colormap - initcm - set up new colormap
^ static VOID initcm(struct vars *, struct colormap *);
*/ */
static void static VOID
initcm(struct vars * v, initcm(v, cm)
struct colormap * cm) struct vars *v;
struct colormap *cm;
{ {
int i; int i;
int j; int j;
@@ -70,8 +71,7 @@ initcm(struct vars * v,
cd->nchrs = CHR_MAX - CHR_MIN + 1; cd->nchrs = CHR_MAX - CHR_MIN + 1;
/* upper levels of tree */ /* upper levels of tree */
for (t = &cm->tree[0], j = NBYTS - 1; j > 0; t = nextt, j--) for (t = &cm->tree[0], j = NBYTS-1; j > 0; t = nextt, j--) {
{
nextt = t + 1; nextt = t + 1;
for (i = BYTTAB-1; i >= 0; i--) for (i = BYTTAB-1; i >= 0; i--)
t->tptr[i] = nextt; t->tptr[i] = nextt;
@@ -84,10 +84,12 @@ initcm(struct vars * v,
} }
/* /*
* freecm - free dynamically-allocated things in a colormap - freecm - free dynamically-allocated things in a colormap
^ static VOID freecm(struct colormap *);
*/ */
static void static VOID
freecm(struct colormap * cm) freecm(cm)
struct colormap *cm;
{ {
size_t i; size_t i;
union tree *cb; union tree *cb;
@@ -96,8 +98,7 @@ freecm(struct colormap * cm)
if (NBYTS > 1) if (NBYTS > 1)
cmtreefree(cm, cm->tree, 0); cmtreefree(cm, cm->tree, 0);
for (i = 1; i <= cm->max; i++) /* skip WHITE */ for (i = 1; i <= cm->max; i++) /* skip WHITE */
if (!UNUSEDCOLOR(&cm->cd[i])) if (!UNUSEDCOLOR(&cm->cd[i])) {
{
cb = cm->cd[i].block; cb = cm->cd[i].block;
if (cb != NULL) if (cb != NULL)
FREE(cb); FREE(cb);
@@ -107,12 +108,14 @@ freecm(struct colormap * cm)
} }
/* /*
* cmtreefree - free a non-terminal part of a colormap tree - cmtreefree - free a non-terminal part of a colormap tree
^ static VOID cmtreefree(struct colormap *, union tree *, int);
*/ */
static void static VOID
cmtreefree(struct colormap * cm, cmtreefree(cm, tree, level)
union tree * tree, struct colormap *cm;
int level) /* level number (top == 0) of this block */ union tree *tree;
int level; /* level number (top == 0) of this block */
{ {
int i; int i;
union tree *t; union tree *t;
@@ -120,19 +123,14 @@ cmtreefree(struct colormap * cm,
union tree *cb; union tree *cb;
assert(level < NBYTS-1); /* this level has pointers */ assert(level < NBYTS-1); /* this level has pointers */
for (i = BYTTAB - 1; i >= 0; i--) for (i = BYTTAB-1; i >= 0; i--) {
{
t = tree->tptr[i]; t = tree->tptr[i];
assert(t != NULL); assert(t != NULL);
if (t != fillt) if (t != fillt) {
{ if (level < NBYTS-2) { /* more pointer blocks below */
if (level < NBYTS - 2)
{ /* more pointer blocks below */
cmtreefree(cm, t, level+1); cmtreefree(cm, t, level+1);
FREE(t); FREE(t);
} } else { /* color block below */
else
{ /* color block below */
cb = cm->cd[t->tcolor[0]].block; cb = cm->cd[t->tcolor[0]].block;
if (t != cb) /* not a solid block */ if (t != cb) /* not a solid block */
FREE(t); FREE(t);
@@ -142,12 +140,14 @@ cmtreefree(struct colormap * cm,
} }
/* /*
* setcolor - set the color of a character in a colormap - setcolor - set the color of a character in a colormap
^ static color setcolor(struct colormap *, pchr, pcolor);
*/ */
static color /* previous color */ static color /* previous color */
setcolor(struct colormap * cm, setcolor(cm, c, co)
chr c, struct colormap *cm;
pcolor co) pchr c;
pcolor co;
{ {
uchr uc = c; uchr uc = c;
int shift; int shift;
@@ -167,8 +167,7 @@ setcolor(struct colormap * cm,
t = cm->tree; t = cm->tree;
for (level = 0, shift = BYTBITS * (NBYTS - 1); shift > 0; for (level = 0, shift = BYTBITS * (NBYTS - 1); shift > 0;
level++, shift -= BYTBITS) level++, shift -= BYTBITS) {
{
b = (uc >> shift) & BYTMASK; b = (uc >> shift) & BYTMASK;
lastt = t; lastt = t;
t = lastt->tptr[b]; t = lastt->tptr[b];
@@ -176,12 +175,10 @@ setcolor(struct colormap * cm,
fillt = &cm->tree[level+1]; fillt = &cm->tree[level+1];
bottom = (shift <= BYTBITS) ? 1 : 0; bottom = (shift <= BYTBITS) ? 1 : 0;
cb = (bottom) ? cm->cd[t->tcolor[0]].block : fillt; cb = (bottom) ? cm->cd[t->tcolor[0]].block : fillt;
if (t == fillt || t == cb) if (t == fillt || t == cb) { /* must allocate a new block */
{ /* must allocate a new block */
newt = (union tree *)MALLOC((bottom) ? newt = (union tree *)MALLOC((bottom) ?
sizeof(struct colors) : sizeof(struct ptrs)); sizeof(struct colors) : sizeof(struct ptrs));
if (newt == NULL) if (newt == NULL) {
{
CERR(REG_ESPACE); CERR(REG_ESPACE);
return COLORLESS; return COLORLESS;
} }
@@ -203,10 +200,12 @@ setcolor(struct colormap * cm,
} }
/* /*
* maxcolor - report largest color number in use - maxcolor - report largest color number in use
^ static color maxcolor(struct colormap *);
*/ */
static color static color
maxcolor(struct colormap * cm) maxcolor(cm)
struct colormap *cm;
{ {
if (CISERR()) if (CISERR())
return COLORLESS; return COLORLESS;
@@ -215,11 +214,13 @@ maxcolor(struct colormap * cm)
} }
/* /*
* newcolor - find a new color (must be subject of setcolor at once) - newcolor - find a new color (must be subject of setcolor at once)
* Beware: may relocate the colordescs. * Beware: may relocate the colordescs.
^ static color newcolor(struct colormap *);
*/ */
static color /* COLORLESS for error */ static color /* COLORLESS for error */
newcolor(struct colormap * cm) newcolor(cm)
struct colormap *cm;
{ {
struct colordesc *cd; struct colordesc *cd;
struct colordesc *new; struct colordesc *new;
@@ -228,37 +229,29 @@ newcolor(struct colormap * cm)
if (CISERR()) if (CISERR())
return COLORLESS; return COLORLESS;
if (cm->free != 0) if (cm->free != 0) {
{
assert(cm->free > 0); assert(cm->free > 0);
assert((size_t)cm->free < cm->ncds); assert((size_t)cm->free < cm->ncds);
cd = &cm->cd[cm->free]; cd = &cm->cd[cm->free];
assert(UNUSEDCOLOR(cd)); assert(UNUSEDCOLOR(cd));
assert(cd->arcs == NULL); assert(cd->arcs == NULL);
cm->free = cd->sub; cm->free = cd->sub;
} } else if (cm->max < cm->ncds - 1) {
else if (cm->max < cm->ncds - 1)
{
cm->max++; cm->max++;
cd = &cm->cd[cm->max]; cd = &cm->cd[cm->max];
} } else {
else
{
/* oops, must allocate more */ /* oops, must allocate more */
n = cm->ncds * 2; n = cm->ncds * 2;
if (cm->cd == cm->cdspace) if (cm->cd == cm->cdspace) {
{
new = (struct colordesc *)MALLOC(n * new = (struct colordesc *)MALLOC(n *
sizeof(struct colordesc)); sizeof(struct colordesc));
if (new != NULL) if (new != NULL)
memcpy(VS(new), VS(cm->cdspace), cm->ncds * memcpy(VS(new), VS(cm->cdspace), cm->ncds *
sizeof(struct colordesc)); sizeof(struct colordesc));
} } else
else
new = (struct colordesc *)REALLOC(cm->cd, new = (struct colordesc *)REALLOC(cm->cd,
n * sizeof(struct colordesc)); n * sizeof(struct colordesc));
if (new == NULL) if (new == NULL) {
{
CERR(REG_ESPACE); CERR(REG_ESPACE);
return COLORLESS; return COLORLESS;
} }
@@ -279,15 +272,16 @@ newcolor(struct colormap * cm)
} }
/* /*
* freecolor - free a color (must have no arcs or subcolor) - freecolor - free a color (must have no arcs or subcolor)
^ static VOID freecolor(struct colormap *, pcolor);
*/ */
static void static VOID
freecolor(struct colormap * cm, freecolor(cm, co)
pcolor co) struct colormap *cm;
pcolor co;
{ {
struct colordesc *cd = &cm->cd[co]; struct colordesc *cd = &cm->cd[co];
color pco, color pco, nco; /* for freelist scan */
nco; /* for freelist scan */
assert(co >= 0); assert(co >= 0);
if (co == WHITE) if (co == WHITE)
@@ -297,51 +291,45 @@ freecolor(struct colormap * cm,
assert(cd->sub == NOSUB); assert(cd->sub == NOSUB);
assert(cd->nchrs == 0); assert(cd->nchrs == 0);
cd->flags = FREECOL; cd->flags = FREECOL;
if (cd->block != NULL) if (cd->block != NULL) {
{
FREE(cd->block); FREE(cd->block);
cd->block = NULL; /* just paranoia */ cd->block = NULL; /* just paranoia */
} }
if ((size_t) co == cm->max) if ((size_t)co == cm->max) {
{
while (cm->max > WHITE && UNUSEDCOLOR(&cm->cd[cm->max])) while (cm->max > WHITE && UNUSEDCOLOR(&cm->cd[cm->max]))
cm->max--; cm->max--;
assert(cm->free >= 0); assert(cm->free >= 0);
while ((size_t)cm->free > cm->max) while ((size_t)cm->free > cm->max)
cm->free = cm->cd[cm->free].sub; cm->free = cm->cd[cm->free].sub;
if (cm->free > 0) if (cm->free > 0) {
{
assert(cm->free < cm->max); assert(cm->free < cm->max);
pco = cm->free; pco = cm->free;
nco = cm->cd[pco].sub; nco = cm->cd[pco].sub;
while (nco > 0) while (nco > 0)
if ((size_t) nco > cm->max) if ((size_t)nco > cm->max) {
{
/* take this one out of freelist */ /* take this one out of freelist */
nco = cm->cd[nco].sub; nco = cm->cd[nco].sub;
cm->cd[pco].sub = nco; cm->cd[pco].sub = nco;
} } else {
else
{
assert(nco < cm->max); assert(nco < cm->max);
pco = nco; pco = nco;
nco = cm->cd[pco].sub; nco = cm->cd[pco].sub;
} }
} }
} } else {
else
{
cd->sub = cm->free; cd->sub = cm->free;
cm->free = (color)(cd - cm->cd); cm->free = (color)(cd - cm->cd);
} }
} }
/* /*
* pseudocolor - allocate a false color, to be managed by other means - pseudocolor - allocate a false color, to be managed by other means
^ static color pseudocolor(struct colormap *);
*/ */
static color static color
pseudocolor(struct colormap * cm) pseudocolor(cm)
struct colormap *cm;
{ {
color co; color co;
@@ -354,10 +342,13 @@ pseudocolor(struct colormap * cm)
} }
/* /*
* subcolor - allocate a new subcolor (if necessary) to this chr - subcolor - allocate a new subcolor (if necessary) to this chr
^ static color subcolor(struct colormap *, pchr c);
*/ */
static color static color
subcolor(struct colormap * cm, chr c) subcolor(cm, c)
struct colormap *cm;
pchr c;
{ {
color co; /* current color of c */ color co; /* current color of c */
color sco; /* new subcolor */ color sco; /* new subcolor */
@@ -377,22 +368,22 @@ subcolor(struct colormap * cm, chr c)
} }
/* /*
* newsub - allocate a new subcolor (if necessary) for a color - newsub - allocate a new subcolor (if necessary) for a color
^ static color newsub(struct colormap *, pcolor);
*/ */
static color static color
newsub(struct colormap * cm, newsub(cm, co)
pcolor co) struct colormap *cm;
pcolor co;
{ {
color sco; /* new subcolor */ color sco; /* new subcolor */
sco = cm->cd[co].sub; sco = cm->cd[co].sub;
if (sco == NOSUB) if (sco == NOSUB) { /* color has no open subcolor */
{ /* color has no open subcolor */
if (cm->cd[co].nchrs == 1) /* optimization */ if (cm->cd[co].nchrs == 1) /* optimization */
return co; return co;
sco = newcolor(cm); /* must create subcolor */ sco = newcolor(cm); /* must create subcolor */
if (sco == COLORLESS) if (sco == COLORLESS) {
{
assert(CISERR()); assert(CISERR());
return COLORLESS; return COLORLESS;
} }
@@ -405,14 +396,17 @@ newsub(struct colormap * cm,
} }
/* /*
* subrange - allocate new subcolors to this range of chrs, fill in arcs - subrange - allocate new subcolors to this range of chrs, fill in arcs
^ static VOID subrange(struct vars *, pchr, pchr, struct state *,
^ struct state *);
*/ */
static void static VOID
subrange(struct vars * v, subrange(v, from, to, lp, rp)
chr from, struct vars *v;
chr to, pchr from;
struct state * lp, pchr to;
struct state * rp) struct state *lp;
struct state *rp;
{ {
uchr uf; uchr uf;
int i; int i;
@@ -437,13 +431,15 @@ subrange(struct vars * v,
} }
/* /*
* subblock - allocate new subcolors for one tree block of chrs, fill in arcs - subblock - allocate new subcolors for one tree block of chrs, fill in arcs
^ static VOID subblock(struct vars *, pchr, struct state *, struct state *);
*/ */
static void static VOID
subblock(struct vars * v, subblock(v, start, lp, rp)
chr start, /* first of BYTTAB chrs */ struct vars *v;
struct state * lp, pchr start; /* first of BYTTAB chrs */
struct state * rp) struct state *lp;
struct state *rp;
{ {
uchr uc = start; uchr uc = start;
struct colormap *cm = v->cm; struct colormap *cm = v->cm;
@@ -466,18 +462,15 @@ subblock(struct vars * v,
t = cm->tree; t = cm->tree;
fillt = NULL; fillt = NULL;
for (level = 0, shift = BYTBITS * (NBYTS - 1); shift > 0; for (level = 0, shift = BYTBITS * (NBYTS - 1); shift > 0;
level++, shift -= BYTBITS) level++, shift -= BYTBITS) {
{
b = (uc >> shift) & BYTMASK; b = (uc >> shift) & BYTMASK;
lastt = t; lastt = t;
t = lastt->tptr[b]; t = lastt->tptr[b];
assert(t != NULL); assert(t != NULL);
fillt = &cm->tree[level+1]; fillt = &cm->tree[level+1];
if (t == fillt && shift > BYTBITS) if (t == fillt && shift > BYTBITS) { /* need new ptr block */
{ /* need new ptr block */
t = (union tree *)MALLOC(sizeof(struct ptrs)); t = (union tree *)MALLOC(sizeof(struct ptrs));
if (t == NULL) if (t == NULL) {
{
CERR(REG_ESPACE); CERR(REG_ESPACE);
return; return;
} }
@@ -490,16 +483,13 @@ subblock(struct vars * v,
/* special cases: fill block or solid block */ /* special cases: fill block or solid block */
co = t->tcolor[0]; co = t->tcolor[0];
cb = cm->cd[co].block; cb = cm->cd[co].block;
if (t == fillt || t == cb) if (t == fillt || t == cb) {
{
/* either way, we want a subcolor solid block */ /* either way, we want a subcolor solid block */
sco = newsub(cm, co); sco = newsub(cm, co);
t = cm->cd[sco].block; t = cm->cd[sco].block;
if (t == NULL) if (t == NULL) { /* must set it up */
{ /* must set it up */
t = (union tree *)MALLOC(sizeof(struct colors)); t = (union tree *)MALLOC(sizeof(struct colors));
if (t == NULL) if (t == NULL) {
{
CERR(REG_ESPACE); CERR(REG_ESPACE);
return; return;
} }
@@ -517,14 +507,12 @@ subblock(struct vars * v,
/* general case, a mixed block to be altered */ /* general case, a mixed block to be altered */
i = 0; i = 0;
while (i < BYTTAB) while (i < BYTTAB) {
{
co = t->tcolor[i]; co = t->tcolor[i];
sco = newsub(cm, co); sco = newsub(cm, co);
newarc(v->nfa, PLAIN, sco, lp, rp); newarc(v->nfa, PLAIN, sco, lp, rp);
previ = i; previ = i;
do do {
{
t->tcolor[i++] = sco; t->tcolor[i++] = sco;
} while (i < BYTTAB && t->tcolor[i] == co); } while (i < BYTTAB && t->tcolor[i] == co);
ndone = i - previ; ndone = i - previ;
@@ -534,11 +522,13 @@ subblock(struct vars * v,
} }
/* /*
* okcolors - promote subcolors to full colors - okcolors - promote subcolors to full colors
^ static VOID okcolors(struct nfa *, struct colormap *);
*/ */
static void static VOID
okcolors(struct nfa * nfa, okcolors(nfa, cm)
struct colormap * cm) struct nfa *nfa;
struct colormap *cm;
{ {
struct colordesc *cd; struct colordesc *cd;
struct colordesc *end = CDEND(cm); struct colordesc *end = CDEND(cm);
@@ -547,27 +537,20 @@ okcolors(struct nfa * nfa,
color co; color co;
color sco; color sco;
for (cd = cm->cd, co = 0; cd < end; cd++, co++) for (cd = cm->cd, co = 0; cd < end; cd++, co++) {
{
sco = cd->sub; sco = cd->sub;
if (UNUSEDCOLOR(cd) || sco == NOSUB) if (UNUSEDCOLOR(cd) || sco == NOSUB) {
{
/* has no subcolor, no further action */ /* has no subcolor, no further action */
} } else if (sco == co) {
else if (sco == co)
{
/* is subcolor, let parent deal with it */ /* is subcolor, let parent deal with it */
} } else if (cd->nchrs == 0) {
else if (cd->nchrs == 0)
{
/* parent empty, its arcs change color to subcolor */ /* parent empty, its arcs change color to subcolor */
cd->sub = NOSUB; cd->sub = NOSUB;
scd = &cm->cd[sco]; scd = &cm->cd[sco];
assert(scd->nchrs > 0); assert(scd->nchrs > 0);
assert(scd->sub == sco); assert(scd->sub == sco);
scd->sub = NOSUB; scd->sub = NOSUB;
while ((a = cd->arcs) != NULL) while ((a = cd->arcs) != NULL) {
{
assert(a->co == co); assert(a->co == co);
/* uncolorchain(cm, a); */ /* uncolorchain(cm, a); */
cd->arcs = a->colorchain; cd->arcs = a->colorchain;
@@ -577,17 +560,14 @@ okcolors(struct nfa * nfa,
scd->arcs = a; scd->arcs = a;
} }
freecolor(cm, co); freecolor(cm, co);
} } else {
else
{
/* parent's arcs must gain parallel subcolor arcs */ /* parent's arcs must gain parallel subcolor arcs */
cd->sub = NOSUB; cd->sub = NOSUB;
scd = &cm->cd[sco]; scd = &cm->cd[sco];
assert(scd->nchrs > 0); assert(scd->nchrs > 0);
assert(scd->sub == sco); assert(scd->sub == sco);
scd->sub = NOSUB; scd->sub = NOSUB;
for (a = cd->arcs; a != NULL; a = a->colorchain) for (a = cd->arcs; a != NULL; a = a->colorchain) {
{
assert(a->co == co); assert(a->co == co);
newarc(nfa, a->type, sco, a->from, a->to); newarc(nfa, a->type, sco, a->from, a->to);
} }
@@ -596,11 +576,13 @@ okcolors(struct nfa * nfa,
} }
/* /*
* colorchain - add this arc to the color chain of its color - colorchain - add this arc to the color chain of its color
^ static VOID colorchain(struct colormap *, struct arc *);
*/ */
static void static VOID
colorchain(struct colormap * cm, colorchain(cm, a)
struct arc * a) struct colormap *cm;
struct arc *a;
{ {
struct colordesc *cd = &cm->cd[a->co]; struct colordesc *cd = &cm->cd[a->co];
@@ -609,11 +591,13 @@ colorchain(struct colormap * cm,
} }
/* /*
* uncolorchain - delete this arc from the color chain of its color - uncolorchain - delete this arc from the color chain of its color
^ static VOID uncolorchain(struct colormap *, struct arc *);
*/ */
static void static VOID
uncolorchain(struct colormap * cm, uncolorchain(cm, a)
struct arc * a) struct colormap *cm;
struct arc *a;
{ {
struct colordesc *cd = &cm->cd[a->co]; struct colordesc *cd = &cm->cd[a->co];
struct arc *aa; struct arc *aa;
@@ -621,8 +605,7 @@ uncolorchain(struct colormap * cm,
aa = cd->arcs; aa = cd->arcs;
if (aa == a) /* easy case */ if (aa == a) /* easy case */
cd->arcs = a->colorchain; cd->arcs = a->colorchain;
else else {
{
for (; aa != NULL && aa->colorchain != a; aa = aa->colorchain) for (; aa != NULL && aa->colorchain != a; aa = aa->colorchain)
continue; continue;
assert(aa != NULL); assert(aa != NULL);
@@ -632,11 +615,13 @@ uncolorchain(struct colormap * cm,
} }
/* /*
* singleton - is this character in its own color? - singleton - is this character in its own color?
^ static int singleton(struct colormap *, pchr c);
*/ */
static int /* predicate */ static int /* predicate */
singleton(struct colormap * cm, singleton(cm, c)
chr c) struct colormap *cm;
pchr c;
{ {
color co; /* color of c */ color co; /* color of c */
@@ -647,15 +632,18 @@ singleton(struct colormap * cm,
} }
/* /*
* rainbow - add arcs of all full colors (but one) between specified states - rainbow - add arcs of all full colors (but one) between specified states
^ static VOID rainbow(struct nfa *, struct colormap *, int, pcolor,
^ struct state *, struct state *);
*/ */
static void static VOID
rainbow(struct nfa * nfa, rainbow(nfa, cm, type, but, from, to)
struct colormap * cm, struct nfa *nfa;
int type, struct colormap *cm;
pcolor but, /* COLORLESS if no exceptions */ int type;
struct state * from, pcolor but; /* COLORLESS if no exceptions */
struct state * to) struct state *from;
struct state *to;
{ {
struct colordesc *cd; struct colordesc *cd;
struct colordesc *end = CDEND(cm); struct colordesc *end = CDEND(cm);
@@ -668,18 +656,19 @@ rainbow(struct nfa * nfa,
} }
/* /*
* colorcomplement - add arcs of complementary colors - colorcomplement - add arcs of complementary colors
*
* The calling sequence ought to be reconciled with cloneouts(). * The calling sequence ought to be reconciled with cloneouts().
^ static VOID colorcomplement(struct nfa *, struct colormap *, int,
^ struct state *, struct state *, struct state *);
*/ */
static void static VOID
colorcomplement(struct nfa * nfa, colorcomplement(nfa, cm, type, of, from, to)
struct colormap * cm, struct nfa *nfa;
int type, struct colormap *cm;
struct state * of, /* complements of this guy's PLAIN int type;
* outarcs */ struct state *of; /* complements of this guy's PLAIN outarcs */
struct state * from, struct state *from;
struct state * to) struct state *to;
{ {
struct colordesc *cd; struct colordesc *cd;
struct colordesc *end = CDEND(cm); struct colordesc *end = CDEND(cm);
@@ -693,14 +682,20 @@ colorcomplement(struct nfa * nfa,
} }
#ifdef REG_DEBUG #ifdef REG_DEBUG
/*
^ #ifdef REG_DEBUG
*/
/* /*
* dumpcolors - debugging output - dumpcolors - debugging output
^ static VOID dumpcolors(struct colormap *, FILE *);
*/ */
static void static VOID
dumpcolors(struct colormap * cm, dumpcolors(cm, f)
FILE *f) struct colormap *cm;
FILE *f;
{ {
struct colordesc *cd; struct colordesc *cd;
struct colordesc *end; struct colordesc *end;
@@ -713,8 +708,7 @@ dumpcolors(struct colormap * cm,
fillcheck(cm, cm->tree, 0, f); fillcheck(cm, cm->tree, 0, f);
end = CDEND(cm); end = CDEND(cm);
for (cd = cm->cd + 1, co = 1; cd < end; cd++, co++) /* skip 0 */ for (cd = cm->cd + 1, co = 1; cd < end; cd++, co++) /* skip 0 */
if (!UNUSEDCOLOR(cd)) if (!UNUSEDCOLOR(cd)) {
{
assert(cd->nchrs > 0); assert(cd->nchrs > 0);
has = (cd->block != NULL) ? "#" : ""; has = (cd->block != NULL) ? "#" : "";
if (cd->flags&PSEUDO) if (cd->flags&PSEUDO)
@@ -734,40 +728,41 @@ dumpcolors(struct colormap * cm,
} }
/* /*
* fillcheck - check proper filling of a tree - fillcheck - check proper filling of a tree
^ static VOID fillcheck(struct colormap *, union tree *, int, FILE *);
*/ */
static void static VOID
fillcheck(struct colormap * cm, fillcheck(cm, tree, level, f)
union tree * tree, struct colormap *cm;
int level, /* level number (top == 0) of this block */ union tree *tree;
FILE *f) int level; /* level number (top == 0) of this block */
FILE *f;
{ {
int i; int i;
union tree *t; union tree *t;
union tree *fillt = &cm->tree[level+1]; union tree *fillt = &cm->tree[level+1];
assert(level < NBYTS-1); /* this level has pointers */ assert(level < NBYTS-1); /* this level has pointers */
for (i = BYTTAB - 1; i >= 0; i--) for (i = BYTTAB-1; i >= 0; i--) {
{
t = tree->tptr[i]; t = tree->tptr[i];
if (t == NULL) if (t == NULL)
fprintf(f, "NULL found in filled tree!\n"); fprintf(f, "NULL found in filled tree!\n");
else if (t == fillt) else if (t == fillt)
{ {}
}
else if (level < NBYTS-2) /* more pointer blocks below */ else if (level < NBYTS-2) /* more pointer blocks below */
fillcheck(cm, t, level+1, f); fillcheck(cm, t, level+1, f);
} }
} }
/* /*
* dumpchr - print a chr - dumpchr - print a chr
*
* Kind of char-centric but works well enough for debug use. * Kind of char-centric but works well enough for debug use.
^ static VOID dumpchr(pchr, FILE *);
*/ */
static void static VOID
dumpchr(chr c, dumpchr(c, f)
FILE *f) pchr c;
FILE *f;
{ {
if (c == '\\') if (c == '\\')
fprintf(f, "\\\\"); fprintf(f, "\\\\");
@@ -777,4 +772,7 @@ dumpchr(chr c,
fprintf(f, "\\u%04lx", (long)c); fprintf(f, "\\u%04lx", (long)c);
} }
#endif /* REG_DEBUG */ /*
^ #endif
*/
#endif /* ifdef REG_DEBUG */