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 (file)
--- 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;
        }