diff options
| -rw-r--r-- | lib/Tie/Array.pm | 3 | ||||
| -rwxr-xr-x | t/op/splice.t | 16 |
2 files changed, 16 insertions, 3 deletions
diff --git a/lib/Tie/Array.pm b/lib/Tie/Array.pm index 8821783cfa..7703c13d9a 100644 --- a/lib/Tie/Array.pm +++ b/lib/Tie/Array.pm @@ -11,7 +11,6 @@ sub DESTROY { } sub EXTEND { } sub UNSHIFT { scalar shift->SPLICE(0,0,@_) } sub SHIFT { shift->SPLICE(0,1) } -#sub SHIFT { (shift->SPLICE(0,1))[0] } sub CLEAR { shift->STORESIZE(0) } sub PUSH @@ -70,7 +69,7 @@ sub SPLICE { for (my $i=0; $i < @_; $i++) { $obj->STORE($off+$i,$_[$i]); } - return @result; + return wantarray ? @result : pop @result; } sub EXISTS { diff --git a/t/op/splice.t b/t/op/splice.t index 3b4229a031..d1bfe999e5 100755 --- a/t/op/splice.t +++ b/t/op/splice.t @@ -1,6 +1,6 @@ #!./perl -print "1..10\n"; +print "1..12\n"; @a = (1..10); @@ -37,4 +37,18 @@ print "ok 9\n"; print "not " unless j(splice(@a)) eq j(1,2,7,3) && j(@a) eq ''; print "ok 10\n"; +# Tests 11 and 12: +# [ID 20010711.005] in Tie::Array, SPLICE ignores context, breaking SHIFT + +my $foo; + +@a = ('red', 'green', 'blue'); +$foo = splice @a, 1, 2; +print "not " unless $foo eq 'blue'; +print "ok 11\n"; + +@a = ('red', 'green', 'blue'); +$foo = shift @a; +print "not " unless $foo eq 'red'; +print "ok 12\n"; |