Skip to content

Commit ffc0f1a

Browse files
committed
ParseXS: refactor: rename $name_or_lenname
Rename this long lex var to just '$name' now that the code is simpler and there is less need to distinguish between various name variants.
1 parent 3ee6057 commit ffc0f1a

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -985,9 +985,10 @@ EOM
985985
next;
986986
}
987987

988-
# Decompose parameter into its components
988+
# Decompose parameter into its components.
989+
# Note that $name can be either 'foo' or 'length(foo)'
989990

990-
my ($out_type, $type, $name_or_lenname, $sp1, $sp2, $default) =
991+
my ($out_type, $type, $name, $sp1, $sp2, $default) =
991992
/^
992993
(?:
993994
(IN|IN_OUT|IN_OUTLIST|OUT|OUTLIST)
@@ -1006,24 +1007,24 @@ EOM
10061007
$
10071008
/x;
10081009

1009-
unless (defined $name_or_lenname) {
1010+
unless (defined $name) {
10101011
$self->blurt("Unparseable XSUB parameter: '$_'");
10111012
next;
10121013
}
10131014

10141015
my ExtUtils::ParseXS::Node::Param $param
10151016
= ExtUtils::ParseXS::Node::Param->new( {
1016-
var => $name_or_lenname,
1017+
var => $name,
10171018
});
10181019

1019-
if (exists $sig->{names}{$name_or_lenname}) {
1020+
if (exists $sig->{names}{$name}) {
10201021
$self->blurt(
1021-
"Error: duplicate definition of argument '$name_or_lenname' ignored");
1022+
"Error: duplicate definition of argument '$name' ignored");
10221023
next;
10231024
}
10241025

10251026
push @{$sig->{params}}, $param;
1026-
$sig->{names}{$name_or_lenname} = $param;
1027+
$sig->{names}{$name} = $param;
10271028

10281029
# Process optional IN/OUT etc modifier
10291030

@@ -1053,7 +1054,7 @@ EOM
10531054
my $is_length;
10541055
my $len_name;
10551056

1056-
if ($name_or_lenname =~ /^length\( \s* (\w+) \s* \)\z/x) {
1057+
if ($name =~ /^length\( \s* (\w+) \s* \)\z/x) {
10571058
if ($self->{config_allow_argtypes}) {
10581059
$len_name = $1;
10591060
$is_length = 1;

0 commit comments

Comments
 (0)