summaryrefslogtreecommitdiff
path: root/regexp.h
diff options
context:
space:
mode:
authorDavid Mitchell <davem@iabyn.com>2013-05-31 21:39:01 +0100
committerDavid Mitchell <davem@iabyn.com>2013-06-02 22:28:54 +0100
commitf65e70f560c80556143956eb9980619a9dfbe2f4 (patch)
treed9c327235913d5c127fe44da874c403a668b4022 /regexp.h
parent1cb95af747617861d08c1213f05d8f1e4b55f942 (diff)
downloadperl-f65e70f560c80556143956eb9980619a9dfbe2f4.tar.gz
make PL_reg_curpm global
Currently PL_reg_curpm is actually #deffed to a field within PL_reg_state; promote it into a fully autonomous perl-interpreter variable. PL_reg_curpm points to a fake PMOP that's used to temporarily point PL_curpm to, that we can hang the current regex off, so that this works: "a" =~ /^(.)(?{ print $1 })/ # prints 'a' It turns out that it doesn't need to be saved and restored when we recursively enter the regex engine; that is already handled by saving and restoring which regex is currently attached to PL_reg_curpm. So we just need a single global (per interpreter) placeholder. Since we're shortly going to get rid of PL_reg_state, we need to move it out of that struct.
Diffstat (limited to 'regexp.h')
-rw-r--r--regexp.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/regexp.h b/regexp.h
index 01c8f36616..bd3aeb66b7 100644
--- a/regexp.h
+++ b/regexp.h
@@ -828,11 +828,9 @@ typedef struct regmatch_slab {
struct regmatch_slab *prev, *next;
} regmatch_slab;
-#define PL_reg_curpm PL_reg_state.re_state_reg_curpm
#define PL_reg_starttry PL_reg_state.re_state_reg_starttry
struct re_save_state {
- PMOP *re_state_reg_curpm; /* from regexec.c */
char *re_state_reg_starttry; /* from regexec.c */
};