ParseXS, xsubpp: raise priority of -typemap args

Prior to 5.10. / 5.8.9, any -typemap arguments to xsubpp were applied
last, and thus had the highest priority. From 5.10.0 this was changed
(probably inadvertently) so that the -typemap entries were applied
first, and so the system and ./typemap files took priority.

This commit reverses that change, so that -typemap files are again
applied last.

Author: iabyn

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

@@ -249,13 +249,13 @@ accumulated results of all processed typemap files.
 sub process_typemaps {
   my ($tmap, $pwd) = @_;
 
-  my @tm = ref $tmap ? @{$tmap} : ($tmap);
+  my @tm = standard_typemap_locations( \@INC );
 
-  foreach my $typemap (@tm) {
+  my @explicit = ref $tmap ? @{$tmap} : ($tmap);
+  foreach my $typemap (@explicit) {
     die "Can't find $typemap in $pwd\n" unless -r $typemap;
   }
-
-  push @tm, standard_typemap_locations( \@INC );
+  push @tm, @explicit;
 
   require ExtUtils::Typemaps;
   my $typemap = ExtUtils::Typemaps->new;

dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp

@@ -79,8 +79,6 @@ The compiler will search for typemap files called I<typemap>. It will use
 the following search path to find typemaps and apply them in that order,
 so later typemaps take precedence:
 
-    any files specifed by -typemap
-
     map("$_/ExtUtils/typemap", reverse @INC),
 
     ../../../../lib/ExtUtils/typemap
@@ -93,6 +91,8 @@ so later typemaps take precedence:
     ../typemap
     typemap
 
+    any files specifed by -typemap
+
 =head1 OPTIONS
 
 Note that the C<XSOPT> MakeMaker option may be used to add these options to
@@ -112,7 +112,8 @@ Adds exception handling stubs to the C code.
 
 Indicates that a user-supplied typemap should be applied in additon to any
 files found in the standard search path. This option may be used multiple
-times, with the last typemap having the highest precedence.
+times, with the last typemap having the highest precedence, and all such
+files processed after ones found in the standard path.
 
 =item B<-output filename>
 

dist/ExtUtils-ParseXS/t/106-process_typemaps.t

@@ -4,7 +4,8 @@ use warnings;
 use Carp;
 use Cwd qw(cwd);
 use File::Temp qw( tempdir );
-use Test::More tests =>  2;
+use File::Spec;
+use Test::More tests =>  6;
 use ExtUtils::ParseXS::Utilities qw(
   process_typemaps
 );
@@ -41,3 +42,19 @@ my $startdir  = cwd();
     chdir $startdir;
 }
 
+# Confirm that explicit typemaps via -typemap etc override standard
+# entries.
+
+{
+    my $tm_obj = process_typemaps(
+        [ File::Spec->catfile("t", "data", "conflicting.typemap") ], '.');
+    ok($tm_obj, "got typemap object");
+
+    my $tm_entry = $tm_obj->get_typemap(ctype => 'double');
+    ok($tm_entry, "got typemap entry object");
+
+    my $xs = $tm_entry->xstype;
+    ok($xs, "got typemap XS type");
+    # should be overridden from T_NV
+    is($xs, "T_DIFFERENT", "got typemap XS type");
+}

dist/ExtUtils-ParseXS/t/600-t-compat.t

@@ -97,16 +97,20 @@ foreach my $test (@tests) {
 # typemap-parsing/handling code in ExtUtils::ParseXS looked like. For
 # bug-compatibility, we want to produce the same data structures as that
 # code as much as possible.
+# Except in 2025 the ordering was changed so that local files via -typemap
+# are now processed afterwards; the order has been changed here to reflect
+# that change.
 sub _process_typemaps {
   my ($tmap, $pwd) = @_;
 
-  my @tm = ref $tmap ? @{$tmap} : ($tmap);
+  my @tm = standard_typemap_locations( \@INC );
 
-  foreach my $typemap (@tm) {
+  my @explicit = ref $tmap ? @{$tmap} : ($tmap);
+  foreach my $typemap (@explicit) {
     die "Can't find $typemap in $pwd\n" unless -r $typemap;
   }
+  push @tm, @explicit;
 
-  push @tm, standard_typemap_locations( \@INC );
 
   my ($type_kind_ref, $proto_letter_ref, $input_expr_ref, $output_expr_ref)
     = ( {}, {}, {}, {} );