summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlperl/lib/CORE/regexp.h
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/tlperl/lib/CORE/regexp.h')
-rw-r--r--Master/tlpkg/tlperl/lib/CORE/regexp.h30
1 files changed, 14 insertions, 16 deletions
diff --git a/Master/tlpkg/tlperl/lib/CORE/regexp.h b/Master/tlpkg/tlperl/lib/CORE/regexp.h
index ccbc64a009e..e12c6a9ffa6 100644
--- a/Master/tlpkg/tlperl/lib/CORE/regexp.h
+++ b/Master/tlpkg/tlperl/lib/CORE/regexp.h
@@ -118,28 +118,37 @@ typedef struct regexp {
*/
U32 extflags; /* Flags used both externally and internally */
+ U32 nparens; /* number of capture buffers */
SSize_t minlen; /* minimum possible number of chars in string to match */
SSize_t minlenret; /* mininum possible number of chars in $& */
STRLEN gofs; /* chars left of pos that we search from */
/* substring data about strings that must appear in
* the final match, used for optimisations */
struct reg_substr_data *substrs;
- U32 nparens; /* number of capture buffers */
/* private engine specific data */
- U32 intflags; /* Engine Specific Internal flags */
void *pprivate; /* Data private to the regex engine which
* created this object. */
+ U32 intflags; /* Engine Specific Internal flags */
/*----------------------------------------------------------------------
* Data about the last/current match. These are modified during matching
*/
U32 lastparen; /* highest close paren matched ($+) */
- U32 lastcloseparen; /* last close paren matched ($^N) */
regexp_paren_pair *offs; /* Array of offsets for (@-) and (@+) */
char **recurse_locinput; /* used to detect infinite recursion, XXX: move to internal */
+ U32 lastcloseparen; /* last close paren matched ($^N) */
+
+ /*---------------------------------------------------------------------- */
+
+ /* offset from wrapped to the start of precomp */
+ PERL_BITFIELD32 pre_prefix:4;
+
+ /* original flags used to compile the pattern, may differ from
+ * extflags in various ways */
+ PERL_BITFIELD32 compflags:9;
/*---------------------------------------------------------------------- */
@@ -148,21 +157,10 @@ typedef struct regexp {
SSize_t sublen; /* Length of string pointed by subbeg */
SSize_t suboffset; /* byte offset of subbeg from logical start of str */
SSize_t subcoffset; /* suboffset equiv, but in chars (for @-/@+) */
-
- /* Information about the match that isn't often used */
-
SSize_t maxlen; /* minimum possible number of chars in string to match */
/*---------------------------------------------------------------------- */
- /* offset from wrapped to the start of precomp */
- PERL_BITFIELD32 pre_prefix:4;
-
- /* original flags used to compile the pattern, may differ from
- * extflags in various ways */
- PERL_BITFIELD32 compflags:9;
-
- /*---------------------------------------------------------------------- */
CV *qr_anoncv; /* the anon sub wrapped round qr/(?{..})/ */
} regexp;
@@ -629,7 +627,7 @@ and check for NULL.
# define ReREFCNT_dec(re) SvREFCNT_dec(re)
# define ReREFCNT_inc(re) ((REGEXP *) SvREFCNT_inc(re))
#endif
-#define ReANY(re) S_ReANY((const REGEXP *)(re))
+#define ReANY(re) Perl_ReANY((const REGEXP *)(re))
/* FIXME for plugins. */
@@ -828,7 +826,7 @@ typedef struct regmatch_state {
} keeper;
/* quantifiers - these members are used for storing state for
- for the regops used to implement quantifiers */
+ the regops used to implement quantifiers */
struct {
/* this first element must match u.yes */
struct regmatch_state *prev_yes_state;