Change 4 inversion list functions from S_ to Perl_

This is in preparation for them to be called from another file.  Note
that they are still protected by an #ifdef in embed.fnc.

diff --git a/embed.fnc b/embed.fnc
index 8fd43df5d3d495fb44e972b39291611a0e24d8a1..7ccff7c2df8e0e5953fa2937732788d3d2e304c0 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1320,10 +1320,10 @@ EiMR    |SV*    |invlist_clone  |NN SV* const invlist
 EiMR   |UV*    |get_invlist_iter_addr  |NN SV* invlist
 EiM    |void   |invlist_iterinit|NN SV* invlist
 EsMR   |bool   |invlist_iternext|NN SV* invlist|NN UV* start|NN UV* end
-EsM    |void   |_invlist_intersection  |NN SV* const a|NN SV* const b|NN SV** i
-EsM    |void   |_invlist_union |NN SV* const a|NN SV* const b|NN SV** output
-EsM    |void   |_invlist_subtract|NN SV* const a|NN SV* const b|NN SV** result
-EsM    |void   |_invlist_invert|NN SV* const invlist
+EpM    |void   |_invlist_intersection  |NN SV* const a|NN SV* const b|NN SV** i
+EpM    |void   |_invlist_union |NN SV* const a|NN SV* const b|NN SV** output
+EpM    |void   |_invlist_subtract|NN SV* const a|NN SV* const b|NN SV** result
+EpM    |void   |_invlist_invert|NN SV* const invlist
 #endif
 Ap     |void   |taint_env
 Ap     |void   |taint_proper   |NULLOK const char* f|NN const char *const s

diff --git a/embed.h b/embed.h
index 1a12c78f108033579f7f9d971886c38de9ac2377..19d641becefe8347dc3303c80b54cfdc0e2be5c6 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -866,10 +866,10 @@
 #  endif
 #  if defined(PERL_IN_REGCOMP_C)
 #define _invlist_array_init(a,b)       S__invlist_array_init(aTHX_ a,b)
-#define _invlist_intersection(a,b,c)   S__invlist_intersection(aTHX_ a,b,c)
-#define _invlist_invert(a)     S__invlist_invert(aTHX_ a)
-#define _invlist_subtract(a,b,c)       S__invlist_subtract(aTHX_ a,b,c)
-#define _invlist_union(a,b,c)  S__invlist_union(aTHX_ a,b,c)
+#define _invlist_intersection(a,b,c)   Perl__invlist_intersection(aTHX_ a,b,c)
+#define _invlist_invert(a)     Perl__invlist_invert(aTHX_ a)
+#define _invlist_subtract(a,b,c)       Perl__invlist_subtract(aTHX_ a,b,c)
+#define _invlist_union(a,b,c)  Perl__invlist_union(aTHX_ a,b,c)
 #define add_alternate(a,b,c)   S_add_alternate(aTHX_ a,b,c)
 #define add_cp_to_invlist(a,b) S_add_cp_to_invlist(aTHX_ a,b)
 #define add_data               S_add_data

diff --git a/proto.h b/proto.h
index fe234d3331e7adef8870c4cbd498de72915f944b..db49dbe93c16430ac2a6018c72c664de2a665200 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -5992,26 +5992,26 @@ PERL_STATIC_INLINE UV*  S__invlist_array_init(pTHX_ SV* const invlist, const bool
 #define PERL_ARGS_ASSERT__INVLIST_ARRAY_INIT   \
        assert(invlist)
 
-STATIC void    S__invlist_intersection(pTHX_ SV* const a, SV* const b, SV** i)
+PERL_CALLCONV void     Perl__invlist_intersection(pTHX_ SV* const a, SV* const b, SV** i)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2)
                        __attribute__nonnull__(pTHX_3);
 #define PERL_ARGS_ASSERT__INVLIST_INTERSECTION \
        assert(a); assert(b); assert(i)
 
-STATIC void    S__invlist_invert(pTHX_ SV* const invlist)
+PERL_CALLCONV void     Perl__invlist_invert(pTHX_ SV* const invlist)
                        __attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT__INVLIST_INVERT       \
        assert(invlist)
 
-STATIC void    S__invlist_subtract(pTHX_ SV* const a, SV* const b, SV** result)
+PERL_CALLCONV void     Perl__invlist_subtract(pTHX_ SV* const a, SV* const b, SV** result)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2)
                        __attribute__nonnull__(pTHX_3);
 #define PERL_ARGS_ASSERT__INVLIST_SUBTRACT     \
        assert(a); assert(b); assert(result)
 
-STATIC void    S__invlist_union(pTHX_ SV* const a, SV* const b, SV** output)
+PERL_CALLCONV void     Perl__invlist_union(pTHX_ SV* const a, SV* const b, SV** output)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2)
                        __attribute__nonnull__(pTHX_3);

diff --git a/regcomp.c b/regcomp.c
index 6860cc6b4e955cb258287acf7c4f6e841056157b..3ce66980622e1cdb058e43d6e9f5533c299b6cd1 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -6131,8 +6131,8 @@ Perl__append_range_to_invlist(pTHX_ SV* const invlist, const UV start, const UV
 }
 #endif
 
-STATIC void
-S__invlist_union(pTHX_ SV* const a, SV* const b, SV** output)
+void
+Perl__invlist_union(pTHX_ SV* const a, SV* const b, SV** output)
 {
     /* Take the union of two inversion lists and point 'result' to it.  If
      * 'result' on input points to one of the two lists, the reference count to
@@ -6321,8 +6321,8 @@ S__invlist_union(pTHX_ SV* const a, SV* const b, SV** output)
     return;
 }
 
-STATIC void
-S__invlist_intersection(pTHX_ SV* const a, SV* const b, SV** i)
+void
+Perl__invlist_intersection(pTHX_ SV* const a, SV* const b, SV** i)
 {
     /* Take the intersection of two inversion lists and point 'i' to it.  If
      * 'i' on input points to one of the two lists, the reference count to that
@@ -6537,8 +6537,8 @@ S_add_cp_to_invlist(pTHX_ SV* invlist, const UV cp) {
     return add_range_to_invlist(invlist, cp, cp);
 }
 
-STATIC void
-S__invlist_invert(pTHX_ SV* const invlist)
+void
+Perl__invlist_invert(pTHX_ SV* const invlist)
 {
     /* Complement the input inversion list.  This adds a 0 if the list didn't
      * have a zero; removes it otherwise.  As described above, the data
@@ -6580,8 +6580,8 @@ S_invlist_clone(pTHX_ SV* const invlist)
     return new_invlist;
 }
 
-STATIC void
-S__invlist_subtract(pTHX_ SV* const a, SV* const b, SV** result)
+void
+Perl__invlist_subtract(pTHX_ SV* const a, SV* const b, SV** result)
 {
     /* Point result to an inversion list which consists of all elements in 'a'
      * that aren't also in 'b' */