Simplify util/perl-nbsp.p6

Author: Kaiepi

doc/Language/5to6-nutshell.pod6

@@ -1688,4 +1688,4 @@ be better than losing the information about a real need.
 
 =end comments
 
-# vim: expandtab softtabstop=4 shiftwidth=4 ft=perl6
+# vim: expandtab softtabstop=4 shiftwidth=4 ft=perl6

doc/Language/5to6-perlfunc.pod6

@@ -1453,7 +1453,7 @@ In Perl 6, this only reverses the elements of a list. C<reverse(@a)>
 or C<@a.reverse>. To reverse the characters in a string, use the
 C<.flip> method.
 
-C<reverse> without parameters is not supported in Perl 6.
+C<reverse> without parameters is not supported in Perl 6.
 
 The Perl 6 ecosystem has a module L<C<P5reverse>|https://modules.perl6.org/dist/P5reverse>
 which exports a C<reverse> function that mimics the original Perl 5 behaviour
@@ -2274,4 +2274,4 @@ C<tr///>.
 
 =end pod
 
-# vim: expandtab softtabstop=4 shiftwidth=4 ft=perl6
+# vim: expandtab softtabstop=4 shiftwidth=4 ft=perl6

util/perl-nbsp.p6

@@ -9,65 +9,61 @@ my @files = Test-Files.documents;
 
 enum Syntax (
     CodeDoc => 0,
-    ForDoc  => 1,
-    Doc     => 2
+    TextDoc => 1
 );
 
 sub check-line($line, $state) {
     given $line {
-        when /^\=begin\scode/ { CodeDoc                         }
-        when /^\=for\scode/   { ForDoc                          }
-        when /^\=end\scode/   { Doc                             }
-        when /^\=\w+/         { Doc                             }
-        when /^\s ** 4/       { CodeDoc                         }
-        when /^.+$/           { $state !~~ Doc ?? $state !! Doc }
-        default               { $state                          }
+        when /^\=begin\scode/ { CodeDoc }
+        when /^\=for\scode/   { CodeDoc }
+        when /^\=end\scode/   { TextDoc }
+        when /^\=\w+/         { TextDoc }
+        when /^\s ** 4/       { CodeDoc }
+        default               { $state  }
     }
 }
 
 my @promises = @files.map(-> $file {
     Promise.start({
-        my Str        @contents;
-        my Str        @lines = $file.IO.lines;
-        my IO::Handle $fh    = $file.IO.open(:rw);
-        my Syntax     $state = Doc;
-        my Str        $buf;
-        my Bool       $logged;
-        for @lines -> $line {
-            next if $line === Nil;
+        my Str    @in       = $file.IO.lines;
+        my Str    @out      = [];
+        my Syntax $state    = TextDoc;
+        my Bool   $modified = False;
+        for @in -> $in-line {
+            unless $in-line {
+                @out.push($in-line);
+                next;
+            }
 
-            $state = check-line($line, $state);
-            if $state !~~ Doc {
-                # Perl 5 or Perl 6 should keep regular spaces in code.
-                @contents.push($line);
+            $state = check-line($in-line, $state);
+            if $state ~~ CodeDoc {
+                # Perl 5 and Perl 6 should keep regular spaces in code.
+                @out.push($in-line);
                 next;
             }
 
-            my $new-line = $line;
-            if $new-line.chars < 6 {
+            if $in-line.chars < 6 {
                 # Too short to contain Perl 5 or Perl 6.
-                @contents.push($line);
+                @out.push($in-line);
                 next;
             }
 
-            $new-line ~~ s:g/Perl\x[0020](5||6)/Perl\x[00A0]$0/;
-            if $new-line ne $line and ~$/ {
-                $logged = True;
-                @contents.push($new-line);
+            my $out-line = $in-line;
+            $out-line ~~ s:g/Perl\x[0020](5||6)/Perl\x[00A0]$0/;
+            if $out-line ne $in-line and ~$/ {
+                $modified = True;
+                @out.push($out-line);
             } else {
-                @contents.push($line);
+                @out.push($in-line);
             }
         }
 
-        if $logged {
+        if $modified {
             say "Corrected mentions of Perl 6 to use NBSP in '$file'.";
-            $logged = False;
+            $file.IO.spurt(@out.join("\n"), :close);
+            $modified = False;
         }
-
-        $fh.spurt(@contents.join("\n"));
-        $fh.close;
     })
 });
 
 @promises.race(:$degree).map(-> $p { await $p });
-