Retract #10324 and #10333; not needed.

[perl5.git] / t / op / goto.t

diff --git a/t/op/goto.t b/t/op/goto.t
index 8096aff..b2e5b2c 100755 (executable)
--- a/t/op/goto.t
+++ b/t/op/goto.t
@@ -2,7 +2,7 @@
 
 # "This IS structured code.  It's just randomly structured."
 
-print "1..13\n";
+print "1..22\n";
 
 while ($?) {
     $foo = 1;
@@ -30,8 +30,8 @@ print "#2\t:$foo: == 4\n";
 if ($foo == 4) {print "ok 2\n";} else {print "not ok 2\n";}
 
 $PERL = ($^O eq 'MSWin32') ? '.\perl' : './perl';
-$x = `$PERL -e "goto foo;" 2>&1`;
-if ($x =~ /DCL-W-NOCOMD/) { $x = `\$ mcr sys\$disk:[]perl. -e "goto foo;"`; }
+$CMD = qq[$PERL -e "goto foo;" 2>&1 ];
+$x = `$CMD`;
 
 if ($x =~ /label/) {print "ok 3\n";} else {print "not ok 3\n";}
 
@@ -55,6 +55,95 @@ exit;
 
 FINALE:
 print "ok 13\n";
+
+# does goto LABEL handle block contexts correctly?
+
+my $cond = 1;
+for (1) {
+    if ($cond == 1) {
+       $cond = 0;
+       goto OTHER;
+    }
+    elsif ($cond == 0) {
+      OTHER:
+       $cond = 2;
+       print "ok 14\n";
+       goto THIRD;
+    }
+    else {
+      THIRD:
+       print "ok 15\n";
+    }
+}
+print "ok 16\n";
+
+# Does goto work correctly within a for(;;) loop?
+#  (BUG ID 20010309.004)
+
+for(my $i=0;!$i++;) {
+  my $x=1;
+  goto label;
+  label: print (defined $x?"ok ": "not ok ", "17\n")
+}
+
+# Does goto work correctly going *to* a for(;;) loop?
+#  (make sure it doesn't skip the initializer)
+
+my ($z, $y) = (0);
+FORL1: for($y="ok 18\n"; $z;) {print $y; goto TEST19}
+($y,$z) = ("not ok 18\n", 1);
+goto FORL1;
+
+# Even from within the loop?
+
+TEST19: $z = 0;
+FORL2: for($y="ok 19\n"; 1;) {
+  if ($z) {
+    print $y;
+    last;
+  }
+  ($y, $z) = ("not ok 19\n", 1);
+  goto FORL2;
+}
+
+# Does goto work correctly within a try block?
+#  (BUG ID 20000313.004)
+
+my $ok = 0;
+eval {
+  my $variable = 1;
+  goto LABEL20;
+  LABEL20: $ok = 1 if $variable;
+};
+print ($ok&&!$@ ? "ok 20\n" : "not ok 20\n");
+
+# And within an eval-string?
+
+
+$ok = 0;
+eval q{
+  my $variable = 1;
+  goto LABEL21;
+  LABEL21: $ok = 1 if $variable;
+};
+print ($ok&&!$@ ? "ok 21\n" : "not ok 21\n");
+
+
+# Test that goto works in nested eval-string
+$ok = 0;
+{eval q{
+  eval q{
+    goto LABEL22;
+  };
+  $ok = 0;
+  last;
+
+  LABEL22: $ok = 1;
+};
+$ok = 0 if $@;
+}
+print ($ok ? "ok 22\n" : "not ok 22\n");
+
 exit;
 
 bypass: