use strict;
use warnings;
-use Variable::Magic qw<
- wizard cast dispell getdata
- VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT
->;
-
use lib 't/lib';
use VPIT::TestHelpers (
threads => [ 'Variable::Magic' => 'Variable::Magic::VMG_THREADSAFE()' ],
my $c = 0;
my $wiz;
+ {
+ local $@;
+ eval { require Variable::Magic; 1 } or return;
+ }
+
{
local $@;
$wiz = eval {
- wizard(
+ Variable::Magic::wizard(
data => sub { $_[1] + $tid },
get => sub { ++$c; 0 },
set => sub {
my $op = $_[-1];
- if ($op_info == VMG_OP_INFO_OBJECT) {
+ my $assign_op = ("$]" < 5.037_003) ? 'sassign': 'padsv_store';
+ my $assign_op_cl = ("$]" < 5.037_003) ? 'B::BINOP': 'B::UNOP';
+
+ if ($op_info eq 'object') {
is_deeply { class => ref($op), name => $op->name },
- { class => 'B::BINOP', name => 'sassign' },
+ { class => $assign_op_cl, name => $assign_op },
"op object in thread $tid is correct";
} else {
- is $op, 'sassign', "op name in thread $tid is correct";
+ is $op, $assign_op, "op name in thread $tid is correct";
}
return 0;
},
free => sub { lock $destroyed; ++$destroyed; 0 },
- op_info => $op_info,
+ op_info => $op_info eq 'object' ? Variable::Magic::VMG_OP_INFO_OBJECT()
+ : Variable::Magic::VMG_OP_INFO_NAME()
);
};
is $@, '', "wizard in thread $tid doesn't croak";
{
local $@;
- my $res = eval { cast $a, $wiz, sub { 5 }->() };
+ my $res = eval { &Variable::Magic::cast(\$a, $wiz, sub { 5 }->()) };
is $@, '', "cast in thread $tid doesn't croak";
is $c, 0, "cast in thread $tid doesn't trigger magic";
}
{
local $@;
- my $d = eval { getdata $a, $wiz };
+ my $d = eval { &Variable::Magic::getdata(\$a, $wiz) };
is $@, '', "getdata in thread $tid doesn't croak";
is $d, 5 + $tid, "getdata in thread $tid returns the right thing";
is $c, 1, "getdata in thread $tid doesn't trigger magic";
if ($dispell) {
{
local $@;
- my $res = eval { dispell $a, $wiz };
+ my $res = eval { &Variable::Magic::dispell(\$a, $wiz) };
is $@, '', "dispell in thread $tid doesn't croak";
is $c, 1, "dispell in thread $tid doesn't trigger magic";
}
is $c, 1, "get in thread $tid after dispell doesn't trigger magic";
}
}
- return; # Ugly if not here
+
+ return 1;
}
for my $dispell (1, 0) {
$destroyed = 0;
}
- my @threads = map spawn(\&try, $dispell, $_),
- (VMG_OP_INFO_NAME) x 2, (VMG_OP_INFO_OBJECT) x 2;
- $_->join for @threads;
+ my $completed = 0;
+
+ my @threads = map spawn(\&try, $dispell, $_), ('name') x 2, ('object') x 2;
+ for my $thr (@threads) {
+ my $res = $thr->join;
+ $completed += $res if defined $res;
+ }
{
lock $destroyed;
- is $destroyed, (1 - $dispell) * 4, 'destructors';
+ is $destroyed, (1 - $dispell) * $completed, 'destructors';
}
}