typedef I32 CHECKPOINT;
-/* Current curly descriptor */
-typedef struct curcur CURCUR;
-struct curcur {
- int parenfloor; /* how far back to strip paren data */
- int cur; /* how many instances of scan we've matched */
- int min; /* the minimal number of scans to match */
- int max; /* the maximal number of scans to match */
- int minmod; /* whether to work our way up or down */
- regnode * scan; /* the thing to match */
- regnode * next; /* what has to match after it */
- char * lastloc; /* where we started matching this scan */
- CURCUR * oldcc; /* current curly before we started this one */
-};
-
typedef struct re_cc_state
{
I32 ss;
regnode *node;
struct re_cc_state *prev;
- CURCUR *cc;
+ struct regmatch_state *cc; /* state corresponding to the current curly */
regexp *re;
} re_cc_state;
-
typedef enum {
resume_TRIE1,
resume_TRIE2,
} regmatch_resume_states;
-typedef struct {
+typedef struct regmatch_state {
/* these vars contain state that needs to be maintained
* across the main while loop ... */
bool sw; /* the condition value in (?(cond)a|b) */
int logical;
I32 unwind; /* savestack index of current unwind block */
- CURCUR *cc; /* current innermost curly struct */
+ struct regmatch_state *cc; /* current innermost curly state */
char *locinput;
- /* ... while the rest of these are local to an individual branch;
- * thus they can be safely reused in other branches. */
+ /* ... while the rest of these are local to an individual branch */
I32 n; /* no or next */
I32 ln; /* len or last */
- I32 c1, c2, paren; /* case fold search, parenth */
- CHECKPOINT cp; /* remember current savestack indexes */
- CHECKPOINT lastcp;
- CURCUR *oldcc; /* tmp copy of cc */
- char *lastloc; /* Detection of 0-len. */
- I32 cache_offset;
- I32 cache_bit;
- I32 curlym_l;
- I32 matches;
- I32 maxwanted;
- char *e;
- char *old;
- int count;
- re_cc_state *cur_call_cc;
- regexp *end_re;
- reg_trie_accepted *accept_buff;
- U32 accepted; /* how many accepting states we have seen */
+
+ union {
+ struct {
+ reg_trie_accepted *accept_buff;
+ U32 accepted; /* how many accepting states we have seen */
+ } trie;
+
+ struct {
+ CHECKPOINT cp; /* remember current savestack indexes */
+ CHECKPOINT lastcp;
+ } eval;
+
+ struct {
+ CHECKPOINT cp; /* remember current savestack indexes */
+ struct regmatch_state *outercc; /* outer CURLYX state if any */
+
+ /* these contain the current curly state, and are accessed
+ * by subsequent WHILEMs */
+ int parenfloor;/* how far back to strip paren data */
+ int cur; /* how many instances of scan we've matched */
+ int min; /* the minimal number of scans to match */
+ int max; /* the maximal number of scans to match */
+ regnode * scan; /* the thing to match */
+ char * lastloc;/* where we started matching this scan */
+ } curlyx;
+
+ struct {
+ CHECKPOINT cp; /* remember current savestack indexes */
+ CHECKPOINT lastcp;
+ struct regmatch_state *savecc;
+ char *lastloc; /* Detection of 0-len. */
+ I32 cache_offset;
+ I32 cache_bit;
+ } whilem;
+
+ struct {
+ I32 paren;
+ I32 c1, c2; /* case fold search */
+ CHECKPOINT lastcp;
+ I32 l;
+ I32 matches;
+ I32 maxwanted;
+ } curlym;
+
+ struct {
+ I32 paren;
+ CHECKPOINT lastcp;
+ I32 c1, c2; /* case fold search */
+ char *e;
+ char *old;
+ int count;
+ } plus; /* and CURLYN/CURLY/STAR */
+
+ struct {
+ CHECKPOINT cp; /* remember current savestack indexes */
+ CHECKPOINT lastcp;
+ struct regmatch_state *savecc;
+ re_cc_state *cur_call_cc;
+ regexp *end_re;
+ } end;
+ } u;
re_cc_state *reg_call_cc; /* saved value of PL_reg_call_cc */
} regmatch_state;
regmatch_state states[PERL_REGMATCH_SLAB_SLOTS];
struct regmatch_slab *prev, *next;
} regmatch_slab;
+
+#define PL_reg_flags PL_reg_state.re_state_reg_flags
+#define PL_bostr PL_reg_state.re_state_bostr
+#define PL_reginput PL_reg_state.re_state_reginput
+#define PL_regbol PL_reg_state.re_state_regbol
+#define PL_regeol PL_reg_state.re_state_regeol
+#define PL_regstartp PL_reg_state.re_state_regstartp
+#define PL_regendp PL_reg_state.re_state_regendp
+#define PL_reglastparen PL_reg_state.re_state_reglastparen
+#define PL_reglastcloseparen PL_reg_state.re_state_reglastcloseparen
+#define PL_regtill PL_reg_state.re_state_regtill
+#define PL_reg_start_tmp PL_reg_state.re_state_reg_start_tmp
+#define PL_reg_start_tmpl PL_reg_state.re_state_reg_start_tmpl
+#define PL_reg_eval_set PL_reg_state.re_state_reg_eval_set
+#define PL_regnarrate PL_reg_state.re_state_regnarrate
+#define PL_regindent PL_reg_state.re_state_regindent
+#define PL_reg_call_cc PL_reg_state.re_state_reg_call_cc
+#define PL_reg_re PL_reg_state.re_state_reg_re
+#define PL_reg_ganch PL_reg_state.re_state_reg_ganch
+#define PL_reg_sv PL_reg_state.re_state_reg_sv
+#define PL_reg_match_utf8 PL_reg_state.re_state_reg_match_utf8
+#define PL_reg_magic PL_reg_state.re_state_reg_magic
+#define PL_reg_oldpos PL_reg_state.re_state_reg_oldpos
+#define PL_reg_oldcurpm PL_reg_state.re_state_reg_oldcurpm
+#define PL_reg_curpm PL_reg_state.re_state_reg_curpm
+#define PL_reg_oldsaved PL_reg_state.re_state_reg_oldsaved
+#define PL_reg_oldsavedlen PL_reg_state.re_state_reg_oldsavedlen
+#define PL_reg_maxiter PL_reg_state.re_state_reg_maxiter
+#define PL_reg_leftiter PL_reg_state.re_state_reg_leftiter
+#define PL_reg_poscache PL_reg_state.re_state_reg_poscache
+#define PL_reg_poscache_size PL_reg_state.re_state_reg_poscache_size
+#define PL_regsize PL_reg_state.re_state_regsize
+#define PL_reg_starttry PL_reg_state.re_state_reg_starttry
+#define PL_nrs PL_reg_state.re_state_nrs
+
+struct re_save_state {
+ U32 re_state_reg_flags; /* from regexec.c */
+ char *re_state_bostr;
+ char *re_state_reginput; /* String-input pointer. */
+ char *re_state_regbol; /* Beginning of input, for ^ check. */
+ char *re_state_regeol; /* End of input, for $ check. */
+ I32 *re_state_regstartp; /* Pointer to startp array. */
+ I32 *re_state_regendp; /* Ditto for endp. */
+ U32 *re_state_reglastparen; /* Similarly for lastparen. */
+ U32 *re_state_reglastcloseparen; /* Similarly for lastcloseparen. */
+ char *re_state_regtill; /* How far we are required to go. */
+ char **re_state_reg_start_tmp; /* from regexec.c */
+ U32 re_state_reg_start_tmpl; /* from regexec.c */
+ I32 re_state_reg_eval_set; /* from regexec.c */
+ I32 re_state_regnarrate; /* from regexec.c */
+ int re_state_regindent; /* from regexec.c */
+ struct re_cc_state *re_state_reg_call_cc; /* from regexec.c */
+ regexp *re_state_reg_re; /* from regexec.c */
+ char *re_state_reg_ganch; /* from regexec.c */
+ SV *re_state_reg_sv; /* from regexec.c */
+ bool re_state_reg_match_utf8; /* from regexec.c */
+ MAGIC *re_state_reg_magic; /* from regexec.c */
+ I32 re_state_reg_oldpos; /* from regexec.c */
+ PMOP *re_state_reg_oldcurpm; /* from regexec.c */
+ PMOP *re_state_reg_curpm; /* from regexec.c */
+ char *re_state_reg_oldsaved; /* old saved substr during match */
+ STRLEN re_state_reg_oldsavedlen; /* old length of saved substr during match */
+ I32 re_state_reg_maxiter; /* max wait until caching pos */
+ I32 re_state_reg_leftiter; /* wait until caching pos */
+ char *re_state_reg_poscache; /* cache of pos of WHILEM */
+ STRLEN re_state_reg_poscache_size; /* size of pos cache of WHILEM */
+ I32 re_state_regsize; /* from regexec.c */
+ char *re_state_reg_starttry; /* from regexec.c */
+#ifdef PERL_OLD_COPY_ON_WRITE
+ SV *re_state_nrs; /* was placeholder: unused since 5.8.0 (5.7.2 patch #12027 for bug ID 20010815.012). Used to save rx->saved_copy */
+#endif
+};
+
+#define SAVESTACK_ALLOC_FOR_RE_SAVE_STATE \
+ (1 + ((sizeof(struct re_save_state) - 1) / sizeof(*PL_savestack)))
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */
projects / p5sagit/p5-mst-13.2.git / blobdiff