Re: Proposed changes and to regular expression interfaces in core

[p5sagit/p5-mst-13.2.git] / proto.h

diff --git a/proto.h b/proto.h
index 8110b29..2fa2a0c 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1642,6 +1642,10 @@ PERL_CALLCONV SV*        Perl_newSVsv(pTHX_ SV* old)
                        __attribute__malloc__
                        __attribute__warn_unused_result__;
 
+PERL_CALLCONV SV*      Perl_newSV_type(pTHX_ svtype type)
+                       __attribute__malloc__
+                       __attribute__warn_unused_result__;
+
 PERL_CALLCONV OP*      Perl_newUNOP(pTHX_ I32 type, I32 flags, OP* first)
                        __attribute__malloc__
                        __attribute__warn_unused_result__;
@@ -1659,9 +1663,10 @@ PERL_CALLCONV PERL_SI*   Perl_new_stackinfo(pTHX_ I32 stitems, I32 cxitems)
                        __attribute__malloc__
                        __attribute__warn_unused_result__;
 
-PERL_CALLCONV char*    Perl_scan_vstring(pTHX_ const char *vstr, SV *sv)
+PERL_CALLCONV char*    Perl_scan_vstring(pTHX_ const char *vstr, const char *end, SV *sv)
                        __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2);
+                       __attribute__nonnull__(pTHX_2)
+                       __attribute__nonnull__(pTHX_3);
 
 PERL_CALLCONV const char*      Perl_scan_version(pTHX_ const char *vstr, SV *sv, bool qv)
                        __attribute__nonnull__(pTHX_1)
@@ -1670,7 +1675,7 @@ PERL_CALLCONV const char* Perl_scan_version(pTHX_ const char *vstr, SV *sv, bool
 PERL_CALLCONV SV*      Perl_new_version(pTHX_ SV *ver)
                        __attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV SV*      Perl_upg_version(pTHX_ SV *ver)
+PERL_CALLCONV SV*      Perl_upg_version(pTHX_ SV *ver, bool qv)
                        __attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV bool     Perl_vverify(pTHX_ SV *vs)
@@ -1849,6 +1854,9 @@ PERL_CALLCONV I32 Perl_pregexec(pTHX_ regexp* prog, char* stringarg, char* stren
                        __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)
+                       __attribute__nonnull__(pTHX_1);
+
 PERL_CALLCONV void     Perl_regfree_internal(pTHX_ struct regexp* r);
 PERL_CALLCONV char *   Perl_reg_stringify(pTHX_ MAGIC *mg, STRLEN *lp, U32 *flags, I32 *haseval)
                        __attribute__nonnull__(pTHX_1);
@@ -1859,15 +1867,13 @@ PERL_CALLCONV void*     Perl_regdupe_internal(pTHX_ const regexp* r, CLONE_PARAMS* p
                        __attribute__nonnull__(pTHX_2);
 
 #endif
-PERL_CALLCONV regexp*  Perl_pregcomp(pTHX_ char* exp, char* xend, PMOP* pm)
+PERL_CALLCONV regexp*  Perl_pregcomp(pTHX_ char* exp, char* xend, U32 pm_flags)
                        __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2)
-                       __attribute__nonnull__(pTHX_3);
+                       __attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV regexp*  Perl_re_compile(pTHX_ char* exp, char* xend, PMOP* pm)
+PERL_CALLCONV regexp*  Perl_re_compile(pTHX_ char* exp, char* xend, U32 pm_flags)
                        __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2)
-                       __attribute__nonnull__(pTHX_3);
+                       __attribute__nonnull__(pTHX_2);
 
 PERL_CALLCONV char*    Perl_re_intuit_start(pTHX_ regexp* prog, SV* sv, char* strpos, char* strend, U32 flags, struct re_scream_pos_data_s *data)
                        __attribute__nonnull__(pTHX_1)
