[perl #43425] local $[: fix scoping during parser error handling.

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

diff --git a/proto.h b/proto.h
index 5ef97ad..8d71dae 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1217,10 +1217,6 @@ PERL_CALLCONV int        Perl_magic_setisa(pTHX_ SV* sv, MAGIC* mg)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV int      Perl_magic_freeisa(pTHX_ SV* sv, MAGIC* mg)
-                       __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2);
-
 PERL_CALLCONV int      Perl_magic_setglob(pTHX_ SV* sv, MAGIC* mg)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
@@ -1842,11 +1838,14 @@ PERL_CALLCONV OP*       Perl_pmtrans(pTHX_ OP* o, OP* expr, OP* repl)
 PERL_CALLCONV void     Perl_pop_scope(pTHX);
 PERL_CALLCONV OP*      Perl_prepend_elem(pTHX_ I32 optype, OP* head, OP* tail);
 PERL_CALLCONV void     Perl_push_scope(pTHX);
-/* PERL_CALLCONV OP*   ref(pTHX_ OP* o, I32 type); */
+/* PERL_CALLCONV OP*   Perl_ref(pTHX_ OP* o, I32 type); */
 PERL_CALLCONV OP*      Perl_refkids(pTHX_ OP* o, I32 type);
 PERL_CALLCONV void     Perl_regdump(pTHX_ const regexp* r)
                        __attribute__nonnull__(pTHX_1);
 
+PERL_CALLCONV void     Perl_regdump(pTHX_ const regexp* r)
+                       __attribute__nonnull__(pTHX_1);
+
 PERL_CALLCONV SV*      Perl_regclass_swash(pTHX_ const regexp *prog, const struct regnode *n, bool doinit, SV **listsvp, SV **altsvp)
                        __attribute__nonnull__(pTHX_2);
 
@@ -2172,7 +2171,7 @@ STATIC char*      S_glob_2pv(pTHX_ GV* const gv, STRLEN * const len)
                        __attribute__nonnull__(pTHX_1);
 
 #endif
-/* PERL_CALLCONV IV    sv_2iv(pTHX_ SV* sv)
+/* PERL_CALLCONV IV    Perl_sv_2iv(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV IV       Perl_sv_2iv_flags(pTHX_ SV* sv, I32 flags)
@@ -2182,7 +2181,7 @@ PERL_CALLCONV SV* Perl_sv_2mortal(pTHX_ SV* sv);
 PERL_CALLCONV NV       Perl_sv_2nv(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1);
 
-/* PERL_CALLCONV char* sv_2pv(pTHX_ SV* sv, STRLEN* lp)
+/* PERL_CALLCONV char* Perl_sv_2pv(pTHX_ SV* sv, STRLEN* lp)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV char*    Perl_sv_2pv_flags(pTHX_ SV* sv, STRLEN* lp, I32 flags)
@@ -2197,7 +2196,7 @@ PERL_CALLCONV char*       Perl_sv_2pvbyte(pTHX_ SV* sv, STRLEN* lp)
 PERL_CALLCONV char*    Perl_sv_pvn_nomg(pTHX_ SV* sv, STRLEN* lp)
                        __attribute__nonnull__(pTHX_1);
 
-/* PERL_CALLCONV UV    sv_2uv(pTHX_ SV* sv)
+/* PERL_CALLCONV UV    Perl_sv_2uv(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV UV       Perl_sv_2uv_flags(pTHX_ SV* sv, I32 flags)
@@ -2248,11 +2247,11 @@ PERL_CALLCONV void      Perl_sv_catpv(pTHX_ SV* sv, const char* ptr)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
 
-/* PERL_CALLCONV void  sv_catpvn(pTHX_ SV* sv, const char* ptr, STRLEN len)
+/* PERL_CALLCONV void  Perl_sv_catpvn(pTHX_ SV* sv, const char* ptr, STRLEN len)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2); */
 
