This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Rmv obsolete function
authorKarl Williamson <khw@cpan.org>
Wed, 11 Mar 2020 22:16:18 +0000 (16:16 -0600)
committerKarl Williamson <khw@cpan.org>
Wed, 11 Mar 2020 22:33:06 +0000 (16:33 -0600)
Use of this function was removed as part of adding wildcarding to the
Unicode name property

embed.fnc
embed.h
proto.h
regcomp.c

index 8a8de89..d45f5fb 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1878,7 +1878,6 @@ EXpRT     |const char * const *|get_prop_values|const int table_index
 EXpR   |SV *   |get_prop_definition|const int table_index
 EXpRT  |const char *|get_deprecated_property_msg|const Size_t warning_offset
 #if defined(PERL_IN_REGCOMP_C)
-ERS    |REGEXP*|re_op_compile_wrapper|NN SV * const pattern|U32 orig_rx_flags|const U32 pm_flags
 EiRT   |bool   |invlist_is_iterating|NN SV* const invlist
 EiR    |SV*    |invlist_contents|NN SV* const invlist              \
                                 |const bool traditional_style
diff --git a/embed.h b/embed.h
index fb3fca2..d21badf 100644 (file)
--- a/embed.h
+++ b/embed.h
 #define parse_lparen_question_flags(a) S_parse_lparen_question_flags(aTHX_ a)
 #define parse_uniprop_string(a,b,c,d,e,f,g,h,i)        S_parse_uniprop_string(aTHX_ a,b,c,d,e,f,g,h,i)
 #define populate_ANYOF_from_invlist(a,b)       S_populate_ANYOF_from_invlist(aTHX_ a,b)
-#define re_op_compile_wrapper(a,b,c)   S_re_op_compile_wrapper(aTHX_ a,b,c)
 #define reg(a,b,c,d)           S_reg(aTHX_ a,b,c,d)
 #define reg2Lanode(a,b,c,d)    S_reg2Lanode(aTHX_ a,b,c,d)
 #define reg_node(a,b)          S_reg_node(aTHX_ a,b)
diff --git a/proto.h b/proto.h
index 1a63b4f..a6b6853 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -5813,11 +5813,6 @@ PERL_STATIC_NO_RET void  S_re_croak(pTHX_ bool utf8, const char* pat, ...)
 #define PERL_ARGS_ASSERT_RE_CROAK      \
        assert(pat)
 
-STATIC REGEXP* S_re_op_compile_wrapper(pTHX_ SV * const pattern, U32 orig_rx_flags, const U32 pm_flags)
-                       __attribute__warn_unused_result__;
-#define PERL_ARGS_ASSERT_RE_OP_COMPILE_WRAPPER \
-       assert(pattern)
-
 STATIC regnode_offset  S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth);
 #define PERL_ARGS_ASSERT_REG   \
        assert(pRExC_state); assert(flagp)
index 93624f3..45b1d1f 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -6685,16 +6685,9 @@ Perl_pregcomp(pTHX_ SV * const pattern, const U32 flags)
 REGEXP *
 Perl_re_compile(pTHX_ SV * const pattern, U32 rx_flags)
 {
-    PERL_ARGS_ASSERT_RE_COMPILE;
-    return re_op_compile_wrapper(pattern, rx_flags, 0);
-}
-
-REGEXP *
-S_re_op_compile_wrapper(pTHX_ SV * const pattern, U32 rx_flags, const U32 pm_flags)
-{
     SV *pat = pattern; /* defeat constness! */
 
-    PERL_ARGS_ASSERT_RE_OP_COMPILE_WRAPPER;
+    PERL_ARGS_ASSERT_RE_COMPILE;
 
     return Perl_re_op_compile(aTHX_ &pat, 1, NULL,
 #ifdef PERL_IN_XSUB_RE
@@ -6702,10 +6695,9 @@ S_re_op_compile_wrapper(pTHX_ SV * const pattern, U32 rx_flags, const U32 pm_fla
 #else
                                 &PL_core_reg_engine,
 #endif
-                                NULL, NULL, rx_flags, pm_flags);
+                                NULL, NULL, rx_flags, 0);
 }
 
-
 static void
 S_free_codeblocks(pTHX_ struct reg_code_blocks *cbs)
 {