From ea0673eedc20f778f2cefa666a956a24320bcad3 Mon Sep 17 00:00:00 2001 From: David Mitchell Date: Mon, 24 Jul 2017 14:58:58 +0100 Subject: [PATCH] rename RX_HAS_CUTGROUP() to RXp_HAS_CUTGROUP() It takes a private/internal regexp* pointer rather than a public REGEXP pointer, so rename it to match the other RXp_ macros. Most RXp_ macros are a variant of an RX_ macro; however, I didn't add an RX_HAS_CUTGROUP() macro - someone can always add that if needed. (There's only one use of RXp_HAS_CUTGROUP in core). --- regexec.c | 2 +- regexp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/regexec.c b/regexec.c index 05675adc38ea..1c65c1724a34 100644 --- a/regexec.c +++ b/regexec.c @@ -5375,7 +5375,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) SV *sv_yes_mark = NULL; /* last mark name we have seen during a successful match */ U32 lastopen = 0; /* last open we saw */ - bool has_cutgroup = RX_HAS_CUTGROUP(rex) ? 1 : 0; + bool has_cutgroup = RXp_HAS_CUTGROUP(rex) ? 1 : 0; SV* const oreplsv = GvSVn(PL_replgv); /* these three flags are set by various ops to signal information to * the very next op. They have a useful lifetime of exactly one loop diff --git a/regexp.h b/regexp.h index e8758993ad56..eca383523ffc 100644 --- a/regexp.h +++ b/regexp.h @@ -474,7 +474,7 @@ and check for NULL. # define RX_MATCH_TAINTED_off(rx_sv) (RX_EXTFLAGS(rx_sv) &= ~RXf_TAINTED_SEEN) #endif -#define RX_HAS_CUTGROUP(prog) ((prog)->intflags & PREGf_CUTGROUP_SEEN) +#define RXp_HAS_CUTGROUP(prog) ((prog)->intflags & PREGf_CUTGROUP_SEEN) #define RX_MATCH_TAINTED_set(rx_sv, t) ((t) \ ? RX_MATCH_TAINTED_on(rx_sv) \