This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
In buildtoc, refactor the flow logic in podset() to avoid most uses of next.
authorNicholas Clark <nick@ccl4.org>
Fri, 21 Jan 2011 16:17:30 +0000 (16:17 +0000)
committerNicholas Clark <nick@ccl4.org>
Fri, 21 Jan 2011 17:00:46 +0000 (17:00 +0000)
pod/buildtoc

index 1f4cb00..a1acc44 100644 (file)
@@ -432,26 +432,23 @@ sub podset {
            s/ \(\$Revision: \d+ \$\)//g;
            if ( /^\s*\Q$pod\E\b/ ) {
                s/$pod\.pm/$pod/;       # '.pm' in NAME !?
-               $OUT .= $_;
            } else {
                s/^/$pod, /;
-               $OUT .= $_;
            }
-           next;
        }
-       if (s/^=head1 (.*)/=item $1/) {
+       elsif (s/^=head1 (.*)/=item $1/) {
            unhead2();
            $OUT .= "=over 4\n\n" unless $inhead1;
            $inhead1 = 1;
-           $OUT .= "$_\n"; next;
+           $_ .= "\n";
        }
-       if (s/^=head2 (.*)/=item $1/) {
+       elsif (s/^=head2 (.*)/=item $1/) {
            unitem();
            $OUT .= "=over 4\n\n" unless $inhead2;
            $inhead2 = 1;
-           $OUT .= "$_\n"; next;
+           $_ .= "\n";
        }
-       if (s/^=item ([^=].*)/$1/) {
+       elsif (s/^=item ([^=].*)/$1/) {
            next if $pod eq 'perldiag';
            s/^\s*\*\s*$// && next;
            s/^\s*\*\s*//;
@@ -463,12 +460,12 @@ sub podset {
            $initem = 1;
            s/\.$//;
            s/^-X\b/-I<X>/;
-           $OUT .= $_; next;
        }
-       if (s/^=cut\s*\n//) {
-           unhead1();
+       else {
+           unhead1() if /^=cut\s*\n/;
            next;
        }
+       $OUT .= $_;
     }
 }