Move 10 more tests

Author: jkeenan

t/op/goto-amp-name.t

@@ -11,7 +11,7 @@ use warnings;
 use strict;
 use Config;
 #plan tests => 'no_plan'; # yet
-plan tests => 12;
+plan tests => 22;
 our $TODO;
 
 # Excerpts from 'perldoc -f goto' as of perl-5.40.1 (Aug 2025)
@@ -57,6 +57,75 @@ local $SIG{__WARN__} = sub {
 
 our $foo;
 
+###################
+
+# goto &foo not allowed in evals
+
+sub null { 1 };
+eval 'goto &null';
+like($@, qr/Can't goto subroutine from an eval-string/, 'eval string');
+eval { goto &null };
+like($@, qr/Can't goto subroutine from an eval-block/, 'eval block');
+ 
+# goto &foo leaves @_ alone when called from a sub
+sub returnarg { $_[0] };
+is sub {
+    local *_ = ["ick and queasy"];
+    goto &returnarg;
+}->("quick and easy"), "ick and queasy",
+  'goto &foo with *_{ARRAY} replaced';
+my @__ = byte_utf8a_to_utf8n("\xc4\x80");
+sub { local *_ = \@__; goto &utf8::decode }->("no thinking aloud");
+is "@__", chr 256, 'goto &xsub with replaced *_{ARRAY}';
+
+# And goto &foo should leave reified @_ alone
+sub { *__ = \@_;  goto &null } -> ("rough and tubbery");
+is ${*__}[0], 'rough and tubbery', 'goto &foo leaves reified @_ alone';
+
+# goto &xsub when @_ has nonexistent elements
+{
+    no warnings "uninitialized";
+    local @_ = ();
+    $#_++;
+    & {sub { goto &utf8::encode }};
+    is @_, 1, 'num of elems in @_ after goto &xsub with nonexistent $_[0]';
+    is $_[0], "", 'content of nonexistent $_[0] is modified by goto &xsub';
+}
+
+# goto &xsub when @_ itself does not exist
+undef *_;
+eval { & { sub { goto &utf8::encode } } };
+# The main thing we are testing is that it did not crash.  But make sure 
+# *_{ARRAY} was untouched, too.
+is *_{ARRAY}, undef, 'goto &xsub when @_ does not exist';
+
+# goto &perlsub when @_ itself does not exist [perl #119949]
+# This was only crashing when the replaced sub call had an argument list.
+# (I.e., &{ sub { goto ... } } did not crash.)
+sub {
+    undef *_;
+    goto sub {
+	is *_{ARRAY}, undef, 'goto &perlsub when @_ does not exist';
+    }
+}->();
+sub {
+    local *_;
+    goto sub {
+	is *_{ARRAY}, undef, 'goto &sub when @_ does not exist (local *_)';
+    }
+}->();
+
+
+
+
+
+
+
+
+
+
+
+
 # [perl #36521] goto &foo in warn handler could defeat recursion avoider
 
 {

t/op/goto.t

@@ -13,7 +13,7 @@ use warnings;
 use strict;
 use Config;
 #plan tests => 134;
-plan tests => 123;
+plan tests => 113;
 our $TODO;
 
 my $deprecated = 0;
@@ -540,73 +540,7 @@ a32039();
     is($r, "ok\n", 'redo and goto');
 }
 
-# goto &foo not allowed in evals
-
-sub null { 1 };
-eval 'goto &null';
-like($@, qr/Can't goto subroutine from an eval-string/, 'eval string');
-eval { goto &null };
-like($@, qr/Can't goto subroutine from an eval-block/, 'eval block');
- 
-# goto &foo leaves @_ alone when called from a sub
-sub returnarg { $_[0] };
-is sub {
-    local *_ = ["ick and queasy"];
-    goto &returnarg;
-}->("quick and easy"), "ick and queasy",
-  'goto &foo with *_{ARRAY} replaced';
-my @__ = byte_utf8a_to_utf8n("\xc4\x80");
-sub { local *_ = \@__; goto &utf8::decode }->("no thinking aloud");
-is "@__", chr 256, 'goto &xsub with replaced *_{ARRAY}';
-
-# And goto &foo should leave reified @_ alone
-sub { *__ = \@_;  goto &null } -> ("rough and tubbery");
-is ${*__}[0], 'rough and tubbery', 'goto &foo leaves reified @_ alone';
-
-# goto &xsub when @_ has nonexistent elements
-{
-    no warnings "uninitialized";
-    local @_ = ();
-    $#_++;
-    & {sub { goto &utf8::encode }};
-    is @_, 1, 'num of elems in @_ after goto &xsub with nonexistent $_[0]';
-    is $_[0], "", 'content of nonexistent $_[0] is modified by goto &xsub';
-}
-
-# goto &xsub when @_ itself does not exist
-undef *_;
-eval { & { sub { goto &utf8::encode } } };
-# The main thing we are testing is that it did not crash.  But make sure 
-# *_{ARRAY} was untouched, too.
-is *_{ARRAY}, undef, 'goto &xsub when @_ does not exist';
-
-# goto &perlsub when @_ itself does not exist [perl #119949]
-# This was only crashing when the replaced sub call had an argument list.
-# (I.e., &{ sub { goto ... } } did not crash.)
-sub {
-    undef *_;
-    goto sub {
-	is *_{ARRAY}, undef, 'goto &perlsub when @_ does not exist';
-    }
-}->();
-sub {
-    local *_;
-    goto sub {
-	is *_{ARRAY}, undef, 'goto &sub when @_ does not exist (local *_)';
-    }
-}->();
-
-
-## [perl #36521] goto &foo in warn handler could defeat recursion avoider
-#
-#{
-#    my $r = runperl(
-#		stderr => 1,
-#		prog => 'my $d; my $w = sub { return if $d++; warn q(bar)}; local $SIG{__WARN__} = sub { goto &$w; }; warn q(foo);'
-#    );
-#    like($r, qr/bar/, "goto &foo in warn");
-#}
-#
+
 TODO: {
     local $TODO = "[perl #43403] goto() from an if to an else doesn't undo local () changes";
     our $global = "unmodified";