Change 18861 by [EMAIL PROTECTED] on 2003/03/09 11:46:17
Subject: Re: [perl #21498] printf behaviour changes 5.6.1(and earlier) -> 5.8
From: Enache Adrian <[EMAIL PROTECTED]>
Date: Fri, 7 Mar 2003 23:28:37 +0200
Message-ID: <[EMAIL PROTECTED]>
(and few more test cases from the thread)
Affected files ...
... //depot/perl/sv.c#639 edit
... //depot/perl/t/op/sprintf.t#37 edit
Differences ...
==== //depot/perl/sv.c#639 (text) ====
Index: perl/sv.c
--- perl/sv.c#638~18822~ Mon Mar 3 21:14:13 2003
+++ perl/sv.c Sun Mar 9 03:46:17 2003
@@ -8358,6 +8358,7 @@
STRLEN zeros = 0;
bool has_precis = FALSE;
STRLEN precis = 0;
+ I32 osvix = svix;
bool is_utf8 = FALSE; /* is this item utf8? */
#ifdef HAS_LDBL_SPRINTF_BUG
/* This is to try to fix a bug with irix/nonstop-ux/powerux and
@@ -9109,7 +9110,6 @@
default:
unknown:
- vectorize = FALSE;
if (!args && ckWARN(WARN_PRINTF) &&
(PL_op->op_type == OP_PRTF || PL_op->op_type == OP_SPRINTF)) {
SV *msg = sv_newmortal();
@@ -9141,6 +9141,7 @@
p += elen;
*p = '\0';
SvCUR(sv) = p - SvPVX(sv);
+ svix = osvix;
continue; /* not "break" */
}
==== //depot/perl/t/op/sprintf.t#37 (xtext) ====
Index: perl/t/op/sprintf.t
--- perl/t/op/sprintf.t#36~18696~ Tue Feb 11 12:13:21 2003
+++ perl/t/op/sprintf.t Sun Mar 9 03:46:17 2003
@@ -359,7 +359,7 @@
>%2$d %d %d< >[12, 34]< >34 12 34<
>%3$d %d %d< >[12, 34, 56]< >56 12 34<
>%2$*3$d %d< >[12, 34, 3]< > 34 12<
->%*3$2$d %d< >[12, 34, 3]< >%*3$2$d 34 INVALID<
+>%*3$2$d %d< >[12, 34, 3]< >%*3$2$d 12 INVALID<
>%2$d< >12< >0 UNINIT<
>%0$d< >12< >%0$d INVALID<
>%1$$d< >12< >%1$$d INVALID<
@@ -374,4 +374,9 @@
>%vs,%d< >[1, 2, 3]< >1,2<
>%v_< >''< >%v_ INVALID<
>%v#x< >''< >%v#x INVALID<
->%v02x< >"foo\n"< >66.6f.6f.0a<
+>%v02x< >"foo\n"< >66.6f.6f.0a<
+>%V-%s< >["Hello"]< >%V-Hello INVALID<
+>%K %d %d< >[13, 29]< >%K 13 29 INVALID<
+>%*.*K %d< >[13, 29, 76]< >%*.*K 13 INVALID<
+>%4$K %d< >[45, 67]< >%4$K 45 INVALID<
+>%d %K %d< >[23, 45]< >23 %K 45 INVALID<
End of Patch.
