Sync cfgperl with maint-5.005 change #3000.

p4raw-link: @3000 on //depot/maint-5.005/perl: eb1b3f196d4ca6fe73bcc080a2591bad9b95dd7f

p4raw-id: //depot/cfgperl@3002

2 files changed, 73 insertions, 76 deletions

diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
index 4fc0cc6a12..8d8e9a642a 100644
--- a/pod/perlfunc.pod
+++ b/pod/perlfunc.pod
@@ -2605,7 +2605,7 @@ C<"i_"> and C<"I_"> also work but only because of completeness;
 they are identical to C<"i"> and C<"I">.
 
 The actual sizes (in bytes) of native shorts, ints, and longs on
-the platform where Perl was built are available via L<Config>:
+the platform where Perl was built are also available via L<Config>:
 
 	use Config;
 	print $Config{shortsize}, "\n";
@@ -2643,17 +2643,17 @@ You can see your system's preference with
  	print join(" ", map { sprintf "%#02x", $_ }
                             unpack("C*",pack("L",0x12345678))), "\n";
 
-The actual byteorder on the platform where Perl was built is available
+The byteorder on the platform where Perl was built is also available
 via L<Config>:
 
 	use Config;
 	print $Config{byteorder}, "\n";
 
-Byteorders '1234' and '12345678' are little-endian, '4321' and
-'87654321' are big-endian.
+Byteorders C<'1234'> and C<'12345678'> are little-endian, C<'4321'>
+and C<'87654321'> are big-endian.
 
-If you want portable integers use the formats C<"n">, C<"N">, C<"v">, and
-"V", their byte endianness and size is known.
+If you want portable packed integers use the formats C<"n">, C<"N">,
+C<"v">, and C<"V">, their byte endianness and size is known.
 
 =item *
 
diff --git a/t/op/pack.t b/t/op/pack.t
index f1bb62f6b3..4bfbfa3838 100755
--- a/t/op/pack.t
+++ b/t/op/pack.t
@@ -6,7 +6,7 @@ BEGIN {
     require Config; import Config;
 }
 
-print "1..98\n";
+print "1..142\n";
 
 $format = "c2 x5 C C x s d i l a6";
 # Need the expression in here to force ary[5] to be numeric.  This avoids
@@ -266,93 +266,90 @@ print "ok ", $test++, "\n";
 print "not " unless length(pack("i_", 0)) == length(pack("i", 0));
 print "ok ", $test++, "\n";
 
-# 79..94: test the limits
+# 79..138: pack <-> unpack bijectionism
 
