Warning bit fixes to t/op/caller.t

[p5sagit/p5-mst-13.2.git] / t / op / state.t

diff --git a/t/op/state.t b/t/op/state.t
index 57b46ab..fb2880d 100644 (file)
--- a/t/op/state.t
+++ b/t/op/state.t
@@ -10,7 +10,7 @@ BEGIN {
 use strict;
 use feature "state";
 
-plan tests => 46;
+plan tests => 37;
 
 ok( ! defined state $uninit, q(state vars are undef by default) );
 
@@ -18,9 +18,9 @@ ok( ! defined state $uninit, q(state vars are undef by default) );
 
 sub stateful {
     state $x;
-    state $y = 1;
+    state $y //= 1;
     my $z = 2;
-    state ($t) = 3;
+    state ($t) //= 3;
     return ($x++, $y++, $z++, $t++);
 }
 
@@ -45,9 +45,9 @@ is( $t, 5, 'incremented state var, list syntax' );
 # in a nested block
 
 sub nesting {
-    state $foo = 10;
+    state $foo //= 10;
     my $t;
-    { state $bar = 12; $t = ++$bar }
+    { state $bar //= 12; $t = ++$bar }
     ++$foo;
     return ($foo, $t);
 }
@@ -83,7 +83,7 @@ is( $f2->(), 2, 'generator 2 once more' );
     sub TIESCALAR {bless {}};
     sub FETCH { ++$fetchcount; 18 };
     tie my $y, "countfetches";
-    sub foo { state $x = $y; $x++ }
+    sub foo { state $x //= $y; $x++ }
     ::is( foo(), 18, "initialisation with tied variable" );
     ::is( foo(), 19, "increments correctly" );
     ::is( foo(), 20, "increments correctly, twice" );
@@ -94,7 +94,7 @@ is( $f2->(), 2, 'generator 2 once more' );
 
 sub gen_cashier {
     my $amount = shift;
-    state $cash_in_store = 0;
+    state $cash_in_store;
     return {
        add => sub { $cash_in_store += $amount },
        del => sub { $cash_in_store -= $amount },
@@ -109,8 +109,7 @@ is( gen_cashier()->{bal}->(), 42, '$42 in my drawer' );
 # stateless assignment to a state variable
 
 sub stateless {
-    no warnings 'misc';
-    (state $reinitme, my $foo) = (42, 'bar');
+    state $reinitme = 42;
     ++$reinitme;
 }
 is( stateless(), 43, 'stateless function, first time' );
@@ -130,18 +129,6 @@ is( $xsize, 0, 'uninitialized state array' );
 $xsize = stateful_array();
 is( $xsize, 1, 'uninitialized state array after one iteration' );
 
-sub stateful_array_init {
-    state @x = (1, 2);
-    push @x, 'x';
-    return $#x;
-}
-
-$xsize = stateful_array_init();
-is( $xsize, 2, 'initialized state array' );
-
-$xsize = stateful_array_init();
-is( $xsize, 3, 'initialized state array after one iteration' );
-
 # hash state vars
 
 sub stateful_hash {
@@ -155,44 +142,6 @@ is( $xhval, 0, 'uninitialized state hash' );
 $xhval = stateful_hash();
 is( $xhval, 1, 'uninitialized state hash after one iteration' );
 
-sub stateful_hash_init {
-    state %hx = (foo => 10);
-    return $hx{foo}++;
-}
-
-$xhval = stateful_hash_init();
-is( $xhval, 10, 'initialized state hash' );
-
-$xhval = stateful_hash_init();
-is( $xhval, 11, 'initialized state hash after one iteration' );
-
-# state declaration with a list
-
-sub statelist {
-    # note that this should be a state assignment, while (state $lager, state $stout) shouldn't
-    state($lager, $stout) = (11, 22);
-    $lager++;
-    $stout++;
-    "$lager/$stout";
-}
-
-my $ls = statelist();
-is($ls, "12/23", 'list assignment to state scalars');
-$ls = statelist();
-is($ls, "13/24", 'list assignment to state scalars');
-
-sub statelist2 {
-    state($sherry, $bourbon) = (1 .. 2);
-    $sherry++;
-    $bourbon++;
-    "$sherry/$bourbon";
-}
-
-$ls = statelist2();
-is($ls, "2/3", 'list assignment to state scalars');
-$ls = statelist2();
-is($ls, "3/4", 'list assignment to state scalars');
-
 # Recursion
 
 sub noseworth {
@@ -208,4 +157,3 @@ noseworth(2);
 sub pugnax { my $x = state $y = 42; $y++; $x; }
 
 is( pugnax(), 42, 'scalar state assignment return value' );
-is( pugnax(), 43, 'scalar state assignment return value' );