[perl #68108] : also fix if/else constant folding

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

diff --git a/t/op/vec.t b/t/op/vec.t
old mode 100755 (executable)
new mode 100644 (file)
index 158711f..aed1d0f
--- a/t/op/vec.t
+++ b/t/op/vec.t
@@ -1,91 +1,90 @@
 #!./perl
 
-print "1..31\n";
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = qw(. ../lib);
+}
+
+require "test.pl";
+plan( tests => 31 );
 
 my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
 
-print vec($foo,0,1) == 0 ? "ok 1\n" : "not ok 1\n";
-print length($foo) == 0 ? "ok 2\n" : "not ok 2\n";
+is(vec($foo,0,1), 0);
+is(length($foo), undef);
 vec($foo,0,1) = 1;
-print length($foo) == 1 ? "ok 3\n" : "not ok 3\n";
-print unpack('C',$foo) == 1 ? "ok 4\n" : "not ok 4\n";
-print vec($foo,0,1) == 1 ? "ok 5\n" : "not ok 5\n";
+is(length($foo), 1);
+is(unpack('C',$foo), 1);
+is(vec($foo,0,1), 1);
 
-print vec($foo,20,1) == 0 ? "ok 6\n" : "not ok 6\n";
+is(vec($foo,20,1), 0);
 vec($foo,20,1) = 1;
-print vec($foo,20,1) == 1 ? "ok 7\n" : "not ok 7\n";
-print length($foo) == 3 ? "ok 8\n" : "not ok 8\n";
-print vec($foo,1,8) == 0 ? "ok 9\n" : "not ok 9\n";
+is(vec($foo,20,1), 1);
+is(length($foo), 3);
+is(vec($foo,1,8), 0);
 vec($foo,1,8) = 0xf1;
-print vec($foo,1,8) == 0xf1 ? "ok 10\n" : "not ok 10\n";
-print ((unpack('C',substr($foo,1,1)) & 255) == 0xf1 ? "ok 11\n" : "not ok 11\n");
-print vec($foo,2,4) == 1 ? "ok 12\n" : "not ok 12\n";
-print vec($foo,3,4) == 15 ? "ok 13\n" : "not ok 13\n";
+is(vec($foo,1,8), 0xf1);
+is((unpack('C',substr($foo,1,1)) & 255), 0xf1);
+is(vec($foo,2,4), 1);;
+is(vec($foo,3,4), 15);
 vec($Vec, 0, 32) = 0xbaddacab;
-print $Vec eq "\xba\xdd\xac\xab" ? "ok 14\n" : "not ok 14\n";
-print vec($Vec, 0, 32) == 3135089835 ? "ok 15\n" : "not ok 15\n";
+is($Vec, "\xba\xdd\xac\xab");
+is(vec($Vec, 0, 32), 3135089835);
 
 # ensure vec() handles numericalness correctly
 $foo = $bar = $baz = 0;
 vec($foo = 0,0,1) = 1;
 vec($bar = 0,1,1) = 1;
 $baz = $foo | $bar;
-print $foo eq "1" && $foo == 1 ? "ok 16\n" : "not ok 16\n";
-print $bar eq "2" && $bar == 2 ? "ok 17\n" : "not ok 17\n";
-print "$foo $bar $baz" eq "1 2 3" ? "ok 18\n" : "not ok 18\n";
+ok($foo eq "1" && $foo == 1);
+ok($bar eq "2" && $bar == 2);
+ok("$foo $bar $baz" eq "1 2 3");
 
 # error cases
 
 $x = eval { vec $foo, 0, 3 };
-print "not " if defined $x or $@ !~ /^Illegal number of bits in vec/;
-print "ok 19\n";
+like($@, qr/^Illegal number of bits in vec/);
+$@ = undef;
 $x = eval { vec $foo, 0, 0 };
-print "not " if defined $x or $@ !~ /^Illegal number of bits in vec/;
-print "ok 20\n";
+like($@, qr/^Illegal number of bits in vec/);
+$@ = undef;
 $x = eval { vec $foo, 0, -13 };
-print "not " if defined $x or $@ !~ /^Illegal number of bits in vec/;
-print "ok 21\n";
+like($@, qr/^Illegal number of bits in vec/);
+$@ = undef;
 $x = eval { vec($foo, -1, 4) = 2 };
-print "not " if defined $x or $@ !~ /^Negative offset to vec in lvalue context/;
-print "ok 22\n";
-print "not " if vec('abcd', 7, 8);
-print "ok 23\n";
+like($@, qr/^Negative offset to vec in lvalue context/);
+$@ = undef;
+ok(! vec('abcd', 7, 8));
 
 # UTF8
 # N.B. currently curiously coded to circumvent bugs elswhere in UTF8 handling
 
 $foo = "\x{100}" . "\xff\xfe";
 $x = substr $foo, 1;
-print "not " if vec($x, 0, 8) != 255;
-print "ok 24\n";
+is(vec($x, 0, 8), 255);
+$@ = undef;
 eval { vec($foo, 1, 8) };
-print "not " if $@;
-print "ok 25\n";
+ok(! $@);
+$@ = undef;
 eval { vec($foo, 1, 8) = 13 };
-print "not " if $@;
-print "ok 26\n";
+ok(! $@);
 if ($Is_EBCDIC) {
-    print "not " if $foo ne "\x8c\x0d\xff\x8a\x69";
-    print "ok 27\n";
+    is($foo, "\x8c\x0d\xff\x8a\x69"); 
 }
 else {
-    print "not " if $foo ne "\xc4\x0d\xc3\xbf\xc3\xbe";
-    print "ok 27\n";
+    is($foo, "\xc4\x0d\xc3\xbf\xc3\xbe");
 }
 $foo = "\x{100}" . "\xff\xfe";
 $x = substr $foo, 1;
 vec($x, 2, 4) = 7;
-print "not " if $x ne "\xff\xf7";
-print "ok 28\n";
+is($x, "\xff\xf7");
 
 # mixed magic
 
 $foo = "\x61\x62\x63\x64\x65\x66";
-print "not " if vec(substr($foo, 2, 2), 0, 16) != 25444;
-print "ok 29\n";
+is(vec(substr($foo, 2, 2), 0, 16), 25444);
 vec(substr($foo, 1,3), 5, 4) = 3;
-print "not " if $foo ne "\x61\x62\x63\x34\x65\x66";
-print "ok 30\n";
+is($foo, "\x61\x62\x63\x34\x65\x66");
 
 # A variation of [perl #20933]
 {
@@ -94,6 +93,5 @@ print "ok 30\n";
     vec($s, 1, 1) = 1;
     my @r;
     $r[$_] = \ vec $s, $_, 1 for (0, 1);
-    print "not " if (${ $r[0] } != 0 || ${ $r[1] } != 1);
-    print "ok 31\n";
+    ok(!(${ $r[0] } != 0 || ${ $r[1] } != 1)); 
 }