diff options
| author | Nicholas Clark <nick@ccl4.org> | 2008-04-06 20:11:52 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2008-04-06 20:11:52 +0000 |
| commit | 4b65a9196162b345e7cbe8a43eca838c2e79e41b (patch) | |
| tree | 4991882afc4678604942133800e05d40c06d294f | |
| parent | 439cad7f0af0ff91bdf31605de1593fa2b4842c3 (diff) | |
| download | perl-4b65a9196162b345e7cbe8a43eca838c2e79e41b.tar.gz | |
Replace all remaining accesses to COP's cop_label with CopLABEL().
p4raw-id: //depot/perl@33653
| -rw-r--r-- | dump.c | 16 | ||||
| -rw-r--r-- | ext/B/B.pm | 2 | ||||
| -rw-r--r-- | ext/B/B.xs | 2 | ||||
| -rw-r--r-- | pp_ctl.c | 2 |
4 files changed, 11 insertions, 11 deletions
@@ -779,9 +779,9 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) 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 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) 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 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o) 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 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o) 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=\""); diff --git a/ext/B/B.pm b/ext/B/B.pm index a212ae1a7d..5d491b4899 100644 --- a/ext/B/B.pm +++ b/ext/B/B.pm @@ -7,7 +7,7 @@ # package B; -our $VERSION = '1.19'; +our $VERSION = '1.20'; use XSLoader (); require Exporter; diff --git a/ext/B/B.xs b/ext/B/B.xs index 9d65a720fa..714ac4d649 100644 --- a/ext/B/B.xs +++ b/ext/B/B.xs @@ -1195,7 +1195,7 @@ B::OP 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) @@ -2345,7 +2345,7 @@ S_dofindlabel(pTHX_ OP *o, const char *label, OP **opstack, OP **oplimit) /* 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) { |