summaryrefslogtreecommitdiff
path: root/toke.c
diff options
context:
space:
mode:
authorKarl Williamson <public@khwilliamson.com>2010-12-26 10:35:20 -0700
committerKarl Williamson <public@khwilliamson.com>2011-01-16 19:13:22 -0700
commit73134a2eb4055c76fe5b154da95e09118f716fd8 (patch)
treef1166eb556197354bcacdd7ce94ce4b4f27b078e /toke.c
parenta3ab329f3fc9494e700f51c38cef42021c130b6e (diff)
downloadperl-73134a2eb4055c76fe5b154da95e09118f716fd8.tar.gz
CH] Change usage of regex/op common to common names
This patch changes the core functions to use the common names for the fields that are shared between op.c and regcomp.c, just for consistency of using one name throughout the core for the same thing. A grep of cpan shows that both names are used in various modules; so both names must be retained.
Diffstat (limited to 'toke.c')
-rw-r--r--toke.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/toke.c b/toke.c
index 3d4bad17f7..cb096e989e 100644
--- a/toke.c
+++ b/toke.c
@@ -2834,7 +2834,7 @@ S_scan_const(pTHX_ char *start)
/* likewise skip #-initiated comments in //x patterns */
else if (*s == '#' && PL_lex_inpat &&
- ((PMOP*)PL_lex_inpat)->op_pmflags & PMf_EXTENDED) {
+ ((PMOP*)PL_lex_inpat)->op_pmflags & RXf_PMf_EXTENDED) {
while (s+1 < send && *s != '\n')
*d++ = NATIVE_TO_NEED(has_utf8,*s++);
}
@@ -12158,7 +12158,7 @@ S_pmflag(U32 pmfl, const char ch) {
case GLOBAL_PAT_MOD: pmfl |= PMf_GLOBAL; break;
case CONTINUE_PAT_MOD: pmfl |= PMf_CONTINUE; break;
case ONCE_PAT_MOD: pmfl |= PMf_KEEP; break;
- case KEEPCOPY_PAT_MOD: pmfl |= PMf_KEEPCOPY; break;
+ case KEEPCOPY_PAT_MOD: pmfl |= RXf_PMf_KEEPCOPY; break;
case NONDESTRUCT_PAT_MOD: pmfl |= PMf_NONDESTRUCT; break;
}
return pmfl;