Make the watch { } wrapper properly apply context

[perl/modules/Variable-Magic.git] / t / 34-glob.t

diff --git a/t/34-glob.t b/t/34-glob.t
index 664152da32bc9233af63939c10c6bd99e2df27fd..90821c5bf31498cef6049ef0486d85a6079b6fd7 100644 (file)
--- a/t/34-glob.t
+++ b/t/34-glob.t
@@ -5,36 +5,66 @@ use warnings;
 
 use Test::More;
 
-eval "use Symbol qw/gensym/";
-if ($@) {
- plan skip_all => "Symbol::gensym required for testing magic for globs";
-} else {
- plan tests => 2 * 8 + 1;
- diag "Using Symbol $Symbol::VERSION" if defined $Symbol::VERSION;
+BEGIN {
+ local $@;
+ if (eval "use Symbol qw<gensym>; 1") {
+  plan tests => 2 * 17 + 1;
+  defined and diag "Using Symbol $_" for $Symbol::VERSION;
+ } else {
+  plan skip_all => "Symbol::gensym required for testing magic for globs";
+ }
 }
 
-use Variable::Magic qw/cast dispell/;
+use Variable::Magic qw<cast dispell VMG_COMPAT_GLOB_GET>;
+
+my %get = VMG_COMPAT_GLOB_GET ? (get => 1) : ();
 
 use lib 't/lib';
 use Variable::Magic::TestWatcher;
 
 my $wiz = init_watcher
-        [ qw/get set len clear free copy dup local fetch store exists delete/ ],
+        [ qw<get set len clear free copy dup local fetch store exists delete> ],
         'glob';
 
 local *a = gensym();
 
-watch { cast *a, $wiz } { }, 'cast';
+watch { cast *a, $wiz } +{ }, 'cast';
+
+watch { local *b = *a } +{ %get }, 'assign to';
+
+SKIP: {
+ skip 'This failed temporarily between perls 5.13.1 and 5.13.8 (included)'
+                            => 5 * 2 if "$]" >= 5.013_001 and "$]" <= 5.013_008;
+
+ my $cxt = 'void contex';
+ my $exp = { set => 1 };
 
-watch { local *b = *a } { }, 'assign to';
+ watch { *a = \1 }          $exp, "assign scalar slot in $cxt";
+ watch { *a = [ qw<x y> ] } $exp, "assign array slot in $cxt";
+ watch { *a = { u => 1 } }  $exp, "assign hash slot in $cxt";
+ watch { *a = sub { } }     $exp, "assign code slot in $cxt";
+ watch { *a = gensym() }    $exp, "assign glob in $cxt";
+}
+
+{
+ my $cxt = 'scalar context';
+ my $exp = { %get, set => 1 };
+ my $v;
 
-watch { *a = gensym() } { set => 1 }, 'assign';
+ $v = watch { *a = \1 }          $exp, "assign scalar slot in $cxt";
+ $v = watch { *a = [ qw<x y> ] } $exp, "assign array slot in $cxt";
+ $v = watch { *a = { u => 1 } }  $exp, "assign hash slot in $cxt";
+ $v = watch { *a = sub { } }     $exp, "assign code slot in $cxt";
+ $v = watch { *a = gensym() }    $exp, "assign glob in $cxt";
+}
 
 watch {
  local *b = gensym();
- watch { cast *b, $wiz } { }, 'cast 2';
-} { }, 'scope end';
+ watch { cast *b, $wiz } +{ }, 'cast 2';
+} +{ }, 'scope end';
+
+%get = () if "$]" >= 5.013007;
 
-watch { undef *a } { }, 'undef';
+watch { undef *a } +{ %get }, 'undef';
 
-watch { dispell *a, $wiz } { }, 'dispell';
+watch { dispell *a, $wiz } +{ %get }, 'dispell';