@@ -1888,12 +1894,18 @@ PERL_CALLCONV regnode*  Perl_regnext(pTHX_ regnode* p)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV SV*      Perl_reg_named_buff_get(pTHX_ SV* namesv, const REGEXP * const from_re, U32 flags)
-                       __attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV SV*      Perl_reg_numbered_buff_get(pTHX_ I32 paren, const REGEXP * const rx, SV* usesv, U32 flags)
+PERL_CALLCONV SV*      Perl_reg_named_buff_get(pTHX_ const REGEXP * const rx, SV* namesv, U32 flags)
+                       __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
 
+PERL_CALLCONV SV*      Perl_reg_numbered_buff_get(pTHX_ const REGEXP * const rx, I32 paren, SV* usesv)
+                       __attribute__nonnull__(pTHX_1);
+
+PERL_CALLCONV SV*      Perl_reg_qr_pkg(pTHX_ const REGEXP * const rx)
+                       __attribute__nonnull__(pTHX_1);
+
+
 PERL_CALLCONV void     Perl_regprop(pTHX_ const regexp *prog, SV* sv, const regnode* o)
                        __attribute__nonnull__(pTHX_2)
                        __attribute__nonnull__(pTHX_3);
@@ -3149,6 +3161,10 @@ PERL_CALLCONV OP*        Perl_ck_open(pTHX_ OP *o)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1);
 
+PERL_CALLCONV OP*      Perl_ck_readline(pTHX_ OP *o)
+                       __attribute__warn_unused_result__
+                       __attribute__nonnull__(pTHX_1);
+
 PERL_CALLCONV OP*      Perl_ck_repeat(pTHX_ OP *o)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1);
@@ -3300,13 +3316,21 @@ STATIC void     S_process_special_blocks(pTHX_ const char *const fullname, GV *const
 
 #endif
 #if defined(PL_OP_SLAB_ALLOC)
-PERL_CALLCONV void*    Perl_Slab_Alloc(pTHX_ int m, size_t sz)
+PERL_CALLCONV void*    Perl_Slab_Alloc(pTHX_ size_t sz)
                        __attribute__malloc__
                        __attribute__warn_unused_result__;
 
 PERL_CALLCONV void     Perl_Slab_Free(pTHX_ void *op)
                        __attribute__nonnull__(pTHX_1);
 
+#  if defined(PERL_DEBUG_READONLY_OPS)
+PERL_CALLCONV void     Perl_pending_Slabs_to_ro(pTHX);
+#    if defined(PERL_IN_OP_C)
+STATIC void    S_Slab_to_rw(pTHX_ void *op)
+                       __attribute__nonnull__(pTHX_1);
+
+#    endif
+#  endif
 #endif
 
 #if defined(PERL_IN_PERL_C) || defined(PERL_DECL_PROT)
@@ -3791,6 +3815,9 @@ STATIC char*      S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, cons
                        __attribute__nonnull__(pTHX_3)
                        __attribute__nonnull__(pTHX_4);
 
+STATIC void    S_swap_match_buff(pTHX_ regexp * prog)
+                       __attribute__nonnull__(pTHX_1);
+
 STATIC void    S_to_utf8_substr(pTHX_ regexp * prog)
                        __attribute__nonnull__(pTHX_1);
 
@@ -4590,6 +4617,17 @@ STATIC void      S_curmad(pTHX_ char slot, SV *sv);
 PERL_CALLCONV int      Perl_madlex(pTHX);
 PERL_CALLCONV int      Perl_madparse(pTHX);
 #endif
+#if !defined(HAS_SIGNBIT)
+PERL_CALLCONV int      Perl_signbit(NV f)
+                       __attribute__pure__;
+
+#endif
+
+PERL_CALLCONV void     Perl_emulate_cop_io(pTHX_ const COP *const c, SV *const sv)
+                       __attribute__nonnull__(pTHX_1)
+                       __attribute__nonnull__(pTHX_2);
+
+PERL_CALLCONV regexp * Perl_get_re_arg(pTHX_ SV *sv, U32 flags, MAGIC **mgp);
 
 END_EXTERN_C
 /*