X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F18-opinfo.t;h=ff663150ac913940965f0ec0dc10640840daa878;hb=7afdaf8f49acc22b13ccfcee9bc03045d0a88036;hp=6cf87680ad31fe2912f988e0936b3e2d4b79afd5;hpb=19b708934684141b9dc4b99c8a75165c2d3daabf;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/18-opinfo.t b/t/18-opinfo.t
index 6cf8768..ff66315 100644
--- a/t/18-opinfo.t
+++ b/t/18-opinfo.t
@@ -3,55 +3,64 @@
 use strict;
 use warnings;
 
-use Test::More tests => 17 * (3 + 4) + 5 + 1;
+use Test::More tests => 18 * (3 + 4) + 5 + 1;
 
-use Config qw/%Config/;
+use Config qw<%Config>;
 
-use Variable::Magic qw/wizard cast dispell VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT/;
+use Variable::Magic qw<wizard cast dispell VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT>;
 
 sub Variable::Magic::TestPkg::foo { }
 
-my $is_5130_release = ($] == 5.013 && !$Config{git_describe}) ? 1 : 0;
+my $is_5130_release = ("$]" == 5.013 && !$Config{git_describe}) ? 1 : 0;
 
-my $aelem     = $] <= 5.008003 ? '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'
+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';
+my $meth_op   = ("$]" < 5.021_005) ? 'B::SVOP' : 'B::METHOP';
+my $deref     = ("$]" < 5.021_007) ? 'helem' : 'multideref';
+my $deref_op  = ($deref eq 'multideref') ? 'B::UNOP_AUX' : 'B::UNOP';
 
 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',    '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', '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'   ] ],
+ [ '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', '$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',  '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'   ] ],
  [ 'get', '$c',    'my $c = "Z"',
                    'my $i = 1; Z:goto $c if $i--', [ 'goto',    'B::UNOP'   ] ],
- [ 'set', '$c',    'my $c = 1', 'bless \$c, "main"',
+ [ 'set', '$c',    'my $c = 1',  'bless \$c, "main"',
                                                    [ 'bless',   'B::LISTOP' ] ],
- [ 'get', '$c',    'my $c = ""','$c =~ /x/',       [ 'match',   'B::PMOP'   ] ],
+ [ 'get', '$c',    'my $c = ""', '$c =~ /x/',      [ 'match',   'B::PMOP'   ] ],
  [ 'get', '$c',    'my $c = "Variable::Magic::TestPkg"',
-                                '$c->foo()',  [ 'method_named', 'B::SVOP'   ] ],
- [ 'get', '$c',    'my $c = ""','$c =~ y/x/y/',    [ 'trans',   'B::PVOP'   ] ],
- [ 'get', '$c',    'my $c = 1', '1 for 1 .. $c',
+                                 '$c->foo()', [ 'method_named', $meth_op    ] ],
+ [ 'get', '$c',    'my $c = ""', '$c =~ y/x/y/',   [ 'trans',   'B::PVOP'   ] ],
+ [ 'get', '$c',    'my $c = 1',  '1 for 1 .. $c',
                                                  [ 'enteriter', 'B::LOOP'   ] ],
- [ 'free','$c',    'my $c = 1', 'last',            [ 'last',    'B::OP'     ] ],
- [ 'free','$c', 'L:{my $c = 1', 'last L}',         [ 'last',    'B::OP'     ] ],
+ [ 'free','$c',    'my $c = 1',  'last',           [ 'last',    'B::OP'     ] ],
+ [ 'free','$c', 'L:{my $c = 1',  'last L}',        [ 'last',    'B::OP'     ] ],
 );
 
 our $done;
 
+my $OP_INFO_NAME   = VMG_OP_INFO_NAME;
+my $OP_INFO_OBJECT = VMG_OP_INFO_OBJECT;
+
 for (@tests) {
  my ($key, $var, $init, $test, $exp) = @$_;
 
- for my $op_info (VMG_OP_INFO_NAME, VMG_OP_INFO_OBJECT) {
+ for my $op_info ($OP_INFO_NAME, $OP_INFO_OBJECT) {
   my $wiz;
 
   # We must test for the $op correctness inside the callback because, if we
@@ -62,9 +71,9 @@ for (@tests) {
     return if $done;
     my $op = $_[-1];
     my $desc = "$key magic with op_info == $op_info";
-    if ($op_info == VMG_OP_INFO_NAME) {
+    if ($op_info == $OP_INFO_NAME) {
      is $op, $exp->[0], "$desc gets the right op info";
-    } elsif ($op_info == VMG_OP_INFO_OBJECT) {
+    } elsif ($op_info == $OP_INFO_OBJECT) {
      isa_ok $op, $exp->[1], $desc;
      is $op->name, $exp->[0], "$desc gets the right op info";
     } else {