I could have sworn the base class method was there.
[p5sagit/p5-mst-13.2.git] / lib / Switch.pm
index a43ba95..9c4abe3 100644 (file)
@@ -4,7 +4,7 @@ use strict;
 use vars qw($VERSION);
 use Carp;
 
-$VERSION = '2.07';
+$VERSION = '2.10';
 
 
 # LOAD FILTERING MODULE...
@@ -52,7 +52,6 @@ sub filter
        return $status if $status<0;
        $_ = filter_blocks($_,$offset);
        $_ = "# line $offset\n" . $_ if $offset; undef $offset;
-       # print STDERR $_;
        return $status;
 }
 
@@ -102,7 +101,8 @@ sub filter_blocks
                my @pos = Text::Balanced::_match_quotelike(\$source,qr/\s*/,1,0);
                if (defined $pos[0])
                {
-                       $text .= " " . substr($source,$pos[2],$pos[18]-$pos[2]);
+                       $text .= " " if $pos[0] < $pos[2];
+                       $text .= substr($source,$pos[2],$pos[18]-$pos[2]);
                        next component;
                }
                if ($source =~ m/\G\s*($pod_or_DATA)/gc) {
@@ -111,7 +111,8 @@ sub filter_blocks
                @pos = Text::Balanced::_match_variable(\$source,qr/\s*/);
                if (defined $pos[0])
                {
-                       $text .= " " . substr($source,$pos[0],$pos[4]-$pos[0]);
+                       $text .= " " if $pos[0] < $pos[2];
+                       $text .= substr($source,$pos[0],$pos[4]-$pos[0]);
                        next component;
                }
 
@@ -150,8 +151,9 @@ sub filter_blocks
                        $text .= $1."if (Switch::case";
                        if (@pos = Text::Balanced::_match_codeblock(\$source,qr/\s*/,qr/\{/,qr/\}/,qr/\{/,qr/\}/,undef)) {
                                my $code = substr($source,$pos[0],$pos[4]-$pos[0]);
-                               $text .= " sub" if is_block $code;
-                               $text .= " " . filter_blocks($code,line(substr($source,0,$pos[0]),$line)) . ")";
+                               $text .= " " if $pos[0] < $pos[2];
+                               $text .= "sub " if is_block $code;
+                               $text .= filter_blocks($code,line(substr($source,0,$pos[0]),$line)) . ")";
                        }
                        elsif (@pos = Text::Balanced::_match_codeblock(\$source,qr/\s*/,qr/[[(]/,qr/[])]/,qr/[[({]/,qr/[])}]/,undef)) {
                                my $code = filter_blocks(substr($source,$pos[0],$pos[4]-$pos[0]),line(substr($source,0,$pos[0]),$line));
@@ -159,13 +161,15 @@ sub filter_blocks
                                $code =~ s {^\s*[(]\s*m\b} { ( qr}      ||
                                $code =~ s {^\s*[(]\s*/}   { ( qr/}     ||
                                $code =~ s {^\s*[(]\s*qw}  { ( \\qw};
-                               $text .= " $code)";
+                               $text .= " " if $pos[0] < $pos[2];
+                               $text .= "$code)";
                        }
                        elsif ($Perl6 && do{@pos = Text::Balanced::_match_variable(\$source,qr/\s*/)}) {
                                my $code = filter_blocks(substr($source,$pos[0],$pos[4]-$pos[0]),line(substr($source,0,$pos[0]),$line));
                                $code =~ s {^\s*%}  { \%}       ||
                                $code =~ s {^\s*@}  { \@};
-                               $text .= " $code)";
+                               $text .= " " if $pos[0] < $pos[2];
+                               $text .= "$code)";
                        }
                        elsif ( @pos = Text::Balanced::_match_quotelike(\$source,qr/\s*/,1,0)) {
                                my $code = substr($source,$pos[2],$pos[18]-$pos[2]);
@@ -173,7 +177,8 @@ sub filter_blocks
                                $code =~ s {^\s*m}  { qr}       ||
                                $code =~ s {^\s*/}  { qr/}      ||
                                $code =~ s {^\s*qw} { \\qw};
-                               $text .= " $code)";
+                               $text .= " " if $pos[0] < $pos[2];
+                               $text .= "$code)";
                        }
                        elsif ($Perl5 && $source =~ m/\G\s*(([^\$\@{])[^\$\@{]*)(?=\s*{)/gc
                           ||  $Perl6 && $source =~ m/\G\s*([^;{]*)()/gc) {
@@ -492,8 +497,8 @@ Switch - A switch statement for Perl
 
 =head1 VERSION
 
-This document describes version 2.07 of Switch,
-released May 15, 2002.
+This document describes version 2.09 of Switch,
+released June 12, 2002.
 
 =head1 SYNOPSIS
 
@@ -742,7 +747,7 @@ behaviour of the third case.
 
 Perl 6 will provide a built-in switch statement with essentially the
 same semantics as those offered by Switch.pm, but with a different
-pair of keywords. In Perl 6 C<switch> with be spelled C<given>, and
+pair of keywords. In Perl 6 C<switch> will be spelled C<given>, and
 C<case> will be pronounced C<when>. In addition, the C<when> statement
 will not require switch or case values to be parenthesized.