ParseXS: refactor: remove misc xsub_foo fields

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

    xsub_map_overload_name_to_seen
    xsub_prototype

and replace them with these new fields in the
ExtUtils::ParseXS::Node::xsub class:

    overload_name_seen
    prototype

Author: iabyn

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

@@ -235,20 +235,7 @@ BEGIN {
 
   'cur_xbody',                 # The Node::xbody currently being parsed
 
-  'xsub_prototype',            # Str: is set to either the global PROTOTYPES
-                               #  values (0 or 1), or to what's been
-                               #  overridden for this XSUB with PROTOTYPE
-                               #    "0": DISABLE
-                               #    "1": ENABLE
-                               #    "2": empty prototype
-                               #    other: a specific prototype.
-
   'xsub_SCOPE_enabled',        # Bool: SCOPE ENABLEd
-
-  'xsub_map_overload_name_to_seen', # Hash: maps each overload method name
-                               # (such as '<=>') to a boolean indicating
-                               # whether that method has been listed by
-                               # OVERLOAD (for duplicate spotting).
   );
 
   # do 'use fields', except: fields needs Hash::Util which is XS, which
@@ -578,9 +565,7 @@ EOM
 
     # Initialize some per-XSUB instance variables:
 
-    $self->{xsub_prototype}            = $self->{PROTOTYPES_value};
     $self->{xsub_SCOPE_enabled}        = 0;
-    $self->{xsub_map_overload_name_to_seen} = {};
 
     # Process next line
 

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

@@ -238,6 +238,11 @@ BEGIN { $build_subclass->('', # parent
                                # name, map the short (PREFIX removed) name
                                # to the original name.
 
+    'overload_name_seen',      # Hash of bools: indicates overload method
+                               # names (such as '<=>') which have been
+                               # listed by OVERLOAD (for newXS boot code
+                               # emitting).
+
     # Maintain the ATTRS parsing state across potentially multiple
     # ATTRS keywords and or lines:
 
@@ -249,6 +254,17 @@ BEGIN { $build_subclass->('', # parent
 
     'interface_macro',      # Str: value of interface extraction macro.
     'interface_macro_set',  # Str: value of interface setting macro.
+
+    # PROTOTYPE value
+
+    'prototype',               # Str: is set to either the global PROTOTYPES
+                               #  values (0 or 1), or to what's been
+                               #  overridden for this XSUB with PROTOTYPE
+                               #    "0": DISABLE
+                               #    "1": ENABLE
+                               #    "2": empty prototype
+                               #    other: a specific prototype.
+
 )};
 
 
@@ -258,6 +274,10 @@ sub parse {
 
     $self->SUPER::parse($pxs); # set file/line_no
 
+    # Initially inherit the prototype behaviour for the XSUB from the
+    # global PROTOTYPES default
+    $self->{prototype} = $pxs->{PROTOTYPES_value};
+
     # Parse the XSUB's declaration (return type, name, parameters)
 
     my $decl = ExtUtils::ParseXS::Node::xsub_decl->new();
@@ -501,7 +521,7 @@ sub boot_code {
 
     $proto_arg = "";
 
-    unless($pxs->{xsub_prototype}) {
+    unless($self->{prototype}) {
         # no prototype
         $newXS = "newXS_deffile";
         $file_arg = "";
@@ -511,17 +531,17 @@ sub boot_code {
         $newXS = "newXSproto_portable";
         $file_arg = ", file";
 
-        if ($pxs->{xsub_prototype} eq 2) {
+        if ($self->{prototype} eq 2) {
             # User has specified an empty prototype
         }
-        elsif ($pxs->{xsub_prototype} eq 1) {
+        elsif ($self->{prototype} eq 1) {
             # Protoype enabled, but to be auto-generated by us
             $proto_arg = $self->{decl}{params}->proto_string();
             $proto_arg =~ s{\\}{\\\\}g; # escape backslashes
         }
         else {
             # User has manually specified a prototype
-            $proto_arg = $pxs->{xsub_prototype};
+            $proto_arg = $self->{prototype};
         }
 
         $proto_arg = qq{, "$proto_arg"};
@@ -608,7 +628,7 @@ EOF
     # For every overload operator, generate an additional newXS()
     # call to add an alias such as "Foo::(<=>" for this XSUB.
 
-    for my $operator (sort keys %{ $pxs->{xsub_map_overload_name_to_seen} })
+    for my $operator (sort keys %{ $pxs->{cur_xsub}{overload_name_seen} })
     {
         $pxs->{map_overloaded_package_to_C_package}->{$pxs->{PACKAGE_name}}
             = $pxs->{PACKAGE_C_name};
@@ -3248,7 +3268,7 @@ BEGIN { $build_subclass->('multiline_merged', # parent
 
 # Add all overload method names, like 'cmp', '<=>', etc, (possibly
 # multiple ones per line) until the next keyword line, as 'seen' keys to
-# the $self->{xsub_map_overload_name_to_seen} hash.
+# the $xsub->{overload_name_seen} hash.
 
 sub parse {
     my __PACKAGE__       $self = shift;
@@ -3259,7 +3279,7 @@ sub parse {
     my $s = $self->{text};
     while ($s =~  s/^\s*([\w:"\\)\+\-\*\/\%\<\>\.\&\|\^\!\~\{\}\=]+)\s*//) {
         $self->{ops}{$1} = 1;
-        $pxs->{xsub_map_overload_name_to_seen}->{$1} = 1;
+        $pxs->{cur_xsub}{overload_name_seen}{$1} = 1;
     }
     1;
 }
@@ -3347,9 +3367,8 @@ sub parse {
     # If no prototype specified, then assume empty prototype ""
     $proto = 2 unless defined $proto;
 
-    $self->{prototype}     = $proto;
-    $pxs->{xsub_prototype} = $proto;
-
+    $self->{prototype}          = $proto;
+    $pxs->{cur_xsub}{prototype} = $proto;
 
     $pxs->{proto_behaviour_specified} = 1;
     1;