From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Sat, 26 Jan 2002 21:10:38 +0000 (+0000)
Subject: Gurusamy Sarathy <gsar@ActiveState.com>'s patch to Filter::Simple
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=126dd235999b6580f8d629a35f0e2b2d32077c88;p=p5sagit%2Fp5-mst-13.2.git

Gurusamy Sarathy <gsar@ActiveState.com>'s patch to Filter::Simple
for CRLF line endings.

p4raw-id: //depot/perlio@14432
---

diff --git a/lib/Filter/Simple.pm b/lib/Filter/Simple.pm
index 5af910d..e68fca1 100644
--- a/lib/Filter/Simple.pm
+++ b/lib/Filter/Simple.pm
@@ -44,7 +44,7 @@ my $pod_or_DATA = qr/
 			| ^=pod .*? $CUT
 			| ^=for .*? $EOP
 			| ^=begin \s* (\S+) .*? \n=end \s* \1 .*? $EOP
-			| ^__(DATA|END)__\n.*
+			| ^__(DATA|END)__\r?\n.*
 		    /smx;
 
 my %extractor_for = (
@@ -153,7 +153,7 @@ sub gen_filter_import {
     return sub {
 	my ($imported_class, @args) = @_;
 	my $def_terminator =
-		qr/^(?:\s*no\s+$imported_class\s*;$ows|__(?:END|DATA)__)$/;
+		qr/^(?:\s*no\s+$imported_class\s*;$ows|__(?:END|DATA)__)\r?$/;
 	if (!defined $terminator) {
 	    $terminator{terminator} = $def_terminator;
 	}