X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F18-opinfo.t;h=0293c645016b41a3124c047753b83063afc47cea;hb=a5ab162c9a0aa14e6caccd7104d719912115898f;hp=c03c3de6b33b88af50906c8ca40e526376d881a4;hpb=9e5f73e086da2d2ebab9a8fee2bcb3e64d2cab3d;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/18-opinfo.t b/t/18-opinfo.t
index c03c3de..0293c64 100644
--- a/t/18-opinfo.t
+++ b/t/18-opinfo.t
@@ -3,32 +3,44 @@
 use strict;
 use warnings;
 
-use Test::More tests => 14 * (3 + 4) + 5;
+use Test::More tests => 17 * (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 $aelem    = $] <= 5.008003 ? 'aelem' : 'aelemfast';
-my $aelem_op = $Config{useithreads} ? 'B::PADOP' : 'B::SVOP';
+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';
+my $meth_op   = ("$]" < 5.021_005) ? 'B::SVOP' : 'B::METHOP';
 
 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]', [ 'aelemfast', $aelem_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'   ] ],
+ [ 'get', '$c',    'my $c = "Z"',
+                   'my $i = 1; Z:goto $c if $i--', [ 'goto',    'B::UNOP'   ] ],
  [ 'set', '$c',    'my $c = 1', 'bless \$c, "main"',
                                                    [ 'bless',   'B::LISTOP' ] ],
  [ 'get', '$c',    'my $c = ""','$c =~ /x/',       [ 'match',   'B::PMOP'   ] ],
  [ 'get', '$c',    'my $c = "Variable::Magic::TestPkg"',
-                                '$c->foo()',  [ 'method_named', 'B::SVOP'   ] ],
+                                '$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'   ] ],
@@ -96,3 +108,13 @@ for (@tests) {
  eval { dispell $c, $wiz };
  is $@, '', "get dispell with out of bounds op_info doesn't croak";
 }
+
+{
+ local $@;
+ my $wiz = eval {
+  local $SIG{__WARN__} = sub { die @_ };
+  wizard op_info => "hlagh";
+ };
+ like $@, qr/^Argument "hlagh" isn't numeric in subroutine entry at \Q$0\E/,
+      'wizard(op_info => "text") throws numeric warnings';
+}