Skip to content

Commit 054df9a

Browse files
committed
For our custom accessors, put the property name in a variable so we're slightly more generic and we guard against typos.
1 parent bad4227 commit 054df9a

File tree

1 file changed

+29
-22
lines changed

1 file changed

+29
-22
lines changed

lib/Module/Build/Base.pm

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,83 +1129,90 @@ END_WARN
11291129
sub dist_name {
11301130
my $self = shift;
11311131
my $p = $self->{properties};
1132-
return $p->{dist_name} if defined $p->{dist_name};
1132+
my $me = 'dist_name';
1133+
return $p->{$me} if defined $p->{$me};
11331134

11341135
die "Can't determine distribution name, must supply either 'dist_name' or 'module_name' parameter"
11351136
unless $self->module_name;
11361137

1137-
($p->{dist_name} = $self->module_name) =~ s/::/-/g;
1138+
($p->{$me} = $self->module_name) =~ s/::/-/g;
11381139

1139-
return $p->{dist_name};
1140+
return $p->{$me};
11401141
}
11411142

11421143
sub release_status {
11431144
my ($self) = @_;
1145+
my $me = 'release_status';
11441146
my $p = $self->{properties};
11451147

1146-
if ( ! defined $p->{release_status} ) {
1147-
$p->{release_status} = $self->_is_dev_version ? 'testing' : 'stable';
1148+
if ( ! defined $p->{$me} ) {
1149+
$p->{$me} = $self->_is_dev_version ? 'testing' : 'stable';
11481150
}
11491151

1150-
unless ( $p->{release_status} =~ qr/\A(?:stable|testing|unstable)\z/ ) {
1151-
die "Illegal value '$p->{release_status}' for release_status\n";
1152+
unless ( $p->{$me} =~ qr/\A(?:stable|testing|unstable)\z/ ) {
1153+
die "Illegal value '$p->{$me}' for $me\n";
11521154
}
11531155

1154-
if ( $p->{release_status} eq 'stable' && $self->_is_dev_version ) {
1156+
if ( $p->{$me} eq 'stable' && $self->_is_dev_version ) {
11551157
my $version = $self->dist_version;
1156-
die "Illegal value '$p->{release_status}' with version '$version'\n";
1158+
die "Illegal value '$p->{$me}' with version '$version'\n";
11571159
}
1158-
return $p->{release_status};
1160+
return $p->{$me};
11591161
}
11601162

11611163
sub dist_suffix {
11621164
my ($self) = @_;
11631165
my $p = $self->{properties};
1164-
return $p->{dist_suffix} if defined $p->{dist_suffix};
1166+
my $me = 'dist_suffix';
1167+
1168+
return $p->{$me} if defined $p->{$me};
11651169

11661170
if ( $self->release_status eq 'stable' ) {
1167-
$p->{dist_suffix} = "";
1171+
$p->{$me} = "";
11681172
}
11691173
else {
11701174
# non-stable release but non-dev version number needs '-TRIAL' appended
1171-
$p->{dist_suffix} = $self->_is_dev_version ? "" : "TRIAL" ;
1175+
$p->{$me} = $self->_is_dev_version ? "" : "TRIAL" ;
11721176
}
11731177

1174-
return $p->{dist_suffix};
1178+
return $p->{$me};
11751179
}
11761180

11771181
sub dist_version_from {
11781182
my ($self) = @_;
11791183
my $p = $self->{properties};
1184+
my $me = 'dist_version_from';
1185+
11801186
if ($self->module_name) {
1181-
$p->{dist_version_from} ||=
1187+
$p->{$me} ||=
11821188
join( '/', 'lib', split(/::/, $self->module_name) ) . '.pm';
11831189
}
1184-
return $p->{dist_version_from} || undef;
1190+
return $p->{$me} || undef;
11851191
}
11861192

11871193
sub dist_version {
11881194
my ($self) = @_;
11891195
my $p = $self->{properties};
1196+
my $me = 'dist_version';
11901197

1191-
return $p->{dist_version} if defined $p->{dist_version};
1198+
return $p->{$me} if defined $p->{$me};
11921199

11931200
if ( my $dist_version_from = $self->dist_version_from ) {
11941201
my $version_from = File::Spec->catfile( split( qr{/}, $dist_version_from ) );
11951202
my $pm_info = Module::Build::ModuleInfo->new_from_file( $version_from )
11961203
or die "Can't find file $version_from to determine version";
1197-
#$p->{dist_version} is undef here
1198-
$p->{dist_version} = $self->normalize_version( $pm_info->version() );
1199-
unless (defined $p->{dist_version}) {
1204+
#$p->{$me} is undef here
1205+
$p->{$me} = $self->normalize_version( $pm_info->version() );
1206+
unless (defined $p->{$me}) {
12001207
die "Can't determine distribution version from $version_from";
12011208
}
12021209
}
12031210

12041211
die ("Can't determine distribution version, must supply either 'dist_version',\n".
12051212
"'dist_version_from', or 'module_name' parameter")
1206-
unless defined $p->{dist_version};
1213+
unless defined $p->{$me};
12071214

1208-
return $p->{dist_version};
1215+
return $p->{$me};
12091216
}
12101217

12111218
sub _is_dev_version {

0 commit comments

Comments
 (0)