From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 14 Nov 2001 22:05:01 +0000 (+0000)
Subject: Upgrade to Switch 2.06.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d38ca1713e2d9b15aeec2ddecbf2bc47e7825cf0;p=p5sagit%2Fp5-mst-13.2.git

Upgrade to Switch 2.06.

p4raw-id: //depot/perl@13007
---

diff --git a/lib/Switch.pm b/lib/Switch.pm
index 7e6e577..7f05bc0 100644
--- a/lib/Switch.pm
+++ b/lib/Switch.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw($VERSION);
 use Carp;
 
-$VERSION = '2.05';
+$VERSION = '2.06';
 
 
 # LOAD FILTERING MODULE...
@@ -74,6 +74,16 @@ sub is_block
 	return !$ishash;
 }
 
+
+my $EOP = qr/\n\n|\Z/;
+my $CUT = qr/\n=cut.*$EOP/;
+my $pod_or_DATA = qr/ ^=(?:head[1-4]|item) .*? $CUT
+                    | ^=pod .*? $CUT
+                    | ^=for .*? $EOP
+                    | ^=begin \s* (\S+) .*? \n=end \s* \1 .*? $EOP
+                    | ^__(DATA|END)__\n.*
+                    /smx;
+
 my $casecounter = 1;
 sub filter_blocks
 {
@@ -89,12 +99,15 @@ sub filter_blocks
 			$text .= q{use Switch 'noimport'};
 			next component;
 		}
-		my @pos = Text::Balanced::_match_quotelike(\$source,qr/\s*/,1,1);
+		my @pos = Text::Balanced::_match_quotelike(\$source,qr/\s*/,1,0);
 		if (defined $pos[0])
 		{
 			$text .= " " . substr($source,$pos[2],$pos[18]-$pos[2]);
 			next component;
 		}
+		if ($source =~ m/\G\s*($pod_or_DATA)/gc) {
+			next component;
+		}
 		@pos = Text::Balanced::_match_variable(\$source,qr/\s*/);
 		if (defined $pos[0])
 		{
@@ -149,7 +162,7 @@ sub filter_blocks
 				$code =~ s {^\s*@}  { \@};
 				$text .= " $code)";
 			}
-			elsif ( @pos = Text::Balanced::_match_quotelike(\$source,qr/\s*/,1,1)) {
+			elsif ( @pos = Text::Balanced::_match_quotelike(\$source,qr/\s*/,1,0)) {
 				my $code = substr($source,$pos[2],$pos[18]-$pos[2]);
 				$code = filter_blocks($code,line(substr($source,0,$pos[2]),$line));
 				$code =~ s {^\s*m}  { qr}	||
@@ -186,7 +199,7 @@ sub filter_blocks
 			next component;
 		}
 
-		$source =~ m/\G(\s*(\w+|#.*\n|\W))/gc;
+		$source =~ m/\G(\s*(-[sm]\s+|\w+|#.*\n|\W))/gc;
 		$text .= $1;
 	}
 	$text;
@@ -341,7 +354,8 @@ sub switch(;$)
 	return 1;
 }
 
-sub case($) { $::_S_W_I_T_C_H->(@_); }
+sub case($) { local $SIG{__WARN__} = \&carp;
+	      $::_S_W_I_T_C_H->(@_); }
 
 # IMPLEMENT __
 
@@ -473,8 +487,8 @@ Switch - A switch statement for Perl
 
 =head1 VERSION
 
-This document describes version 2.05 of Switch,
-released September  3, 2001.
+This document describes version 2.06 of Switch,
+released November 14, 2001.
 
 =head1 SYNOPSIS
 
@@ -825,6 +839,12 @@ Damian Conway (damian@conway.org)
 There are undoubtedly serious bugs lurking somewhere in code this funky :-)
 Bug reports and other feedback are most welcome.
 
+=head1 LIMITATION
+
+Due to the heuristic nature of Switch.pm's source parsing, the presence
+of regexes specified with raw C<?...?> delimiters may cause mysterious
+errors. The workaround is to use C<m?...?> instead.
+
 =head1 COPYRIGHT
 
     Copyright (c) 1997-2001, Damian Conway. All Rights Reserved.
diff --git a/lib/Switch/Changes b/lib/Switch/Changes
index d741a69..add2130 100755
--- a/lib/Switch/Changes
+++ b/lib/Switch/Changes
@@ -48,3 +48,14 @@ Revision history for Perl extension Switch.
 	- Changed licence for inclusion in core distribution
 
 	- Added new test file for non-fallthrough and nested switches
+
+
+2.06	Wed Nov 14 16:18:54 2001
+
+	- Fixed parsing of ternary operators in Switch'ed source code
+	  (at the expense of no longer correctly parsing ?...? regexes)
+	  (thanks Mark)
+
+	- Fixed the parsing of embedded POD (thanks Brent)
+
+	- Fixed bug encountered when -s or -m file test used (thanks Jochen)
diff --git a/lib/Switch/README b/lib/Switch/README
index 312571b..f2cf139 100644
--- a/lib/Switch/README
+++ b/lib/Switch/README
@@ -1,5 +1,5 @@
 ==============================================================================
-                      Release of version 2.05 of Switch
+                      Release of version 2.06 of Switch
 ==============================================================================
 
 
@@ -26,12 +26,16 @@ COPYRIGHT
 
 ==============================================================================
 
-CHANGES IN VERSION 2.05
+CHANGES IN VERSION 2.06
 
 
-	- Changed licence for inclusion in core distribution
+	- Fixed parsing of ternary operators in Switch'ed source code
+	  (at the expense of no longer correctly parsing ?...? regexes)
+	  (thanks Mark)
 
-	- Added new test file for non-fallthrough and nested switches
+	- Fixed the parsing of embedded POD (thanks Brent)
+
+	- Fixed bug encountered when -s or -m file test used (thanks Jochen)
 
 
 ==============================================================================
diff --git a/lib/Switch/t/nested.t b/lib/Switch/t/nested.t
index b4aceac..87451ed 100755
--- a/lib/Switch/t/nested.t
+++ b/lib/Switch/t/nested.t
@@ -14,6 +14,15 @@ for my $count (1..3, 'four')
 {
 	switch ([$count])
 	{
+
+=pod
+
+=head1 Test
+
+We also test if Switch is POD-friendly here
+
+=cut
+
 		case qr/\d/ {
 				switch ($count) {
 					case 1     { print "ok 1\n" }
@@ -23,3 +32,11 @@ for my $count (1..3, 'four')
 		case 'four' { print "ok 4\n" }
 	}
 }
+
+__END__
+
+=head1 Another test
+
+Still friendly???
+
+=cut