ParseXS: process line continuations after TYPEMAP

(This is similar to the previous commit, which fixed the same bug for
POD)

Within fetch_para(), the at-end-of-TYPEMAP code and the main loop both
had separate (but similar) chunks of code to read in the next line, with
the latter one being more complete. In particular, the latter had logic
to process '\' continuation lines, while the TYPEMAP one didn't. This
meant that this gave a parse error:

    TYPEMAP: <<EOF
       ...
    EOF
    void foo(int i, \
             int j)

The fix is to make them both use the same code to read the next line.
This bug was probably actually introduced by me during the refactoring
in this branch.

By using the same read-next-line code, it also means that an immediately
following blank line is now stripped of whitespace. I'm not sure whether
that actually affects anything in the real word. Also, any trailing
lines in typemap are now stripped. Again, this shouldn't affect
anything.

Author: iabyn

dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm

@@ -635,29 +635,29 @@ sub fetch_para {
       # Return what we have already and process this line on the
       # next call; that way something like a previous BOOT: won't
       # run on into the TYPEMAP: lines
-      return 1 if @{$self->{line}};
+      last if @{$self->{line}};
 
       $self->{lastline} =~
           /^TYPEMAP\s*:\s*<<\s*(?:(["'])(.+?)\1|([^\s'"]+?))\s*;?\s*$/
       or $self->death("Error: unparseable TYPEMAP line: '$self->{lastline}'");
 
       my $end_marker = quotemeta(defined($1) ? $2 : $3);
 
-      # Scan until we find $end_marker alone on a line.
-      my $last;
-      while (1) {
-        unless ($last) {
-          push @{$self->{line}},    $self->{lastline};
-          push @{$self->{line_no}}, $.;
-        }
-        $self->{lastline} = readline($self->{in_fh});
-        last if $last;
-        $self->death("Error: Unterminated TYPEMAP section")
-                              unless  defined $self->{lastline};
+      # Add the 'TYPEMAP:' line
+      push @{$self->{line}},    $self->{lastline};
+      push @{$self->{line_no}}, $.;
+
+      # Accumulate lines until we find $end_marker alone on a line.
+      while ($self->{lastline} = readline($self->{in_fh})) {
+        last if $self->{lastline} =~ /^$end_marker\s*$/;
         chomp $self->{lastline};
-        $last = $self->{lastline} =~ /^$end_marker\s*$/;
+        push @{$self->{line}},    $self->{lastline};
+        push @{$self->{line_no}}, $.;
       }
-      return 1;
+      $self->death("Error: Unterminated TYPEMAP section")
+        unless defined $self->{lastline};
+      $final = 1;
+      goto read_next_line;
     }
 
     if ($self->{lastline} =~ /^\s*#/

dist/ExtUtils-ParseXS/t/001-basic.t

@@ -5793,6 +5793,20 @@ EOF
                 "got expected err msg"
             ],
         ],
+        [
+            "line continuation directly after TYPEMAP",
+            [ Q(<<'EOF') ],
+                |TYPEMAP: <<EOF
+                |
+                |foo_t T_FOO
+                |
+                |EOF
+                |void foo(int i, \
+                |         int j)
+EOF
+
+            [ 0, 0, qr{XS}, "no errs" ],
+        ],
     );
 
     test_many($preamble, undef, \@test_fns);