summaryrefslogtreecommitdiff
path: root/regexp.h
diff options
context:
space:
mode:
authorDavid Mitchell <davem@iabyn.com>2012-05-15 12:55:22 +0100
committerDavid Mitchell <davem@iabyn.com>2012-06-13 13:32:52 +0100
commitb93070ed2e35b0430327cc866a4fcf4042014513 (patch)
treeb4f5b10e08c3596add6e6ab1ba5ebe8e7a8da9fc /regexp.h
parentf8ff62a0b7c5ec858ae67e3f79488621e8f03107 (diff)
downloadperl-b93070ed2e35b0430327cc866a4fcf4042014513.tar.gz
eliminate PL_reglast(close)?paren, PL_regoffs
eliminate the three vars PL_reglastcloseparen PL_reglastparen PL_regoffs (which are actually aliases to PL_reg_state struct elements). These three vars always point to the corresponding fields within the currently executing regex; so just access those fields directly instead. This makes switching between regexes with (??{}) simpler: just update rex, and everything automatically references the new fields.
Diffstat (limited to 'regexp.h')
-rw-r--r--regexp.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/regexp.h b/regexp.h
index 18ce82a7b5..ba3709ed0e 100644
--- a/regexp.h
+++ b/regexp.h
@@ -738,9 +738,6 @@ typedef struct regmatch_slab {
#define PL_bostr PL_reg_state.re_state_bostr
#define PL_reginput PL_reg_state.re_state_reginput
#define PL_regeol PL_reg_state.re_state_regeol
-#define PL_regoffs PL_reg_state.re_state_regoffs
-#define PL_reglastparen PL_reg_state.re_state_reglastparen
-#define PL_reglastcloseparen PL_reg_state.re_state_reglastcloseparen
#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_match_utf8 PL_reg_state.re_state_reg_match_utf8
@@ -767,9 +764,6 @@ struct re_save_state {
char *re_state_bostr;
char *re_state_reginput; /* String-input pointer. */
char *re_state_regeol; /* End of input, for $ check. */
- regexp_paren_pair *re_state_regoffs; /* Pointer to start/end pairs */
- U32 *re_state_reglastparen; /* Similarly for lastparen. */
- U32 *re_state_reglastcloseparen; /* Similarly for lastcloseparen. */
char **re_state_reg_start_tmp; /* from regexec.c */
MAGIC *re_state_reg_magic; /* from regexec.c */
PMOP *re_state_reg_oldcurpm; /* from regexec.c */