X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp.c;h=eb386eede1c984f0ca19de3fe2a8efd1d5f503ff;hb=d54344fc28d39ef8e90173262ec572bec67f5e6c;hp=9237a8b219824247c87d5c4a1527dca4c3fbcde3;hpb=e7ae6809ba5905bb2ce7c09e88c6e2bdb5c913af;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp.c b/pp.c
index 9237a8b..eb386ee 100644
--- a/pp.c
+++ b/pp.c
@@ -15,6 +15,7 @@
 #include "EXTERN.h"
 #define PERL_IN_PP_C
 #include "perl.h"
+#include "keywords.h"
 
 /* variations on pp_null */
 
@@ -365,6 +366,8 @@ PP(pp_prototype)
 		I32 oa;
 		char str[ MAX_ARGS_OP * 2 + 2 ]; /* One ';', one '\0' */
 
+		if (code == -KEY_chop || code == -KEY_chomp)
+		    goto set;
 		while (i < MAXO) {	/* The slow way. */
 		    if (strEQ(s + 6, PL_op_name[i])
 			|| strEQ(s + 6, PL_op_desc[i]))
@@ -1120,8 +1123,8 @@ PP(pp_modulo)
     {
 	UV left  = 0;
 	UV right = 0;
-	bool left_neg;
-	bool right_neg;
+	bool left_neg = FALSE;
+	bool right_neg = FALSE;
 	bool use_double = FALSE;
 	bool dright_valid = FALSE;
 	NV dright = 0.0;
@@ -2255,7 +2258,7 @@ PP(pp_complement)
 	      while (tmps < send) {
 		  UV c = utf8n_to_uvchr(tmps, send-tmps, &l, UTF8_ALLOW_ANYUV);
 		  tmps += UTF8SKIP(tmps);
-		  result = uvchr_to_utf8(result, ~c);
+		  result = uvchr_to_utf8_flags(result, ~c, UNICODE_ALLOW_ANY);
 	      }
 	      *result = '\0';
 	      result -= targlen;
@@ -2624,7 +2627,7 @@ PP(pp_log)
       value = POPn;
       if (value <= 0.0) {
 	SET_NUMERIC_STANDARD();
-	DIE(aTHX_ "Can't take log of %g", value);
+	DIE(aTHX_ "Can't take log of %"NVgf, value);
       }
       value = Perl_log(value);
       XPUSHn(value);
@@ -2640,7 +2643,7 @@ PP(pp_sqrt)
       value = POPn;
       if (value < 0.0) {
 	SET_NUMERIC_STANDARD();
-	DIE(aTHX_ "Can't take sqrt of %g", value);
+	DIE(aTHX_ "Can't take sqrt of %"NVgf, value);
       }
       value = Perl_sqrt(value);
       XPUSHn(value);
@@ -3145,7 +3148,8 @@ PP(pp_chr)
 
     if (value > 255 && !IN_BYTES) {
 	SvGROW(TARG, UNISKIP(value)+1);
-	tmps = (char*)uvchr_to_utf8((U8*)SvPVX(TARG), value);
+	tmps = (char*)uvchr_to_utf8_flags((U8*)SvPVX(TARG), value,
+					  UNICODE_ALLOW_SUPER);
 	SvCUR_set(TARG, tmps - SvPVX(TARG));
 	*tmps = '\0';
 	(void)SvPOK_only(TARG);