Change 33165 by [EMAIL PROTECTED] on 2008/02/01 11:11:13
Integrate:
[ 32878]
Fix "grep in void context" warnings
[ 33163]
The penultimate deparse test needs a name, else things can warn.
Affected files ...
... //depot/maint-5.10/perl/ext/B/t/deparse.t#4 integrate
... //depot/maint-5.10/perl/ext/SDBM_File/t/sdbm.t#2 integrate
Differences ...
==== //depot/maint-5.10/perl/ext/B/t/deparse.t#4 (text) ====
Index: perl/ext/B/t/deparse.t
--- perl/ext/B/t/deparse.t#3~33151~ 2008-01-31 04:07:14.000000000 -0800
+++ perl/ext/B/t/deparse.t 2008-02-01 03:11:13.000000000 -0800
@@ -396,13 +396,14 @@
keys @$a if keys @ARGV;
values @ARGV if values @$a;
####
+# 51 Anonymous arrays and hashes, and references to them
my $a = {};
my $b = \{};
my $c = [];
my $d = \[];
####
# SKIP ?$] < 5.010 && "smartmatch and given/when not implemented on this Perl
version"
-# 51 implicit smartmatch in given/when
+# 52 implicit smartmatch in given/when
given ('foo') {
when ('bar') { continue; }
when ($_ ~~ 'quux') { continue; }
==== //depot/maint-5.10/perl/ext/SDBM_File/t/sdbm.t#2 (text) ====
Index: perl/ext/SDBM_File/t/sdbm.t
--- perl/ext/SDBM_File/t/sdbm.t#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/SDBM_File/t/sdbm.t 2008-02-01 03:11:13.000000000 -0800
@@ -490,7 +490,7 @@
$h{"fred"} = "joe" ;
ok(76, $h{"fred"} eq "joe");
- eval { grep { $h{$_} } (1, 2, 3) };
+ eval { map { $h{$_} } (1, 2, 3) };
ok (77, ! $@);
@@ -506,7 +506,7 @@
ok(79, $db->FIRSTKEY() eq "fred") ;
- eval { grep { $h{$_} } (1, 2, 3) };
+ eval { map { $h{$_} } (1, 2, 3) };
ok (80, ! $@);
undef $db ;
End of Patch.