diff options
Diffstat (limited to 'generic/tclRegexp.h')
| -rw-r--r-- | generic/tclRegexp.h | 39 | 
1 files changed, 20 insertions, 19 deletions
| diff --git a/generic/tclRegexp.h b/generic/tclRegexp.h index ef93d1e..3b2433e 100644 --- a/generic/tclRegexp.h +++ b/generic/tclRegexp.h @@ -1,16 +1,14 @@ -/*  +/*   * tclRegexp.h --   * - * 	This file contains definitions used internally by Henry - *	Spencer's regular expression code. + *	This file contains definitions used internally by Henry Spencer's + *	regular expression code.   *   * Copyright (c) 1998 by Sun Microsystems, Inc.   * Copyright (c) 1998-1999 by Scriptics Corporation.   * - * 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.11 1999/08/02 17:45:38 redman Exp $ + * See the file "license.terms" for information on usage and redistribution of + * this file, and for a DISCLAIMER OF ALL WARRANTIES.   */  #ifndef _TCLREGEXP @@ -18,26 +16,21 @@  #include "regex.h" -#ifdef BUILD_tcl -# undef TCL_STORAGE_CLASS -# define TCL_STORAGE_CLASS DLLEXPORT -#endif -  /* - * The TclRegexp structure encapsulates a compiled regex_t, - * the flags that were used to compile it, and an array of pointers - * that are used to indicate subexpressions after a call to Tcl_RegExpExec. - * Note that the string and objPtr are mutually exclusive.  These values - * are needed by Tcl_RegExpRange in order to return pointers into the - * original string. + * The TclRegexp structure encapsulates a compiled regex_t, the flags that + * were used to compile it, and an array of pointers that are used to indicate + * subexpressions after a call to Tcl_RegExpExec. Note that the string and + * objPtr are mutually exclusive. These values are needed by Tcl_RegExpRange + * in order to return pointers into the original string.   */  typedef struct TclRegexp {      int flags;			/* Regexp compile flags. */      regex_t re;			/* Compiled re, includes number of  				 * subexpressions. */ -    CONST char *string;		/* Last string passed to Tcl_RegExpExec. */ +    const char *string;		/* Last string passed to Tcl_RegExpExec. */      Tcl_Obj *objPtr;		/* Last object passed to Tcl_RegExpExecObj. */ +    Tcl_Obj *globObjPtr;	/* Glob pattern rep of RE or NULL if none. */      regmatch_t *matches;	/* Array of indices into the Tcl_UniChar  				 * representation of the last string matched  				 * with this regexp to indicate the location @@ -49,3 +42,11 @@ typedef struct TclRegexp {  } TclRegexp;  #endif /* _TCLREGEXP */ + +/* + * Local Variables: + * mode: c + * c-basic-offset: 4 + * fill-column: 78 + * End: + */ | 
