ParseXS: spot TYPEMAP: line syntax errors

Previously, a line which was not a completely syntactically correct
TYPEMAP: line was not treated as a TYPEMAP line; instead it got passed on
uninterpreted until likely causing an error further along in parsing.

This commit changes things so that anything starting with
/^TYPEMAP\s*:/ is treated as a TYPEMAP line, and is *only then*
examined for full syntactic correctness, giving an error if not ok.

This is similar to two commits ago which did the same for the MODULE
keyword.

Author: iabyn

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

@@ -533,8 +533,13 @@ sub _maybe_parse_typemap_block {
 
   # This is special cased from the usual paragraph-handler logic
   # due to the HEREdoc-ish syntax.
-  if ($self->{lastline} =~ /^TYPEMAP\s*:\s*<<\s*(?:(["'])(.+?)\1|([^\s'"]+?))\s*;?\s*$/)
-  {
+  return unless $self->{lastline} =~ /^TYPEMAP\s*:/;
+
+  $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.
@@ -554,7 +559,6 @@ sub _maybe_parse_typemap_block {
     $self->{typemaps_object}->merge(typemap => $tmap, replace => 1);
 
     $self->{lastline} = "";
-  }
 }
 
 

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

@@ -5767,4 +5767,32 @@ EOF
     test_many($preamble, undef, \@test_fns);
 }
 
+
+{
+    # Test reporting of bad syntax on TYPEMAP lines.
+
+    my $preamble = Q(<<'EOF');
+        |MODULE = Foo PACKAGE = Foo
+        |
+        |PROTOTYPES:  DISABLE
+        |
+EOF
+
+    my @test_fns = (
+        [
+            'TYPEMAP syntax err',
+            [ Q(<<'EOF') ],
+                |TYPEMAP: <EOF
+                |
+EOF
+
+            [ 1, 0, qr{Error: unparseable TYPEMAP line: 'TYPEMAP: <EOF'},
+                "got expected err msg"
+            ],
+        ],
+    );
+
+    test_many($preamble, undef, \@test_fns);
+}
+
 done_testing;