X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F32-hash.t;h=df46de2fbac67a768fc96f3777e6df373fb61e09;hb=HEAD;hp=bf01b3dccfd522dda858c59b9a818677525257dd;hpb=03eb870636b3e9f56a04a7a5291752e26f36829e;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/32-hash.t b/t/32-hash.t
index bf01b3d..df46de2 100644
--- a/t/32-hash.t
+++ b/t/32-hash.t
@@ -3,72 +3,163 @@
 use strict;
 use warnings;
 
-use Test::More tests => 2 * 21 + 7 + 1;
+use Test::More tests => (2 * 27 + 9) + 2 * (2 * 5 + 5) + 1;
 
-use Variable::Magic qw/cast dispell MGf_COPY VMG_UVAR/;
+use Variable::Magic qw<
+ cast dispell
+ VMG_UVAR
+ VMG_COMPAT_HASH_DELETE_NOUVAR_VOID
+>;
 
 use lib 't/lib';
 use Variable::Magic::TestWatcher;
 
-my $wiz = init
-        [ qw/get set len clear free copy dup local fetch store exists delete/ ],
+my $wiz = init_watcher
+        [ qw<get set len clear free copy dup local fetch store exists delete> ],
         'hash';
 
-my %n = map { $_ => int rand 1000 } qw/foo bar baz qux/;
+my %n = map { $_ => int rand 1000 } qw<foo bar baz qux>;
 my %h = %n;
 
-check { cast %h, $wiz } { }, 'cast';
+watch { cast %h, $wiz } { }, 'cast';
 
-my $s = check { $h{foo} } +{ (fetch => 1) x VMG_UVAR },
+my $s = watch { $h{foo} } +{ (fetch => 1) x VMG_UVAR },
                        'assign element to';
 is $s, $n{foo}, 'hash: assign element to correctly';
 
+my %b;
+watch { %b = %h } { }, 'assign to';
+is_deeply \%b, \%n, 'hash: assign to correctly';
+
+$s = watch { \%h } { }, 'reference';
+
+my @b = watch { @h{qw<bar qux>} }
+                  +{ (fetch => 2) x VMG_UVAR }, 'slice';
+is_deeply \@b, [ @n{qw<bar qux>} ], 'hash: slice correctly';
+
+# exists
+
+watch { exists $h{bar} } +{ (exists => 1) x VMG_UVAR },'exists in void context';
+
 for (1 .. 2) {
- $s = check { exists $h{foo} } +{ (exists => 1) x VMG_UVAR }, "exists ($_)";
+ $s = watch { exists $h{bar} } +{ (exists => 1) x VMG_UVAR },
+                                                "exists in scalar context ($_)";
  ok $s, "hash: exists correctly ($_)";
 }
 
-my %b;
-check { %b = %h } { }, 'assign to';
-is_deeply \%b, \%n, 'hash: assign to correctly';
+# delete
 
-$s = check { \%h } { }, 'reference';
+watch { delete $h{bar} } +{
+ ((delete => 1) x !VMG_COMPAT_HASH_DELETE_NOUVAR_VOID, copy => 1) x VMG_UVAR
+}, 'delete in void context';
 
-my @b = check { @h{qw/bar qux/} }
-                  +{ (fetch => 2) x VMG_UVAR }, 'slice';
-is_deeply \@b, [ @n{qw/bar qux/} ], 'hash: slice correctly';
+for (1 .. 2) {
+ $s = watch { delete $h{baz} } +{ (delete => 1, copy => 1) x VMG_UVAR },
+                                                "delete in scalar context ($_)";
+ my $exp = $_ == 1 ? $n{baz} : undef;
+ is $s, $exp, "hash: delete correctly ($_)";
+}
 
-check { %h = () } { clear => 1 }, 'empty in list context';
+# clear
 
-check { %h = (a => 1, d => 3); () }
+watch { %h = () } { clear => 1 }, 'empty in list context';
+
+watch { $h{a} = -1; %h = (b => $h{a}) }
+           +{ (fetch => 1, store => 2, copy => 2) x VMG_UVAR, clear => 1 },
+           'empty and set in void context';
+
+watch { %h = (a => 1, d => 3) }
                +{ (store => 2, copy => 2) x VMG_UVAR, clear => 1 },
                'assign from list in void context';
 
