Tidy indents and leading whitespace

Since we'll probably be doing a lot of work on this file, let's start by
standardizing on 4 spaces for indents, uncuddling else's, etc.

Author: jkeenan

t/op/goto.t

@@ -6,7 +6,7 @@ BEGIN {
     chdir 't' if -d 't';
     require "./test.pl";
     set_up_inc( qw(. ../lib) );
-	require './charset_tools.pl';
+    require './charset_tools.pl';
 }
 
 use warnings;
@@ -22,7 +22,8 @@ while ($?) {
   label1:
     $foo = 2;
     goto label2;
-} continue {
+}
+continue {
     $foo = 0;
     goto label4;
   label3:
@@ -67,20 +68,20 @@ my $count = 0;
 my $cond = 1;
 for (1) {
     if ($cond == 1) {
-	$cond = 0;
-	goto OTHER;
+        $cond = 0;
+        goto OTHER;
     }
     elsif ($cond == 0) {
       OTHER:
-	$cond = 2;
-	is($count, 0, 'OTHER');
-	$count++;
-	goto THIRD;
+        $cond = 2;
+        is($count, 0, 'OTHER');
+        $count++;
+        goto THIRD;
     }
     else {
-      THIRD:
-	is($count, 1, 'THIRD');
-	$count++;
+        THIRD:
+        is($count, 1, 'THIRD');
+        $count++;
     }
 }
 is($count, 2, 'end of loop');
@@ -89,9 +90,9 @@ is($count, 2, 'end of loop');
 #  (BUG ID 20010309.004 (#5998))
 
 for(my $i=0;!$i++;) {
-  my $x=1;
-  goto label;
-  label: is($x, 1, 'goto inside a for(;;) loop body from inside the body');
+    my $x=1;
+    goto label;
+    label: is($x, 1, 'goto inside a for(;;) loop body from inside the body');
 }
 
 # Does goto work correctly going *to* a for(;;) loop?
@@ -100,55 +101,57 @@ for(my $i=0;!$i++;) {
 my ($z, $y) = (0);
 FORL1: for ($y=1; $z;) {
     ok($y, 'goto a for(;;) loop, from outside (does initializer)');
-    goto TEST19}
+    goto TEST19
+}
 ($y,$z) = (0, 1);
 goto FORL1;
 
 # Even from within the loop?
 TEST19: $z = 0;
 FORL2: for($y=1; 1;) {
-  if ($z) {
-    ok($y, 'goto a for(;;) loop, from inside (does initializer)');
-    last;
-  }
-  ($y, $z) = (0, 1);
-  goto FORL2;
+    if ($z) {
+        ok($y, 'goto a for(;;) loop, from inside (does initializer)');
+        last;
+    }
+    ($y, $z) = (0, 1);
+    goto FORL2;
 }
 
 # Does goto work correctly within a try block?
 #  (BUG ID 20000313.004) - [perl #2359]
 my $ok = 0;
 eval {
-  my $variable = 1;
-  goto LABEL20;
-  LABEL20: $ok = 1 if $variable;
+    my $variable = 1;
+    goto LABEL20;
+    LABEL20: $ok = 1 if $variable;
 };
 ok($ok, 'works correctly within a try block');
 is($@, "", '...and $@ not set');
 
 # And within an eval-string?
 $ok = 0;
 eval q{
-  my $variable = 1;
-  goto LABEL21;
-  LABEL21: $ok = 1 if $variable;
+    my $variable = 1;
+    goto LABEL21;
+    LABEL21: $ok = 1 if $variable;
 };
 ok($ok, 'works correctly within an eval string');
 is($@, "", '...and $@ still not set');
 
 
 # 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 $@;
+{
+    eval q{
+        eval q{
+            goto LABEL22;
+        };
+        $ok = 0;
+        last;
+
+        LABEL22: $ok = 1;
+    };
+    $ok = 0 if $@;
 }
 ok($ok, 'works correctly in a nested eval string');
 
@@ -169,7 +172,7 @@ ok($ok, 'works correctly in a nested eval string');
 
     $ok = 0;
     sub a {
-	A: { if ($false) { redo A; B: $ok = 1; redo A; } }
+        A: { if ($false) { redo A; B: $ok = 1; redo A; } }
     }
     a();
 
@@ -244,22 +247,22 @@ sub DEBUG_TIME() {
         my $out = "";
         $out .= 'perl rules';
         goto no_list;
-    no_list:
-        is($out, 'perl rules', '$out has not been erroneously reset to undef');
+        no_list:
+            is($out, 'perl rules', '$out has not been erroneously reset to undef');
     };
 }
 
 {
     my $r = runperl(
-		stderr => 1,
-		prog =>
+        stderr => 1,
+        prog =>
 'for ($_=0;$_<3;$_++){A: if($_==1){next} if($_==2){$_++;goto A}}print qq(ok\n)'
     );
     is($r, "ok\n", 'next and goto');
 
     $r = runperl(
-		stderr => 1,
-		prog =>
+        stderr => 1,
+        prog =>
 'for ($_=0;$_<3;$_++){A: if($_==1){$_++;redo} if($_==2){$_++;goto A}}print qq(ok\n)'
     );
     is($r, "ok\n", 'redo and goto');
@@ -327,9 +330,11 @@ if($foo eq $foo) {
 }
 $foo .= "[9]";
 bulgaria:
+
 package Tomsk;
 $foo .= "[1:".__PACKAGE__."]";
 $foo .= "[2:".__PACKAGE__."]";
+
 package main;
 $foo .= "[3:".__PACKAGE__."]";
 is($foo, "[0:main][1:Tomsk][2:Tomsk][3:main]", "label before package decl");
@@ -339,6 +344,7 @@ if($foo eq $foo) {
     goto adelaide;
 }
 $foo .= "[Z]";
+
 adelaide:
 package Cairngorm {
     $foo .= "[B:".__PACKAGE__."]";
@@ -435,37 +441,37 @@ eval { goto "\0" };
 like $@, qr/^Can't find label \0 at /, 'goto "\0"';
 
 TODO: {
-  local $::TODO = 'RT #45091: goto in CORE::GLOBAL::exit unsupported';
-  fresh_perl_is(<<'EOC', "before\ndie handler\n", {stderr => 1}, 'RT #45091: goto in CORE::GLOBAL::EXIT');
-  BEGIN {
+    local $::TODO = 'RT #45091: goto in CORE::GLOBAL::exit unsupported';
+    fresh_perl_is(<<'EOC', "before\ndie handler\n", {stderr => 1}, 'RT #45091: goto in CORE::GLOBAL::EXIT');
+BEGIN {
     *CORE::GLOBAL::exit = sub {
-      goto FASTCGI_NEXT_REQUEST;
+        goto FASTCGI_NEXT_REQUEST;
     };
-  }
-  while (1) {
+}
+while (1) {
     eval { that_cgi_script() };
     FASTCGI_NEXT_REQUEST:
     last;
-  }
-  
-  sub that_cgi_script {
+}
+
+sub that_cgi_script {
     local $SIG{__DIE__} = sub { print "die handler\n"; exit; print "exit failed?\n"; };
     print "before\n";
     eval { buggy_code() };
     print "after\n";
-  }
-  sub buggy_code {
+}
+sub buggy_code {
     die "error!";
     print "after die\n";
-  }
+}
 EOC
 }
 
 sub revnumcmp ($$) {
-  goto FOO;
-  die;
-  FOO:
-  return $_[1] <=> $_[0];
+    goto FOO;
+    die;
+    FOO:
+    return $_[1] <=> $_[0];
 }
 is eval { join(":", sort revnumcmp (9,5,1,3,7)) }, "9:7:5:3:1",
   "can goto at top level of multicalled sub";