diff options
| author | stanton <stanton> | 1999-06-10 04:28:49 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-06-10 04:28:49 (GMT) |
| commit | 81e8aa10e3e8c90c32e241356ce9bc68b5e4b3dc (patch) | |
| tree | d6b1bb3e195e2ca1b7f57a6a2987c276d5013ffa /generic/tclRegexp.h | |
| parent | d94b3c0f6b26564b83b3767980271dd332314d06 (diff) | |
| download | tcl-81e8aa10e3e8c90c32e241356ce9bc68b5e4b3dc.zip tcl-81e8aa10e3e8c90c32e241356ce9bc68b5e4b3dc.tar.gz tcl-81e8aa10e3e8c90c32e241356ce9bc68b5e4b3dc.tar.bz2 | |
* generic/tclUnicodeObj.c: Lots of cleanup and simplification.
Fixed several memory bugs. Added TclAppendUnicodeToObj.
* generic/tclInt.h: Added declarations for various Unicode string
functions.
* generic/tclRegexp.c:
* generic/tclCmdMZ.c: Changed to use new Unicode string interfaces
for better performance.
* generic/tclRegexp.h:
* generic/tclRegexp.c:
* generic/tcl.h:
* generic/tcl.decls: Added Tcl_RegExpMatchObj and
Tcl_RegExpGetInfo calls to access lower level regexp API. These
features are needed by Expect. This is a preliminary
implementation pending final review and cleanup.
* generic/tclCmdMZ.c:
* tests/string.test: Fixed bug where string map failed on null
strings.
Diffstat (limited to 'generic/tclRegexp.h')
| -rw-r--r-- | generic/tclRegexp.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/generic/tclRegexp.h b/generic/tclRegexp.h index 7a6fb2a..5cee78e 100644 --- a/generic/tclRegexp.h +++ b/generic/tclRegexp.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclRegexp.h,v 1.8 1999/06/02 01:53:31 stanton Exp $ + * RCS: @(#) $Id: tclRegexp.h,v 1.9 1999/06/10 04:28:51 stanton Exp $ */ #ifndef _TCLREGEXP @@ -33,10 +33,10 @@ typedef struct TclRegexp { int flags; /* Regexp compile flags. */ regex_t re; /* Compiled re, includes number of * subexpressions. */ - CONST char *string; /* Last string matched with this regexp - * (UTF-8), so Tcl_RegExpRange() can convert - * the matches from character indices to UTF-8 - * byte offsets. */ + Tcl_Obj *objPtr; /* Last object match with this regexp, so + * Tcl_RegExpRange() can convert the matches + * from character indices to UTF-8 byte + * offsets. */ regmatch_t *matches; /* Array of indices into the Tcl_UniChar * representation of the last string matched * with this regexp to indicate the location @@ -53,8 +53,6 @@ typedef struct TclRegexp { EXTERN int TclRegAbout _ANSI_ARGS_((Tcl_Interp *interp, Tcl_RegExp re)); -EXTERN VOID TclRegXflags _ANSI_ARGS_((char *string, int length, - int *cflagsPtr, int *eflagsPtr)); EXTERN int TclRegExpExecUniChar _ANSI_ARGS_((Tcl_Interp *interp, Tcl_RegExp re, CONST Tcl_UniChar *uniString, int numChars, int nmatches, int flags)); |