simplify several split calls

diff --git a/lib/Perl/Tidy/HtmlWriter.pm b/lib/Perl/Tidy/HtmlWriter.pm
index 411046dd2ee5be1d5a07d369ccebf150c3b833df..43135281b2dce581344035b69f2eb2efd87233d7 100644 (file)
--- a/lib/Perl/Tidy/HtmlWriter.pm
+++ b/lib/Perl/Tidy/HtmlWriter.pm
@@ -861,8 +861,7 @@ sub pod_to_html {
             if ($toc_string) {
                 $html_print->("<hr />\n") if $rOpts->{'frames'};
                 $html_print->("<h2>Code Index:</h2>\n");
-                ##my @toc = map { $_ .= "\n" } split /\n/, $toc_string;
-                my @toc_st = map { $_ . "\n" } split /\n/, $toc_string;
+                my @toc_st = split /^/, $toc_string;
                 $html_print->(@toc_st);
             }
             $in_toc   = EMPTY_STRING;
@@ -886,8 +885,7 @@ sub pod_to_html {
                 if ($toc_string) {
                     $html_print->("<hr />\n") if $rOpts->{'frames'};
                     $html_print->("<h2>Code Index:</h2>\n");
-                    ##my @toc = map { $_ .= "\n" } split /\n/, $toc_string;
-                    my @toc_st = map { $_ . "\n" } split /\n/, $toc_string;
+                    my @toc_st = split /^/, $toc_string;
                     $html_print->(@toc_st);
                 }
                 $in_toc   = EMPTY_STRING;
@@ -1310,8 +1308,7 @@ HTML_END
       if ( $html_fh->can('close') );
 
     if ( $rOpts->{'frames'} ) {
-        ##my @toc = map { $_ .= "\n" } split /\n/, ${$rtoc_string};
-        my @toc = map { $_ . "\n" } split /\n/, ${$rtoc_string};
+        my @toc = split /^/, ${$rtoc_string};
         $self->make_frame( \@toc );
     }
     return;

diff --git a/lib/Perl/Tidy/IOScalar.pm b/lib/Perl/Tidy/IOScalar.pm
index b8df588c6a4427676777c2701a73aaf860feffe7..cd419e4e7cde635ff2b762e4ea494bc6bb00b1d7 100644 (file)
--- a/lib/Perl/Tidy/IOScalar.pm
+++ b/lib/Perl/Tidy/IOScalar.pm
@@ -64,17 +64,9 @@ EOM
 
         # Convert a scalar to an array.
         # This avoids looking for "\n" on each call to getline
-        #
-        # NOTES: The -1 count is needed to avoid loss of trailing blank lines
-        # (which might be important in a DATA section).
         my @array;
         if ( $rscalar && ${$rscalar} ) {
-
-            #@array = map { $_ .= "\n" } split /\n/, ${$rscalar}, -1;
-            @array = map { $_ . "\n" } split /\n/, ${$rscalar}, -1;
-
-            # remove possible extra blank line introduced with split
-            if ( @array && $array[-1] eq "\n" ) { pop @array }
+            @array = split /^/, ${$rscalar};
         }
         my $i_next = 0;
         return bless [ \@array, $mode, $i_next ], $package;