-/* PERL_CALLCONV void  sv_catsv(pTHX_ SV* dsv, SV* ssv)
+/* PERL_CALLCONV void  Perl_sv_catsv(pTHX_ SV* dsv, SV* ssv)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV void     Perl_sv_chop(pTHX_ SV* sv, const char* ptr)
@@ -2349,7 +2348,7 @@ PERL_CALLCONV void        Perl_sv_pos_u2b(pTHX_ SV* sv, I32* offsetp, I32* lenp)
 PERL_CALLCONV void     Perl_sv_pos_b2u(pTHX_ SV* sv, I32* offsetp)
                        __attribute__nonnull__(pTHX_2);
 
-/* PERL_CALLCONV char* sv_pvn_force(pTHX_ SV* sv, STRLEN* lp)
+/* PERL_CALLCONV char* Perl_sv_pvn_force(pTHX_ SV* sv, STRLEN* lp)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV char*    Perl_sv_pvutf8n_force(pTHX_ SV* sv, STRLEN* lp)
@@ -2424,10 +2423,10 @@ PERL_CALLCONV void      Perl_sv_setpv(pTHX_ SV* sv, const char* ptr)
 PERL_CALLCONV void     Perl_sv_setpvn(pTHX_ SV* sv, const char* ptr, STRLEN len)
                        __attribute__nonnull__(pTHX_1);
 
-/* PERL_CALLCONV void  sv_setsv(pTHX_ SV* dsv, SV* ssv)
+/* PERL_CALLCONV void  Perl_sv_setsv(pTHX_ SV* dsv, SV* ssv)
                        __attribute__nonnull__(pTHX_1); */
 
-/* PERL_CALLCONV void  sv_taint(pTHX_ SV* sv)
+/* PERL_CALLCONV void  Perl_sv_taint(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV bool     Perl_sv_tainted(pTHX_ SV* sv)
@@ -2818,19 +2817,19 @@ PERL_CALLCONV void      Perl_reginitcolors(pTHX);
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1); */
 
-/* PERL_CALLCONV char* sv_pv(pTHX_ SV *sv)
+/* PERL_CALLCONV char* Perl_sv_pv(pTHX_ SV *sv)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1); */
 
-/* PERL_CALLCONV char* sv_pvutf8(pTHX_ SV *sv)
+/* PERL_CALLCONV char* Perl_sv_pvutf8(pTHX_ SV *sv)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1); */
 
-/* PERL_CALLCONV char* sv_pvbyte(pTHX_ SV *sv)
+/* PERL_CALLCONV char* Perl_sv_pvbyte(pTHX_ SV *sv)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1); */
 
-/* PERL_CALLCONV STRLEN        sv_utf8_upgrade(pTHX_ SV *sv)
+/* PERL_CALLCONV STRLEN        Perl_sv_utf8_upgrade(pTHX_ SV *sv)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV bool     Perl_sv_utf8_downgrade(pTHX_ SV *sv, bool fail_ok)
@@ -3547,9 +3546,7 @@ STATIC I32        S_dopoptowhen(pTHX_ I32 startingblock)
 STATIC void    S_save_lines(pTHX_ AV *array, SV *sv)
                        __attribute__nonnull__(pTHX_2);
 
-STATIC OP*     S_doeval(pTHX_ int gimme, OP** startop, CV* outside, U32 seq)
-                       __attribute__warn_unused_result__;
-
+STATIC bool    S_doeval(pTHX_ int gimme, OP** startop, CV* outside, U32 seq);
 STATIC PerlIO *        S_check_type_and_open(pTHX_ const char *name, const char *mode)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1)
@@ -3644,11 +3641,11 @@ STATIC OP*      S_doform(pTHX_ CV *cv, GV *gv, OP *retop)
                        __attribute__nonnull__(pTHX_2)
                        __attribute__nonnull__(pTHX_3);
 
-#  if !defined(PERL_EFF_ACCESS) && defined(HAS_ACCESS) && (defined(HAS_SETREUID) || defined(HAS_SETRESUID) || defined(HAS_SETREGID) || defined(HAS_SETRESGID))
-#  endif
+#  if !defined(PERL_EFF_ACCESS)
 STATIC int     S_emulate_eaccess(pTHX_ const char* path, Mode_t mode)
                        __attribute__nonnull__(pTHX_1);
 
+#  endif
 #  if !defined(HAS_MKDIR) || !defined(HAS_RMDIR)
 STATIC int     S_dooneliner(pTHX_ const char *cmd, const char *filename)
                        __attribute__warn_unused_result__
@@ -3795,6 +3792,7 @@ STATIC void       S_make_trie_failtable(pTHX_ struct RExC_state_t* state, regnode *sou
                        __attribute__nonnull__(pTHX_3);
 
 #  ifdef DEBUGGING
+STATIC void    S_regdump_extflags(pTHX_ const char *lead, const U32 flags);
 STATIC const regnode*  S_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, const regnode *last, const regnode *plast, SV* sv, I32 indent, U32 depth)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2)