X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FB%2FB.xs;h=c3ce0ed43ec4925b1aaa4ae6572ec2d8975b1a83;hb=aefff11f7e121678e7cd0c4ebdd14e491a765ed2;hp=39b579f51b4ccf25d562e7685e971cb89d2f05f8;hpb=76ef7183b725f0ef3e642f805cb4d676a5263201;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/B/B.xs b/ext/B/B.xs
index 39b579f..c3ce0ed 100644
--- a/ext/B/B.xs
+++ b/ext/B/B.xs
@@ -528,7 +528,7 @@ minus_c()
 void
 save_BEGINs()
     CODE:
-	PL_minus_c |= 0x10;
+	PL_savebegin = TRUE;
 
 SV *
 cstring(sv)
@@ -667,7 +667,7 @@ LISTOP_children(o)
 #define PMOP_pmreplroot(o)	o->op_pmreplroot
 #define PMOP_pmreplstart(o)	o->op_pmreplstart
 #define PMOP_pmnext(o)		o->op_pmnext
-#define PMOP_pmregexp(o)	o->op_pmregexp
+#define PMOP_pmregexp(o)	PM_GETRE(o)
 #define PMOP_pmflags(o)		o->op_pmflags
 #define PMOP_pmpermflags(o)	o->op_pmpermflags
 
@@ -712,7 +712,7 @@ PMOP_precomp(o)
 	REGEXP *	rx = NO_INIT
     CODE:
 	ST(0) = sv_newmortal();
-	rx = o->op_pmregexp;
+	rx = PM_GETRE(o);
 	if (rx)
 	    sv_setpvn(ST(0), rx->precomp, rx->prelen);
 
@@ -756,11 +756,22 @@ PVOP_pv(o)
 	B::PVOP	o
     CODE:
 	/*
-	 * OP_TRANS uses op_pv to point to a table of 256 shorts
+	 * OP_TRANS uses op_pv to point to a table of 256 or >=258 shorts
 	 * whereas other PVOPs point to a null terminated string.
 	 */
-	ST(0) = sv_2mortal(newSVpv(o->op_pv, (o->op_type == OP_TRANS) ?
-				   256 * sizeof(short) : 0));
+	if (o->op_type == OP_TRANS &&
+		(o->op_private & OPpTRANS_COMPLEMENT) &&
+		!(o->op_private & OPpTRANS_DELETE))
+	{
+	    short* tbl = (short*)o->op_pv;
+	    short entries = 257 + tbl[256];
+	    ST(0) = sv_2mortal(newSVpv(o->op_pv, entries * sizeof(short)));
+	}
+	else if (o->op_type == OP_TRANS) {
+	    ST(0) = sv_2mortal(newSVpv(o->op_pv, 256 * sizeof(short)));
+	}
+	else
+	    ST(0) = sv_2mortal(newSVpv(o->op_pv, 0));
 
 #define LOOP_redoop(o)	o->op_redoop
 #define LOOP_nextop(o)	o->op_nextop
@@ -911,6 +922,7 @@ SvPV(sv)
     CODE:
 	ST(0) = sv_newmortal();
 	sv_setpvn(ST(0), SvPVX(sv), SvCUR(sv));
+	SvFLAGS(ST(0)) |= SvUTF8(sv);
 
 STRLEN
 SvLEN(sv)