Integrate mainline

[p5sagit/p5-mst-13.2.git] / t / op / sprintf.t

diff --git a/t/op/sprintf.t b/t/op/sprintf.t
index 22b0b48..97b66a5 100755 (executable)
--- a/t/op/sprintf.t
+++ b/t/op/sprintf.t
@@ -56,7 +56,7 @@ for ($i = 1; @tests; $i++) {
     }
     elsif ($y eq ">$result<")  # Some C libraries always give
     {                          # three-digit exponent
-               print("ok $i >$result< $x # three-digit exponent accepted\n");
+               print("ok $i # >$result< $x three-digit exponent accepted\n");
     }
        elsif ($result =~ /[-+]\d{3}$/ &&
                   # Suppress tests with modulo of exponent >= 100 on platforms
@@ -64,8 +64,8 @@ for ($i = 1; @tests; $i++) {
                   ((!eval {require POSIX}) || # Costly: only do this if we must!
                        (length(&POSIX::DBL_MAX) - rindex(&POSIX::DBL_MAX, '+')) == 3))
        {
-               print("ok $i >$template< >$data< >$result<",
-                         " # Suppressed: exponent out of range?\n") 
+               print("ok $i # >$template< >$data< >$result<",
+                         " Suppressed: exponent out of range?\n") 
        }
     else {
        $y = ($x eq $y ? "" : " => $y");
@@ -308,3 +308,16 @@ __END__
 >%0*x<      >[-10, ,2**32-1]< >ffffffff  <
 >%y<        >''<          >%y INVALID<
 >%z<        >''<          >%z INVALID<
+>%2$d %1$d<    >[12, 34]<      >34 12<
+>%*2$d<                >[12, 3]<       > 12<
+>%2$d %d<      >[12, 34]<      >34 12<
+>%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]<   > 34 12<
+>%2$d<         >12<    >0<
+>%0$d<         >12<    >%0$d INVALID<
+>%1$$d<                >12<    >%1$$d INVALID<
+>%1$1$d<       >12<    >%1$1$d INVALID<
+>%*2$*2$d<     >[12, 3]<       >%*2$*2$d INVALID<
+>%*2*2$d<      >[12, 3]<       >%*2*2$d INVALID<