-# Some possibilities for $Config{byteorder} and $Config{.*size}.
-# Note that CPUs can feature at several places.
-#
-# Config
-#
-# byteorder
-#
-# 1234		x86, vax, (DEC) mips
-# 12345678	alpha
-# 4321		sparc, ppc, hppa, (IRIX) mips, motorola
-# 87654321	sparc, mips, hppa, cray
-#
-#		x86	alpha	sparc	cray
-# shortsize	2	2	2	8
-# intsize	4	4	4	8
-# longsize	4	8	8	8
-#
+#  79.. 83 c
+foreach my $c (-128, -1, 0, 1, 127) {
+    print "not " unless unpack("c", pack("c", $c)) == $c;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("c", pack("c",  127)) ==  127;
-print "ok ", $test++, "\n";
+#  84.. 88: C
+foreach my $C (0, 1, 127, 128, 255) {
+    print "not " unless unpack("C", pack("C", $C)) == $C;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("c", pack("c", -128)) == -128;
-print "ok ", $test++, "\n";
+#  89.. 93: s
+foreach my $s (-32768, -1, 0, 1, 32767) {
+    print "not " unless unpack("s", pack("s", $s)) == $s;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("C", pack("C",  255)) ==  255;
-print "ok ", $test++, "\n";
+#  94.. 98: S
+foreach my $S (0, 1, 32767, 32768, 65535) {
+    print "not " unless unpack("S", pack("S", $S)) == $S;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("s", pack("s",  32767)) ==  32767;
-print "ok ", $test++, "\n";
+#  99..103: i
+foreach my $i (-2147483648, -1, 0, 1, 2147483647) {
+    print "not " unless unpack("i", pack("i", $i)) == $i;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("s", pack("s", -32768)) == -32768;
-print "ok ", $test++, "\n";
+# 104..108: I
+foreach my $I (0, 1, 2147483647, 2147483648, 4294967295) {
+    print "not " unless unpack("I", pack("I", $I)) == $I;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("S", pack("S",  65535)) ==  65535;
-print "ok ", $test++, "\n";
+# 109..113: l
+foreach my $l (-2147483648, -1, 0, 1, 2147483647) {
+    print "not " unless unpack("l", pack("l", $l)) == $l;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("i", pack("i",  2147483647)) ==  2147483647;
-print "ok ", $test++, "\n";
+# 114..118: L
+foreach my $L (0, 1, 2147483647, 2147483648, 4294967295) {
+    print "not " unless unpack("L", pack("L", $L)) == $L;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("i", pack("i", -2147483648)) == -2147483648;
-print "ok ", $test++, "\n";
+# 119..123: n
+foreach my $n (0, 1, 32767, 32768, 65535) {
+    print "not " unless unpack("n", pack("n", $n)) == $n;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("I", pack("I",  4294967295)) ==  4294967295;
-print "ok ", $test++, "\n";
+# 124..128: v
+foreach my $v (0, 1, 32767, 32768, 65535) {
+    print "not " unless unpack("v", pack("v", $v)) == $v;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("l", pack("l",  2147483647)) ==  2147483647;
-print "ok ", $test++, "\n";
+# 129..133: N
+foreach my $N (0, 1, 2147483647, 2147483648, 4294967295) {
+    print "not " unless unpack("N", pack("N", $N)) == $N;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("l", pack("l", -2147483648)) == -2147483648;
-print "ok ", $test++, "\n";
+# 134..138: V
+foreach my $V (0, 1, 2147483647, 2147483648, 4294967295) {
+    print "not " unless unpack("V", pack("V", $V)) == $V;
+    print "ok ", $test++, "\n";
+}
 
-print "not " unless unpack("L", pack("L",  4294967295)) ==  4294967295;
-print "ok ", $test++, "\n";
+# 139..142: pack nvNV byteorders
 
-print "not " unless unpack("n", pack("n",  65535)) == 65535;
+print "not " unless pack("n", 0xdead) eq "\xde\xad";
 print "ok ", $test++, "\n";
 
-print "not " unless unpack("v", pack("v",  65535)) == 65535;
+print "not " unless pack("v", 0xdead) eq "\xad\xde";
 print "ok ", $test++, "\n";
 
-print "not " unless unpack("N", pack("N",  4294967295)) ==  4294967295;
+print "not " unless pack("N", 0xdeadbeef) eq "\xde\xad\xbe\xef";
 print "ok ", $test++, "\n";
 
-print "not " unless unpack("V", pack("V",  4294967295)) ==  4294967295;
+print "not " unless pack("V", 0xdeadbeef) eq "\xef\xbe\xad\xde";
 print "ok ", $test++, "\n";
-
-# 95..98 test the n/v/N/V byteorder
-
-if ($Config{byteorder} =~ /^1234(5678)?$/ ||
-    $Config{byteorder} =~ /^(8765)?4321$/) {
-
-    print "not " unless pack("n", 0xdead) eq "\xde\xad";
-    print "ok ", $test++, "\n";
-
-    print "not " unless pack("v", 0xdead) eq "\xad\xde";
-    print "ok ", $test++, "\n";
-
-    print "not " unless pack("N", 0xdeadbeef) eq "\xde\xad\xbe\xef";
-    print "ok ", $test++, "\n";
-
-    print "not " unless pack("V", 0xdeadbeef) eq "\xef\xbe\xad\xde";
-    print "ok ", $test++, "\n";
-} else {
-   # exotic byteorder systems require more thought 
-   foreach (95..98) {
-       print "ok ", $test++, " # skipped\n";
-   }
-}