diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-23 12:30:28 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-23 12:30:28 (GMT) |
commit | 6f14ff020a548ab6adcb30836c498ab0fe921970 (patch) | |
tree | 36a35c68a8d8f61e3b2e51e236b86513e4138025 /generic/regcomp.c | |
parent | bb146c387f42e478b1d8ffbc8617988fb572587c (diff) | |
download | tcl-6f14ff020a548ab6adcb30836c498ab0fe921970.zip tcl-6f14ff020a548ab6adcb30836c498ab0fe921970.tar.gz tcl-6f14ff020a548ab6adcb30836c498ab0fe921970.tar.bz2 |
make some more internal tables const
On cygwin, install dll's in /usr/bin, not in /usr/lib
Diffstat (limited to 'generic/regcomp.c')
-rw-r--r-- | generic/regcomp.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/generic/regcomp.c b/generic/regcomp.c index c239d8b..a1fe5bc 100644 --- a/generic/regcomp.c +++ b/generic/regcomp.c @@ -52,7 +52,7 @@ static VOID repeat _ANSI_ARGS_((struct vars *, struct state *, struct state *, i static VOID bracket _ANSI_ARGS_((struct vars *, struct state *, struct state *)); static VOID cbracket _ANSI_ARGS_((struct vars *, struct state *, struct state *)); static VOID brackpart _ANSI_ARGS_((struct vars *, struct state *, struct state *)); -static chr *scanplain _ANSI_ARGS_((struct vars *)); +static CONST chr *scanplain _ANSI_ARGS_((struct vars *)); static VOID onechr _ANSI_ARGS_((struct vars *, pchr, struct state *, struct state *)); static VOID dovec _ANSI_ARGS_((struct vars *, struct cvec *, struct state *, struct state *)); static celt nextleader _ANSI_ARGS_((struct vars *, pchr, pchr)); @@ -76,7 +76,7 @@ static char *stid _ANSI_ARGS_((struct subre *, char *, size_t)); /* === regc_lex.c === */ static VOID lexstart _ANSI_ARGS_((struct vars *)); static VOID prefixes _ANSI_ARGS_((struct vars *)); -static VOID lexnest _ANSI_ARGS_((struct vars *, chr *, chr *)); +static VOID lexnest _ANSI_ARGS_((struct vars *, CONST chr *, CONST chr *)); static VOID lexword _ANSI_ARGS_((struct vars *)); static int next _ANSI_ARGS_((struct vars *)); static int lexescape _ANSI_ARGS_((struct vars *)); @@ -85,9 +85,9 @@ static int brenext _ANSI_ARGS_((struct vars *, pchr)); static VOID skip _ANSI_ARGS_((struct vars *)); static chr newline _ANSI_ARGS_((NOPARMS)); #ifdef REG_DEBUG -static chr *ch _ANSI_ARGS_((NOPARMS)); +static CONST chr *ch _ANSI_ARGS_((NOPARMS)); #endif -static chr chrnamed _ANSI_ARGS_((struct vars *, chr *, chr *, pchr)); +static chr chrnamed _ANSI_ARGS_((struct vars *, CONST chr *, CONST chr *, pchr)); /* === regc_color.c === */ static VOID initcm _ANSI_ARGS_((struct vars *, struct colormap *)); static VOID freecm _ANSI_ARGS_((struct colormap *)); @@ -190,10 +190,10 @@ static int casecmp _ANSI_ARGS_((CONST chr *, CONST chr *, size_t)); /* internal variables, bundled for easy passing around */ struct vars { regex_t *re; - chr *now; /* scan pointer into string */ - chr *stop; /* end of string */ - chr *savenow; /* saved now and stop for "subroutine call" */ - chr *savestop; + CONST chr *now; /* scan pointer into string */ + CONST chr *stop; /* end of string */ + CONST chr *savenow; /* saved now and stop for "subroutine call" */ + CONST chr *savestop; int err; /* error code (0 if none) */ int cflags; /* copy of compile flags */ int lasttype; /* type of previous token */ @@ -1357,8 +1357,8 @@ struct state *rp; celt startc; celt endc; struct cvec *cv; - chr *startp; - chr *endp; + CONST chr *startp; + CONST chr *endp; chr c[1]; /* parse something, get rid of special cases, take shortcuts */ @@ -1458,11 +1458,11 @@ struct state *rp; * to look past the final bracket of the [. etc. ^ static chr *scanplain(struct vars *); */ -static chr * /* just after end of sequence */ +static CONST chr * /* just after end of sequence */ scanplain(v) struct vars *v; { - chr *endp; + CONST chr *endp; assert(SEE(COLLEL) || SEE(ECLASS) || SEE(CCLASS)); NEXT(); |