diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/regc_cvec.c | 2 | ||||
| -rw-r--r-- | generic/regc_locale.c | 29 | ||||
| -rw-r--r-- | generic/regcomp.c | 11 |
3 files changed, 5 insertions, 37 deletions
diff --git a/generic/regc_cvec.c b/generic/regc_cvec.c index 9e79df2..c79e741 100644 --- a/generic/regc_cvec.c +++ b/generic/regc_cvec.c @@ -83,6 +83,7 @@ pchr to; cv->nranges++; } +#ifdef USE_MCCE /* - addmcce - add an MCCE to a cvec ^ static VOID addmcce(struct cvec *, chr *, chr *); @@ -109,6 +110,7 @@ chr *endp; /* just past end of text */ assert(d == &cv->chrs[cv->chrspace - cv->nmccechrs]); cv->nmccechrs += n + 1; } +#endif /* - haschr - does a cvec contain this chr? diff --git a/generic/regc_locale.c b/generic/regc_locale.c index 192b266..cd22a61 100644 --- a/generic/regc_locale.c +++ b/generic/regc_locale.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: regc_locale.c,v 1.1.2.4 1998/11/11 04:54:06 stanton Exp $ + * RCS: @(#) $Id: regc_locale.c,v 1.1.2.5 1998/12/10 00:49:44 stanton Exp $ */ /* ASCII character-name table */ @@ -351,33 +351,6 @@ static crange graphTable[] = { }; #define NUM_GRAPH (sizeof(graphTable)/sizeof(crange)) - - -/* ASCII character-class table */ -static struct cclass { - char *name; - char *chars; - int hasch; -} cclasses[] = { - {"blank", " \t", 0}, - {"cntrl", "\007\b\t\n\v\f\r\1\2\3\4\5\6\16\17\20\21\22\23\24\ -\25\26\27\30\31\32\33\34\35\36\37\177", 0}, - {"graph", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ -0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", - 1}, - {"lower", "abcdefghijklmnopqrstuvwxyz", - 1}, - {"print", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ -0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ", - 1}, - {"space", "\t\n\v\f\r ", 0}, - {"upper", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", - 0}, - {"xdigit", "0123456789ABCDEFabcdef", - 0}, - {NULL, 0, 0} -}; - #define CH NOCELT /* diff --git a/generic/regcomp.c b/generic/regcomp.c index 02a65c7..600e874 100644 --- a/generic/regcomp.c +++ b/generic/regcomp.c @@ -57,7 +57,6 @@ static chr lexdigits _ANSI_ARGS_((struct vars *, int, int, int)); static int brenext _ANSI_ARGS_((struct vars *, pchr)); static VOID skip _ANSI_ARGS_((struct vars *)); static chr newline _ANSI_ARGS_((NOPARMS)); -static chr *ch _ANSI_ARGS_((NOPARMS)); static chr chrnamed _ANSI_ARGS_((struct vars *, chr *, chr *, pchr)); /* === regc_color.c === */ static VOID initcm _ANSI_ARGS_((struct vars *, struct colormap *)); @@ -78,9 +77,6 @@ static VOID uncolorchain _ANSI_ARGS_((struct colormap *, struct arc *)); static int singleton _ANSI_ARGS_((struct colormap *, pchr c)); static VOID rainbow _ANSI_ARGS_((struct nfa *, struct colormap *, int, pcolor, struct state *, struct state *)); static VOID colorcomplement _ANSI_ARGS_((struct nfa *, struct colormap *, int, struct state *, struct state *, struct state *)); -static VOID dumpcolors _ANSI_ARGS_((struct colormap *, FILE *)); -static VOID fillcheck _ANSI_ARGS_((struct colormap *, union tree *, int, FILE *)); -static VOID dumpchr _ANSI_ARGS_((pchr, FILE *)); /* === regc_nfa.c === */ static struct nfa *newnfa _ANSI_ARGS_((struct vars *, struct colormap *, struct nfa *)); static VOID freenfa _ANSI_ARGS_((struct nfa *)); @@ -124,18 +120,15 @@ static VOID compact _ANSI_ARGS_((struct nfa *, struct cnfa *)); static VOID carcsort _ANSI_ARGS_((struct carc *, struct carc *)); static VOID freecnfa _ANSI_ARGS_((struct cnfa *)); static VOID dumpnfa _ANSI_ARGS_((struct nfa *, FILE *)); -static VOID dumpstate _ANSI_ARGS_((struct state *, FILE *)); -static VOID dumparcs _ANSI_ARGS_((struct state *, FILE *)); -static int dumprarcs _ANSI_ARGS_((struct arc *, struct state *, FILE *, int)); -static VOID dumparc _ANSI_ARGS_((struct arc *, struct state *, FILE *)); static VOID dumpcnfa _ANSI_ARGS_((struct cnfa *, FILE *)); -static VOID dumpcstate _ANSI_ARGS_((int, struct carc *, struct cnfa *, FILE *)); /* === regc_cvec.c === */ static struct cvec *newcvec _ANSI_ARGS_((int, int, int)); static struct cvec *clearcvec _ANSI_ARGS_((struct cvec *)); static VOID addchr _ANSI_ARGS_((struct cvec *, pchr)); static VOID addrange _ANSI_ARGS_((struct cvec *, pchr, pchr)); +#ifdef USE_MCCE static VOID addmcce _ANSI_ARGS_((struct cvec *, chr *, chr *)); +#endif static int haschr _ANSI_ARGS_((struct cvec *, pchr)); static struct cvec *getcvec _ANSI_ARGS_((struct vars *, int, int, int)); static VOID freecvec _ANSI_ARGS_((struct cvec *)); |