use strict;
use warnings;
-use Test::More tests => 18;
+use Test::More tests => (2 * 24 + 7) + (2 * 5 + 5) + 1;
-use Variable::Magic qw/wizard cast dispell MGf_COPY VMG_UVAR/;
+use Variable::Magic qw<cast dispell VMG_UVAR>;
-my @c = (0) x 12;
-my @x = (0) x 12;
+use lib 't/lib';
+use Variable::Magic::TestWatcher;
-sub check {
- is join(':', map { (defined) ? $_ : 'u' } @c[0 .. 11]),
- join(':', map { (defined) ? $_ : 'u' } @x[0 .. 11]),
- $_[0];
+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 %h = %n;
+
+watch { cast %h, $wiz } { }, 'cast';
+
+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 = watch { exists $h{bar} } +{ (exists => 1) x VMG_UVAR },
+ "exists in scalar context ($_)";
+ ok $s, "hash: exists correctly ($_)";
}
-my $wiz = wizard get => sub { ++$c[0] },
- set => sub { ++$c[1] },
- len => sub { ++$c[2]; $_[2] },
- clear => sub { ++$c[3] },
- free => sub { ++$c[4] },
- copy => sub { ++$c[5] },
- dup => sub { ++$c[6] },
- local => sub { ++$c[7] },
- fetch => sub { ++$c[8] },
- store => sub { ++$c[9] },
- 'exists' => sub { ++$c[10] },
- 'delete' => sub { ++$c[11] };
-check('hash : create wizard');
-
-my %n = map { $_ => int rand 1000 } qw/foo bar baz qux/;
-my %a = %n;
-
-cast %a, $wiz;
-check('hash : cast');
-
-my $b = $a{foo};
-++$x[5] if MGf_COPY;
-++$x[8] if VMG_UVAR;
-check('hash : assign element to');
-
-my %b = %a;
-check('hash : assign to');
-
-$b = "X%{a}Y";
-check('hash : interpolate');
-
-$b = \%a;
-check('hash : reference');
-
-my @b = @a{qw/bar qux/};
-$x[5] += 2 if MGf_COPY;
-$x[8] += 2 if VMG_UVAR;
-check('hash : slice');
-
-%a = (a => 1, d => 3);
-++$x[3];
-$x[5] += 2 if VMG_UVAR;
-$x[9] += 2 if VMG_UVAR;
-check('hash : assign from list');
-
-%a = map { $_ => 1 } qw/a b d/;
-++$x[3];
-$x[5] += 3 if VMG_UVAR;
-$x[9] += 3 if VMG_UVAR;
-check('hash : assign from map');
-
-$a{d} = 2;
-++$x[5] if MGf_COPY;
-++$x[9] if VMG_UVAR;
-check('hash : assign old element');
-
-$a{c} = 3;
-++$x[5] if MGf_COPY;
-++$x[9] if VMG_UVAR;
-check('hash : assign new element');
-
-$b = %a;
-check('hash : buckets');
-
-@b = keys %a;
-check('hash : keys');
-
-@b = values %a;
-check('hash : values');
-
-while (my ($k, $v) = each %a) { }
-check('hash : each');
-
-{
+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';
+
+@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';
+
+watch { $h{d} = 2 } +{ (store => 1) x VMG_UVAR },
+ 'assign old element';
+
+watch { $h{c} = 3 } +{ (store => 1, copy => 1) x VMG_UVAR },
+ 'assign new element';
+
+$s = watch { %h } { }, 'buckets';
+
+@b = watch { keys %h } { }, 'keys';
+is_deeply [ sort @b ], [ qw<a b c d> ], 'hash: keys correctly';
+
+@b = watch { values %h } { }, 'values';
+is_deeply [ sort { $a <=> $b } @b ], [ 1, 1, 2, 3 ], 'hash: values correctly';
+
+watch { while (my ($k, $v) = each %h) { } } { }, 'each';
+
+watch {
my %b = %n;
- cast %b, $wiz;
-}
-++$x[4];
-check('hash : scope end');
+ watch { cast %b, $wiz } { }, 'cast 2';
+} { free => 1 }, 'scope end';
+
+watch { undef %h } { clear => 1 }, 'undef';
+
+watch { dispell %h, $wiz } { }, 'dispell';
+
+SKIP: {
+ my $SKIP;
+
+ if (!VMG_UVAR) {
+ $SKIP = 'uvar magic';
+ } else {
+ local $@;
+ unless (eval { require B::Deparse; 1 }) {
+ $SKIP = 'B::Deparse';
+ }
+ }
+ if ($SKIP) {
+ $SKIP .= ' required to test uvar/clear interaction fix';
+ skip $SKIP => 2 * 5 + 5;
+ }
+
+ my $bd = B::Deparse->new;
-undef %a;
-++$x[3];
-check('hash : undef');
+ my %h = (a => 13, b => 15);
+ watch { cast %h, $wiz } { }, 'cast clear/uvar';
-dispell %a, $wiz;
-check('hash : dispel');
+ my $code = sub { my $x = $h{$_[0]}; ++$x; $x };
+ my $before = $bd->coderef2text($code);
+ my $res;
+
+ watch { $res = $code->('a') } { fetch => 1 }, 'fixed fetch "a"';
+ is $res, 14, 'uvar: fixed fetch "a" returned the right thing';
+
+ my $after = $bd->coderef2text($code);
+ is $before, $after, 'uvar: fixed fetch deparse correctly';
+
+ watch { $res = $code->('b') } { fetch => 1 }, 'fixed fetch "b"';
+ is $res, 16, 'uvar: fixed fetch "b" returned the right thing';
+
+ $after = $bd->coderef2text($code);
+ is $before, $after, 'uvar: fixed fetch deparse correctly';
+
+ watch { %h = () } { clear => 1 }, 'fixed clear';
+
+ watch { dispell %h, $wiz } { }, 'dispell clear/uvar';
+
+ require B;
+ ok(!(B::svref_2object(\%h)->FLAGS & B::SVs_RMG()), '%h no longer has the RMG flag set');
+}
projects / perl / modules / Variable-Magic.git / blobdiff