Change 33653 by [EMAIL PROTECTED] on 2008/04/06 20:11:52
Replace all remaining accesses to COP's cop_label with CopLABEL().
Affected files ...
... //depot/perl/dump.c#305 edit
... //depot/perl/ext/B/B.pm#89 edit
... //depot/perl/ext/B/B.xs#151 edit
... //depot/perl/pp_ctl.c#689 edit
Differences ...
==== //depot/perl/dump.c#305 (text) ====
Index: perl/dump.c
--- perl/dump.c#304~33584~ 2008-03-27 07:42:41.000000000 -0700
+++ perl/dump.c 2008-04-06 13:11:52.000000000 -0700
@@ -779,9 +779,9 @@
if (CopSTASHPV(cCOPo))
Perl_dump_indent(aTHX_ level, file, "PACKAGE = \"%s\"\n",
CopSTASHPV(cCOPo));
- if (cCOPo->cop_label)
+ if (CopLABEL(cCOPo))
Perl_dump_indent(aTHX_ level, file, "LABEL = \"%s\"\n",
- cCOPo->cop_label);
+ CopLABEL(cCOPo));
}
}
else
@@ -1081,9 +1081,9 @@
if (CopSTASHPV(cCOPo))
Perl_dump_indent(aTHX_ level, file, "PACKAGE = \"%s\"\n",
CopSTASHPV(cCOPo));
- if (cCOPo->cop_label)
+ if (CopLABEL(cCOPo))
Perl_dump_indent(aTHX_ level, file, "LABEL = \"%s\"\n",
- cCOPo->cop_label);
+ CopLABEL(cCOPo));
break;
case OP_ENTERLOOP:
Perl_dump_indent(aTHX_ level, file, "REDO ===> ");
@@ -2603,9 +2603,9 @@
if (CopSTASHPV(cCOPo))
PerlIO_printf(file, " package=\"%s\"",
CopSTASHPV(cCOPo));
- if (cCOPo->cop_label)
+ if (CopLABEL(cCOPo))
PerlIO_printf(file, " label=\"%s\"",
- cCOPo->cop_label);
+ CopLABEL(cCOPo));
}
}
else
@@ -2864,9 +2864,9 @@
if (CopSTASHPV(cCOPo))
S_xmldump_attr(aTHX_ level, file, "package=\"%s\"",
CopSTASHPV(cCOPo));
- if (cCOPo->cop_label)
+ if (CopLABEL(cCOPo))
S_xmldump_attr(aTHX_ level, file, "label=\"%s\"",
- cCOPo->cop_label);
+ CopLABEL(cCOPo));
break;
case OP_ENTERLOOP:
S_xmldump_attr(aTHX_ level, file, "redo=\"");
==== //depot/perl/ext/B/B.pm#89 (text) ====
Index: perl/ext/B/B.pm
--- perl/ext/B/B.pm#88~33230~ 2008-02-04 02:01:33.000000000 -0800
+++ perl/ext/B/B.pm 2008-04-06 13:11:52.000000000 -0700
@@ -7,7 +7,7 @@
#
package B;
-our $VERSION = '1.19';
+our $VERSION = '1.20';
use XSLoader ();
require Exporter;
==== //depot/perl/ext/B/B.xs#151 (text) ====
Index: perl/ext/B/B.xs
--- perl/ext/B/B.xs#150~33315~ 2008-02-15 01:19:49.000000000 -0800
+++ perl/ext/B/B.xs 2008-04-06 13:11:52.000000000 -0700
@@ -1195,7 +1195,7 @@
LOOP_lastop(o)
B::LOOP o
-#define COP_label(o) o->cop_label
+#define COP_label(o) CopLABEL(o)
#define COP_stashpv(o) CopSTASHPV(o)
#define COP_stash(o) CopSTASH(o)
#define COP_file(o) CopFILE(o)
==== //depot/perl/pp_ctl.c#689 (text) ====
Index: perl/pp_ctl.c
--- perl/pp_ctl.c#688~33580~ 2008-03-26 14:05:20.000000000 -0700
+++ perl/pp_ctl.c 2008-04-06 13:11:52.000000000 -0700
@@ -2345,7 +2345,7 @@
/* First try all the kids at this level, since that's likeliest. */
for (kid = cUNOPo->op_first; kid; kid = kid->op_sibling) {
if ((kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE) &&
- kCOP->cop_label && strEQ(kCOP->cop_label, label))
+ CopLABEL(kCOP) && strEQ(CopLABEL(kCOP), label))
return kid;
}
for (kid = cUNOPo->op_first; kid; kid = kid->op_sibling) {
End of Patch.
