From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Tue, 23 Oct 2001 21:53:13 +0000 (+0000)
Subject: Make the "isn't numeric" warning to show Unicode as Unicode.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=944630198f0165148571b6785f76ff7d16cad1a8;p=p5sagit%2Fp5-mst-13.2.git

Make the "isn't numeric" warning to show Unicode as Unicode.

p4raw-id: //depot/perl@12613
---

diff --git a/sv.c b/sv.c
index 44a114b..5885b8e 100644
--- a/sv.c
+++ b/sv.c
@@ -1756,61 +1756,70 @@ Perl_sv_setnv_mg(pTHX_ register SV *sv, NV num)
 STATIC void
 S_not_a_number(pTHX_ SV *sv)
 {
-    char tmpbuf[64];
-    char *d = tmpbuf;
-    char *limit = tmpbuf + sizeof(tmpbuf) - 8;
-                  /* each *s can expand to 4 chars + "...\0",
-                     i.e. need room for 8 chars */
-
-    char *s, *end;
-    for (s = SvPVX(sv), end = s + SvCUR(sv); s < end && d < limit; s++) {
-	int ch = *s & 0xFF;
-	if (ch & 128 && !isPRINT_LC(ch)) {
-	    *d++ = 'M';
-	    *d++ = '-';
-	    ch &= 127;
-	}
-	if (ch == '\n') {
-	    *d++ = '\\';
-	    *d++ = 'n';
-	}
-	else if (ch == '\r') {
-	    *d++ = '\\';
-	    *d++ = 'r';
-	}
-	else if (ch == '\f') {
-	    *d++ = '\\';
-	    *d++ = 'f';
-	}
-	else if (ch == '\\') {
-	    *d++ = '\\';
-	    *d++ = '\\';
-	}
-	else if (ch == '\0') {
-	    *d++ = '\\';
-	    *d++ = '0';
-	}
-	else if (isPRINT_LC(ch))
-	    *d++ = ch;
-	else {
-	    *d++ = '^';
-	    *d++ = toCTRL(ch);
-	}
-    }
-    if (s < end) {
-	*d++ = '.';
-	*d++ = '.';
-	*d++ = '.';
+     SV *dsv;
+     char tmpbuf[64];
+     char *pv;
+
+     if (DO_UTF8(sv)) {
+          dsv = sv_2mortal(newSVpv("", 0));
+          pv = sv_uni_display(dsv, sv, 10, 0);
+     } else {
+	  char *d = tmpbuf;
+	  char *limit = tmpbuf + sizeof(tmpbuf) - 8;
+	  /* each *s can expand to 4 chars + "...\0",
+	     i.e. need room for 8 chars */
+	  
+	  char *s, *end;
+	  for (s = SvPVX(sv), end = s + SvCUR(sv); s < end && d < limit; s++) {
+	       int ch = *s & 0xFF;
+	       if (ch & 128 && !isPRINT_LC(ch)) {
+		    *d++ = 'M';
+		    *d++ = '-';
+		    ch &= 127;
+	       }
+	       if (ch == '\n') {
+		    *d++ = '\\';
+		    *d++ = 'n';
+	       }
+	       else if (ch == '\r') {
+		    *d++ = '\\';
+		    *d++ = 'r';
+	       }
+	       else if (ch == '\f') {
+		    *d++ = '\\';
+		    *d++ = 'f';
+	       }
+	       else if (ch == '\\') {
+		    *d++ = '\\';
+		    *d++ = '\\';
+	       }
+	       else if (ch == '\0') {
+		    *d++ = '\\';
+		    *d++ = '0';
+	       }
+	       else if (isPRINT_LC(ch))
+		    *d++ = ch;
+	       else {
+		    *d++ = '^';
+		    *d++ = toCTRL(ch);
+	       }
+	  }
+	  if (s < end) {
+	       *d++ = '.';
+	       *d++ = '.';
+	       *d++ = '.';
+	  }
+	  *d = '\0';
+	  pv = tmpbuf;
     }
-    *d = '\0';
 
     if (PL_op)
 	Perl_warner(aTHX_ WARN_NUMERIC,
-		    "Argument \"%s\" isn't numeric in %s", tmpbuf,
-			OP_DESC(PL_op));
+		    "Argument \"%s\" isn't numeric in %s", pv,
+		    OP_DESC(PL_op));
     else
 	Perl_warner(aTHX_ WARN_NUMERIC,
-		    "Argument \"%s\" isn't numeric", tmpbuf);
+		    "Argument \"%s\" isn't numeric", pv);
 }
 
 /*
diff --git a/t/lib/warnings/sv b/t/lib/warnings/sv
index b3929e2..9af58c2 100644
--- a/t/lib/warnings/sv
+++ b/t/lib/warnings/sv
@@ -318,3 +318,11 @@ Possible Y2K bug: %d format string following '19' at - line 15.
 31978
 1978
 1978
+########
+# sv.c
+use warnings 'numeric' ;
+$a = "\x{100}\x{200}" * 42;
+no warnings 'numeric' ;
+$a = "\x{100}\x{200}" * 42;
+EXPECT
+Argument "\x{100}\x{200}" isn't numeric in multiplication (*) at - line 3.