Convert some "regexp" and "struct regexp" to REGEXP where they are

currently equivalent but will be wrong once the equivalence vanishes.

p4raw-id: //depot/perl@32803

diff --git a/embed.fnc b/embed.fnc
index bcce9a5..678cf99 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -685,8 +685,8 @@ Ap  |SV*    |regclass_swash |NULLOK const regexp *prog|NN const struct regnode *n|bo
 Ap     |I32    |pregexec       |NN REGEXP * const prog|NN char* stringarg \
                                |NN char* strend|NN char* strbeg|I32 minend \
                                |NN SV* screamer|U32 nosave
-Ap     |void   |pregfree       |NULLOK struct regexp* r
-EXp    |struct regexp* |reg_temp_copy  |NN struct regexp* r
+Ap     |void   |pregfree       |NULLOK REGEXP* r
+EXp    |REGEXP*|reg_temp_copy  |NN REGEXP* r
 Ap     |void   |regfree_internal|NULLOK REGEXP * const r
 Ap     |char * |reg_stringify  |NN MAGIC *mg|NULLOK STRLEN *lp|NULLOK U32 *flags|NULLOK I32 *haseval
 #if defined(USE_ITHREADS)
@@ -1333,7 +1333,7 @@ sR        |PerlIO *|doopen_pm     |NN const char *name|const STRLEN namelen
 #endif
 sRn    |bool   |path_is_absolute|NN const char *name
 sR     |I32    |run_user_filter|int idx|NN SV *buf_sv|int maxlen
-sR     |PMOP*  |make_matcher   |NN regexp* re
+sR     |PMOP*  |make_matcher   |NN REGEXP* re
 sR     |bool   |matcher_matches_sv|NN PMOP* matcher|NN SV* sv
 s      |void   |destroy_matcher|NN PMOP* matcher
 s      |OP*    |do_smartmatch  |NULLOK HV* seen_this|NULLOK HV* seen_other

diff --git a/pp_ctl.c b/pp_ctl.c
index 88d0d19..ae0c61e 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -77,7 +77,7 @@ PP(pp_regcomp)
     dSP;
     register PMOP *pm = (PMOP*)cLOGOP->op_other;
     SV *tmpstr;
-    regexp *re = NULL;
+    REGEXP *re = NULL;
 
     /* prevent recompiling under /o and ithreads. */
 #if defined(USE_ITHREADS)
@@ -3836,7 +3836,7 @@ PP(pp_leavegiven)
 
 /* Helper routines used by pp_smartmatch */
 STATIC PMOP *
-S_make_matcher(pTHX_ regexp *re)
+S_make_matcher(pTHX_ REGEXP *re)
 {
     dVAR;
     PMOP *matcher = (PMOP *) newPMOP(OP_MATCH, OPf_WANT_SCALAR | OPf_STACKED);
@@ -3889,7 +3889,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV *seen_other)
     SV *e = TOPs;      /* e is for 'expression' */
     SV *d = TOPm1s;    /* d is for 'default', as in PL_defgv */
     SV *This, *Other;  /* 'This' (and Other to match) to play with C++ */
-    regexp *this_regex, *other_regex;
+    REGEXP *this_regex, *other_regex;
 
 #   define NOT_EMPTY_PROTO(cv) (!SvPOK(cv) || SvCUR(cv) == 0)
 

diff --git a/proto.h b/proto.h
index 250d8d5..79e2428 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1851,8 +1851,8 @@ PERL_CALLCONV I32 Perl_pregexec(pTHX_ REGEXP * const prog, char* stringarg, char
                        __attribute__nonnull__(pTHX_4)
                        __attribute__nonnull__(pTHX_6);
 
-PERL_CALLCONV void     Perl_pregfree(pTHX_ struct regexp* r);
-PERL_CALLCONV struct regexp*   Perl_reg_temp_copy(pTHX_ struct regexp* r)
+PERL_CALLCONV void     Perl_pregfree(pTHX_ REGEXP* r);
+PERL_CALLCONV REGEXP*  Perl_reg_temp_copy(pTHX_ REGEXP* r)
                        __attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV void     Perl_regfree_internal(pTHX_ REGEXP * const r);
@@ -3558,7 +3558,7 @@ STATIC I32        S_run_user_filter(pTHX_ int idx, SV *buf_sv, int maxlen)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_2);
 
-STATIC PMOP*   S_make_matcher(pTHX_ regexp* re)
+STATIC PMOP*   S_make_matcher(pTHX_ REGEXP* re)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1);
 

diff --git a/regcomp.c b/regcomp.c
index 3612dca..775049d 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -9134,7 +9134,7 @@ Perl_re_intuit_string(pTHX_ REGEXP * const prog)
 */
 #ifndef PERL_IN_XSUB_RE
 void
-Perl_pregfree(pTHX_ struct regexp *r)
+Perl_pregfree(pTHX_ REGEXP *r)
 {
     dVAR;
     GET_RE_DEBUG_FLAGS_DECL;
@@ -9187,8 +9187,8 @@ Perl_pregfree(pTHX_ struct regexp *r)
 */    
     
     
-regexp *
-Perl_reg_temp_copy (pTHX_ struct regexp *r) {
+REGEXP *
+Perl_reg_temp_copy (pTHX_ REGEXP *r) {
     regexp *ret;
     register const I32 npar = r->nparens+1;
     (void)ReREFCNT_inc(r);
@@ -9582,7 +9582,7 @@ Perl_regdupe_internal(pTHX_ REGEXP * const r, CLONE_PARAMS *param)
 char *
 Perl_reg_stringify(pTHX_ MAGIC *mg, STRLEN *lp, U32 *flags, I32 *haseval ) {
     dVAR;
-    const regexp * const re = (regexp *)mg->mg_obj;
+    const REGEXP * const re = (REGEXP *)mg->mg_obj;
     if (haseval) 
         *haseval = RX_SEEN_EVALS(re);
     if (flags)    
@@ -9703,7 +9703,7 @@ static void
 clear_re(pTHX_ void *r)
 {
     dVAR;
-    ReREFCNT_dec((regexp *)r);
+    ReREFCNT_dec((REGEXP *)r);
 }
 
 #ifdef DEBUGGING