X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F18-opinfo.t;h=bcc70a0b8355ecc96198d4d5da3dc4e2e7af664c;hb=HEAD;hp=ff663150ac913940965f0ec0dc10640840daa878;hpb=7afdaf8f49acc22b13ccfcee9bc03045d0a88036;p=perl%2Fmodules%2FVariable-Magic.git diff --git a/t/18-opinfo.t b/t/18-opinfo.t index ff66315..0013345 100644 --- a/t/18-opinfo.t +++ b/t/18-opinfo.t @@ -3,7 +3,7 @@ use strict; use warnings; -use Test::More tests => 18 * (3 + 4) + 5 + 1; +use Test::More tests => 19 * (3 + 4) + 5 + 1; use Config qw<%Config>; @@ -16,11 +16,22 @@ my $is_5130_release = ("$]" == 5.013 && !$Config{git_describe}) ? 1 : 0; my $aelem = "$]" <= 5.008_003 ? 'aelem' : ("$]" < 5.013 or $is_5130_release) ? 'aelemfast' - : 'sassign'; -my $aelemf = ("$]" < 5.013 or $is_5130_release) ? 'aelemfast' : 'sassign'; -my $aelemf_op = ($aelemf eq 'sassign') - ? 'B::BINOP' : $Config{useithreads} ? 'B::PADOP' : 'B::SVOP'; + : ("$]" < 5.037_003) + ? 'sassign' + : 'padsv_store'; +my $aelemf = ("$]" < 5.013 or $is_5130_release) ? 'aelemfast' + : ("$]" < 5.037_003) ? 'sassign' + : 'padsv_store'; + +my $assign_op = ("$]" < 5.037_003) ? 'sassign': 'padsv_store'; +my $assign_op_cl = ("$]" < 5.037_003) ? 'B::BINOP': 'B::UNOP'; + +my $aelemf_op = ($aelemf eq 'sassign') ? 'B::BINOP' + : ($aelemf eq 'padsv_store') ? 'B::UNOP' + : $Config{useithreads} ? 'B::PADOP' : 'B::SVOP'; my $meth_op = ("$]" < 5.021_005) ? 'B::SVOP' : 'B::METHOP'; +my $trutf_op = ($Config{useithreads} && "$]" >= 5.008_009) + ? 'B::PADOP' : 'B::SVOP'; my $deref = ("$]" < 5.021_007) ? 'helem' : 'multideref'; my $deref_op = ($deref eq 'multideref') ? 'B::UNOP_AUX' : 'B::UNOP'; @@ -28,13 +39,15 @@ our @o; my @tests = ( [ 'len', '@c', 'my @c', 'my $x = @c', [ 'padav', 'B::OP' ] ], - [ 'get', '$c[0]', 'my @c', 'my $x = $c[0]', [ $aelem, 'B::OP' ] ], - [ 'get', '$o[0]', 'local @o', 'my $x = $o[0]', [ $aelemf, $aelemf_op ] ], + [ 'get', '$c[0]', 'my @c', 'my $x = $c[0]; 1', + [ $aelem, 'B::OP' ] ], + [ 'get', '$o[0]', 'local @o', 'my $x = $o[0]; 1', + [ $aelemf, $aelemf_op ] ], [ 'get', '$x->{a}', 'my $x', 'my $y = $x->{a}{b}', [ $deref, $deref_op ] ], [ 'get', '$c', 'my $c = 1', '++$c', [ 'preinc', 'B::UNOP' ] ], [ 'get', '$c', 'my $c = 1', '$c ** 2', [ 'pow', 'B::BINOP' ] ], - [ 'get', '$c', 'my $c = 1', 'my $x = $c', [ 'sassign', 'B::BINOP' ] ], + [ 'get', '$c', 'my $c = 1', 'my $x = $c; 1', [ $assign_op, $assign_op_cl ] ], [ 'get', '$c', 'my $c = 1', '1 if $c', [ 'and', 'B::LOGOP' ] ], [ 'get', '$c', 'my $c = []', 'ref $c', [ 'ref', 'B::UNOP' ] ], [ 'get', '$c', 'my $c = $0', '-f $c', [ 'ftfile', 'B::UNOP' ] ], @@ -46,6 +59,8 @@ my @tests = ( [ 'get', '$c', 'my $c = "Variable::Magic::TestPkg"', '$c->foo()', [ 'method_named', $meth_op ] ], [ 'get', '$c', 'my $c = ""', '$c =~ y/x/y/', [ 'trans', 'B::PVOP' ] ], + [ 'get', '$c', 'my $c = ""', '$c =~ y/\x{100}//', + [ 'trans', $trutf_op ] ], [ 'get', '$c', 'my $c = 1', '1 for 1 .. $c', [ 'enteriter', 'B::LOOP' ] ], [ 'free','$c', 'my $c = 1', 'last', [ 'last', 'B::OP' ] ],