In review, Tony Cook recommended converting two tests from 'package

block' syntax ('package Foo {}') to 'inline package' syntax ('package
Foo; ...').

However, keeping these two tests in a file specifically aimed at testing
package block syntax felt awkward.  Since what we're now focusing on in
the behavior of 'goto', these two tests were moved to the principal file
testing that function.

The tests were updated to use t/test.pl functions and were re-indented
to make the labeling more self-documenting.

Author: jkeenan

t/comp/package_block.t

@@ -1,6 +1,6 @@
 #!./perl
 
-print "1..7\n";
+print "1..5\n";
 
 $main::result = "";
 eval q{
@@ -56,32 +56,4 @@ eval q{
 };
 print $main::result eq "a(2)b(4)c(6)d(8)e(10)f(12)" ? "ok 5\n" : "not ok 5\n";
 
-$main::result = "";
-$main::warning = "";
-$SIG{__WARN__} = sub { $main::warning .= $_[0]; };
-eval q{
-    $main::result .= "a(".__PACKAGE__."/".eval("__PACKAGE__").")";
-    goto l0;
-    $main::result .= "b(".__PACKAGE__."/".eval("__PACKAGE__").")";
-    package Foo {
-	$main::result .= "c(".__PACKAGE__."/".eval("__PACKAGE__").")";
-	l0:
-	$main::result .= "d(".__PACKAGE__."/".eval("__PACKAGE__").")";
-	goto l1;
-	$main::result .= "e(".__PACKAGE__."/".eval("__PACKAGE__").")";
-    }
-    $main::result .= "f(".__PACKAGE__."/".eval("__PACKAGE__").")";
-    l1:
-    $main::result .= "g(".__PACKAGE__."/".eval("__PACKAGE__").")";
-    goto l2;
-    $main::result .= "h(".__PACKAGE__."/".eval("__PACKAGE__").")";
-    package Bar {
-	l2:
-	$main::result .= "i(".__PACKAGE__."/".eval("__PACKAGE__").")";
-    }
-    $main::result .= "j(".__PACKAGE__."/".eval("__PACKAGE__").")";
-};
-print $main::result eq "a(main/main)" ?  "ok 6\n" : "not ok 6\n";
-print $main::warning eq '' ? "ok 7\n" : "not ok 7\n";
-
 1;

t/op/goto.t

@@ -12,7 +12,7 @@ BEGIN {
 use warnings;
 use strict;
 use Config;
-plan tests =>  47;
+plan tests =>  49;
 
 our $TODO;
 
@@ -204,7 +204,7 @@ EOT
 close $f;
 
 $r = runperl(prog => 'BEGIN { unshift @INC, q[.] } use Op_goto01; print qq[DONE\n]');
-is($r, "OK\nDONE\n", "goto within use-d file"); 
+is($r, "OK\nDONE\n", "goto within use-d file");
 unlink_all "Op_goto01.pm";
 
 # test for [perl #24108]
@@ -489,3 +489,42 @@ sub _routine {
 _routine();
 pass("bug 132799");
 
+{
+    # tests of __PACKAGE__ syntax:
+    # 2 tests moved from t/comp/package_block.t and modified to use inline
+    # package syntax
+
+    $main::result = "";
+    $main::warning = "";
+    $SIG{__WARN__} = sub { $main::warning .= $_[0]; };
+    eval q{
+        $main::result .= "a(".__PACKAGE__."/".eval("__PACKAGE__").")";
+        goto l0;
+        $main::result .= "b(".__PACKAGE__."/".eval("__PACKAGE__").")";
+
+        package Foo;
+        $main::result .= "c(".__PACKAGE__."/".eval("__PACKAGE__").")";
+        l0:
+            $main::result .= "d(".__PACKAGE__."/".eval("__PACKAGE__").")";
+            goto l1;
+        $main::result .= "e(".__PACKAGE__."/".eval("__PACKAGE__").")";
+
+        package main;
+        $main::result .= "f(".__PACKAGE__."/".eval("__PACKAGE__").")";
+        l1:
+            $main::result .= "g(".__PACKAGE__."/".eval("__PACKAGE__").")";
+            goto l2;
+        $main::result .= "h(".__PACKAGE__."/".eval("__PACKAGE__").")";
+
+        package Bar;
+        l2:
+            $main::result .= "i(".__PACKAGE__."/".eval("__PACKAGE__").")";
+
+        package main;
+        $main::result .= "j(".__PACKAGE__."/".eval("__PACKAGE__").")";
+    };
+    my $expected = 'a(main/main)d(Foo/Foo)g(main/main)i(Bar/Bar)j(main/main)';
+    is($main::result, $expected, "Got expected");
+    ok(! $main::warning, "Jumping into labels in different packages ran without warnings");
+}
+