-check { %h = map { $_ => 1 } qw/a b d/; }
-               +{ (exists => 3, store => 3, copy => 3) x VMG_UVAR, clear => 1 },
-               'assign from map in list context';
+@b = watch { %h = (a => 1, d => 3) }
+               +{ (exists => 2, store => 2, copy => 2) x VMG_UVAR, clear => 1 },
+               'assign from list in void context';
+
+watch { %h = map { $_ => 1 } qw<a b d>; }
+               +{ (store => 3, copy => 3) x VMG_UVAR, clear => 1 },
+               'assign from map in void context';
 
-check { $h{d} = 2; () } +{ (store => 1) x VMG_UVAR },
+watch { $h{d} = 2 } +{ (store => 1) x VMG_UVAR },
                     'assign old element';
 
-check { $h{c} = 3; () } +{ (store => 1, copy => 1) x VMG_UVAR },
+watch { $h{c} = 3 } +{ (store => 1, copy => 1) x VMG_UVAR },
                     'assign new element';
 
-$s = check { %h } { }, 'buckets';
+$s = watch { %h } { }, 'buckets';
 
-@b = check { keys %h } { }, 'keys';
-is_deeply [ sort @b ], [ qw/a b c d/ ], 'hash: keys correctly';
+@b = watch { keys %h } { }, 'keys';
+is_deeply [ sort @b ], [ qw<a b c d> ], 'hash: keys correctly';
 
-@b = check { values %h } { }, 'values';
+@b = watch { values %h } { }, 'values';
 is_deeply [ sort { $a <=> $b } @b ], [ 1, 1, 2, 3 ], 'hash: values correctly';
 
-check { while (my ($k, $v) = each %h) { } } { }, 'each';
+watch { while (my ($k, $v) = each %h) { } } { }, 'each';
 
-check {
+watch {
  my %b = %n;
- check { cast %b, $wiz } { }, 'cast 2';
+ watch { cast %b, $wiz } { }, 'cast 2';
 } { free => 1 }, 'scope end';
 
-check { undef %h } { clear => 1 }, 'undef';
+watch { undef %h } { clear => 1 }, 'undef';
 
-check { dispell %h, $wiz } { }, 'dispell';
+watch { dispell %h, $wiz } { }, 'dispell';
+
+SKIP: {
+ my $SKIP;
+
+ if (!VMG_UVAR) {
+  $SKIP = 'uvar magic';
+ } else {
+  local $@;
+  unless (eval { require B; require B::Deparse; 1 }) {
+   $SKIP = 'B and B::Deparse';
+  }
+ }
+ if ($SKIP) {
+  $SKIP .= ' required to test uvar/clear interaction fix';
+  skip $SKIP => 2 * ( 2 * 5 + 5);
+ }
+
+ my $bd = B::Deparse->new;
+
+ my %h1 = (a => 13, b => 15);
+ my %h2 = (a => 17, b => 19);
+
+ my @tests = (
+  [ \%h1 => 'first hash'  => (14, 16) ],
+  [ \%h2 => 'second hash' => (18, 20) ],
+ );
+
+ for my $test (@tests) {
+  my ($h, $desc, @exp) = @$test;
+
+  watch { &cast($h, $wiz) } { }, "cast clear/uvar on $desc";
+
+  my $code   = sub { my $x = $h->{$_[0]}; ++$x; $x };
+  my $before = $bd->coderef2text($code);
+  my $res;
+
+  watch { $res = $code->('a') } { fetch => 1 }, "fetch constant 'a' from $desc";
+  is $res, $exp[0], "uvar: fetch constant 'a' from $desc was correct";
+
+  my $after = $bd->coderef2text($code);
+  is $before, $after,
+                "uvar: code deparses correctly after constant fetch from $desc";
+
+  my $key = 'b';
+  watch { $res = $code->($key) } { fetch => 1 },"fetch variable 'b' from $desc";
+  is $res, $exp[1], "uvar: fetch variable 'b' from $desc was correct";
+
+  $after = $bd->coderef2text($code);
+  is $before, $after,
+                "uvar: code deparses correctly after variable fetch from $desc";
+
+  watch { %$h = () } { clear => 1 }, "fixed clear for $desc";
+
+  watch { &dispell($h, $wiz) } { }, "dispell clear/uvar from $desc";
+
+  ok(!(B::svref_2object($h)->FLAGS & B::SVs_RMG()),
+                               "$desc no longer has the RMG flag set");
+ }
+}