ParseXS: refactor: OUTPUT_handler() use $line vs $_

iabyn · iabyn · commit c65cb5653e15 · 2025-04-23T12:08:16.000+01:00
This is #1 of a small series of commits to refactor the OUTPUT_handler() method and turn it into a Node subclass method. This series is very similar to the one earlier in this branch which did the same for INPUT_handler(). This commit changes the main loop from using $_ to hold the current line, to using the variable $line instead.
diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
@@ -1748,15 +1748,15 @@ sub ST {
 sub OUTPUT_handler {
   my ExtUtils::ParseXS $self = shift;
 
-  $_ = shift;
+  my $line = shift;
 
   # In this loop: process each line until the next keyword or end of
   # paragraph
 
-  for (;  !/^$BLOCK_regexp/o;  $_ = shift(@{ $self->{line} })) {
-    next unless /\S/;        # skip blank lines
+  for (;  $line !~ /^$BLOCK_regexp/o;  $line = shift(@{ $self->{line} })) {
+    next unless $line =~ /\S/;        # skip blank lines
 
-    if (/^\s*SETMAGIC\s*:\s*(ENABLE|DISABLE)\s*/) {
+    if ($line =~ /^\s*SETMAGIC\s*:\s*(ENABLE|DISABLE)\s*/) {
       $self->{xsub_SETMAGIC_state} = ($1 eq "ENABLE" ? 1 : 0);
       next;
     }
@@ -1765,7 +1765,7 @@ sub OUTPUT_handler {
     #    SomeVar
     #    SomeVar   sv_setsv(....);
     #
-    my ($outarg, $outcode) = /^\s*(\S+)\s*(.*?)\s*$/s;
+    my ($outarg, $outcode) = $line =~ /^\s*(\S+)\s*(.*?)\s*$/s;
 
     my ExtUtils::ParseXS::Node::Param $param =
                                         $self->{xsub_sig}{names}{$outarg};
@@ -1803,6 +1803,8 @@ sub OUTPUT_handler {
 
     $param->as_output_code($self);
   } # foreach line in OUTPUT block
+
+  $_ = $line;
 }
 
 
