Change 11601 by jhi@alpha on 2001/08/07 13:46:33
Subject: [PATCH perl@11597] B && BEGIN handling
From: "James A. Duncan" <[EMAIL PROTECTED]>
Date: Mon, 6 Aug 2001 17:29:11 +0100
Message-ID: <[EMAIL PROTECTED]>
(the intrpvar.h addition moved to the end for bincompat)
Affected files ...
... //depot/perl/embedvar.h#117 edit
... //depot/perl/ext/B/B.xs#59 edit
... //depot/perl/intrpvar.h#82 edit
... //depot/perl/perl.c#356 edit
... //depot/perl/perlapi.h#40 edit
Differences ...
==== //depot/perl/embedvar.h#117 (text+w) ====
Index: perl/embedvar.h
--- perl/embedvar.h.~1~ Tue Aug 7 08:00:05 2001
+++ perl/embedvar.h Tue Aug 7 08:00:05 2001
@@ -368,6 +368,7 @@
#define PL_rsfp (PERL_GET_INTERP->Irsfp)
#define PL_rsfp_filters (PERL_GET_INTERP->Irsfp_filters)
#define PL_runops (PERL_GET_INTERP->Irunops)
+#define PL_savebegin (PERL_GET_INTERP->Isavebegin)
#define PL_sawampersand (PERL_GET_INTERP->Isawampersand)
#define PL_sh_path (PERL_GET_INTERP->Ish_path)
#define PL_sig_pending (PERL_GET_INTERP->Isig_pending)
@@ -653,6 +654,7 @@
#define PL_rsfp (vTHX->Irsfp)
#define PL_rsfp_filters (vTHX->Irsfp_filters)
#define PL_runops (vTHX->Irunops)
+#define PL_savebegin (vTHX->Isavebegin)
#define PL_sawampersand (vTHX->Isawampersand)
#define PL_sh_path (vTHX->Ish_path)
#define PL_sig_pending (vTHX->Isig_pending)
@@ -1076,6 +1078,7 @@
#define PL_rsfp (aTHXo->interp.Irsfp)
#define PL_rsfp_filters (aTHXo->interp.Irsfp_filters)
#define PL_runops (aTHXo->interp.Irunops)
+#define PL_savebegin (aTHXo->interp.Isavebegin)
#define PL_sawampersand (aTHXo->interp.Isawampersand)
#define PL_sh_path (aTHXo->interp.Ish_path)
#define PL_sig_pending (aTHXo->interp.Isig_pending)
@@ -1362,6 +1365,7 @@
#define PL_Irsfp PL_rsfp
#define PL_Irsfp_filters PL_rsfp_filters
#define PL_Irunops PL_runops
+#define PL_Isavebegin PL_savebegin
#define PL_Isawampersand PL_sawampersand
#define PL_Ish_path PL_sh_path
#define PL_Isig_pending PL_sig_pending
==== //depot/perl/ext/B/B.xs#59 (text) ====
Index: perl/ext/B/B.xs
--- perl/ext/B/B.xs.~1~ Tue Aug 7 08:00:05 2001
+++ perl/ext/B/B.xs Tue Aug 7 08:00:05 2001
@@ -528,7 +528,7 @@
void
save_BEGINs()
CODE:
- PL_minus_c |= 0x10;
+ PL_savebegin = TRUE;
SV *
cstring(sv)
==== //depot/perl/intrpvar.h#82 (text) ====
Index: perl/intrpvar.h
--- perl/intrpvar.h.~1~ Tue Aug 7 08:00:05 2001
+++ perl/intrpvar.h Tue Aug 7 08:00:05 2001
@@ -476,18 +476,17 @@
#endif
#if defined(USE_ITHREADS)
-PERLVAR(Iregex_pad, SV**) /* All regex objects */
-PERLVAR(Iregex_padav, AV*) /* All regex objects */
+PERLVAR(Iregex_pad, SV**) /* All regex objects */
+PERLVAR(Iregex_padav, AV*) /* All regex objects */
#ifdef USE_REENTRANT_API
-PERLVAR(Ireentrant_buffer, REBUF*) /* were we store _r buffers */
+PERLVAR(Ireentrant_buffer, REBUF*) /* here we store the _r buffers */
#endif
#endif
+PERLVAR(Isavebegin, bool) /* save BEGINs for compiler */
+
/* New variables must be added to the very end for binary compatibility.
* XSUB.h provides wrapper functions via perlapi.h that make this
* irrelevant, but not all code may be expected to #include XSUB.h. */
-
-
-
==== //depot/perl/perl.c#356 (text) ====
Index: perl/perl.c
--- perl/perl.c.~1~ Tue Aug 7 08:00:05 2001
+++ perl/perl.c Tue Aug 7 08:00:05 2001
@@ -3860,7 +3860,7 @@
while (AvFILL(paramList) >= 0) {
cv = (CV*)av_shift(paramList);
- if ((PL_minus_c & 0x10) && (paramList == PL_beginav)) {
+ if (PL_savebegin && (paramList == PL_beginav)) {
/* save PL_beginav for compiler */
if (! PL_beginav_save)
PL_beginav_save = newAV();
==== //depot/perl/perlapi.h#40 (text+w) ====
Index: perl/perlapi.h
--- perl/perlapi.h.~1~ Tue Aug 7 08:00:05 2001
+++ perl/perlapi.h Tue Aug 7 08:00:05 2001
@@ -472,6 +472,8 @@
#define PL_rsfp_filters (*Perl_Irsfp_filters_ptr(aTHXo))
#undef PL_runops
#define PL_runops (*Perl_Irunops_ptr(aTHXo))
+#undef PL_savebegin
+#define PL_savebegin (*Perl_Isavebegin_ptr(aTHXo))
#undef PL_sawampersand
#define PL_sawampersand (*Perl_Isawampersand_ptr(aTHXo))
#undef PL_sh_path
End of Patch.
