ParseXS: refactor: rm xsub_map_interface_foo field

Remove the following field from the ExtUtils::ParseXS class:

    xsub_map_interface_name_short_to_original

and replace it with this new field in the
ExtUtils::ParseXS::Node::xsub class:

    map_interface_name_short_to_original

In addition, remove the 'map_short_orig' field from the Node::INTERFACE
class - that was added by me earlier in this branch (initially unused)
with the intent to become what 'map_interface_name_short_to_original' is
now, but it turned out not to be suitable for this purpose, as the
latter can accumulate data over multiple INTERFACE keywords.

Author: iabyn

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

@@ -254,10 +254,6 @@ BEGIN {
                                # whether that method has been listed by
                                # OVERLOAD (for duplicate spotting).
 
-  'xsub_map_interface_name_short_to_original', # Hash: for each INTERFACE
-                               # name, map the short (PREFIX removed) name
-                               # to the original name.
-
   'xsub_attributes',           # Array of strings: all ATTRIBUTE keywords
                                # (possibly multiple space-separated
                                # keywords per string).
@@ -664,7 +660,6 @@ EOM
 
     # Initialise more per-XSUB state
 
-    %{ $self->{xsub_map_interface_name_short_to_original} } = ();
     @{ $self->{xsub_attributes} }  = ();    # ATTRS:     lvalue method
     $self->{xsub_SETMAGIC_state} = 1;       # SETMAGIC:  ENABLE
 

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

@@ -232,7 +232,12 @@ BEGIN { $build_subclass->('', # parent
 
     'alias_clash_hinted',        # Bool: an ALIAS warn-hint has been emitted.
 
+    # Maintain the INTERFACE parsing state across potentially multiple
+    # INTERFACE keywords and or lines:
 
+    'map_interface_name_short_to_original', # Hash: for each INTERFACE
+                               # name, map the short (PREFIX removed) name
+                               # to the original name.
 )};
 
 
@@ -553,9 +558,9 @@ EOF
         # For each interface name, generate both a newXS() and
         # XSINTERFACE_FUNC_SET() call.
         foreach my $yname (sort keys
-                %{ $pxs->{xsub_map_interface_name_short_to_original} })
+                %{ $pxs->{cur_xsub}{map_interface_name_short_to_original} })
         {
-            my $value = $pxs->{xsub_map_interface_name_short_to_original}{$yname};
+            my $value = $pxs->{cur_xsub}{map_interface_name_short_to_original}{$yname};
             $yname = "$pxs->{PACKAGE_name}\::$yname" unless $yname =~ /::/;
             push(@code, ExtUtils::ParseXS::Q(<<"EOF"));
                 |        cv = $newXS(\"$yname\", XS_$cname$file_arg$proto_arg);
@@ -3108,7 +3113,6 @@ package ExtUtils::ParseXS::Node::INTERFACE;
 # Handle INTERFACE keyword
 
 BEGIN { $build_subclass->('multiline_merged', # parent
-    'map_short_orig', # hash mapping short IF names to original ones
 )};
 
 
@@ -3125,10 +3129,9 @@ sub parse {
         my $short = $_;
         $short =~ s/^$pxs->{PREFIX_pattern}//;
         $map{$short} = $_;
-        $pxs->{xsub_map_interface_name_short_to_original}->{$short} = $_;
+        $pxs->{cur_xsub}{map_interface_name_short_to_original}{$short} = $_;
     }
 
-    $self->{map_short_orig} = \%map;
     1;
 }