Skip to content

Improve class support #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andk merged 2 commits into from
Apr 24, 2026
Merged

Improve class support #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7485622
Let pmfile recognize class attributes
charsbar Apr 23, 2026
7f43ffb
Update a test
charsbar Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/PAUSE/pmfile.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ sub packages_per_pmfile {
\b(?:$package_or_class)\s+
([\w\:\']+)
\s*
(?: $ | [\}\;] | \{ | \s+($version::STRICT) )
(?: $ | [\}\;\:] | \{ | \s+($version::STRICT) )
}x) {
$pkg = $1;
$strict_version = $2;
Expand Down Expand Up @@ -390,7 +390,7 @@ sub packages_per_pmfile {
$package_or_class = 'package|class|role';
}

if (my ($ver) = /^[\s\{;]*(?:$package_or_class) \s+ \S+ \s+ (\S+) \s* [;{]/x) {
if (my ($ver) = /^[\s\{;]*(?:$package_or_class) \s+ \S+ \s+ (\S+) \s* [:;{]/x) {
# XXX: should handle this better if version is bogus -- rjbs,
# 2014-03-16
return $ver if version::is_lax($ver);
Expand Down
87 changes: 63 additions & 24 deletions t/mldistwatch-class.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,17 @@ use builtin qw( true false trim );

class Test::ClassBlock {
}
EOT
},
{
file => "lib/Test/ClassBlockAttr.pm",
content => <<"EOT",
use v5.37.9;
$test->[1]
use builtin qw( true false trim );

class Test::ClassBlockAttr :isa(Test::ClassBlock) {
}
EOT
},
{
Expand All @@ -185,6 +196,16 @@ $test->[1]
use builtin qw( true false trim );

class Test::ClassVersion 0.01;
EOT
},
{
file => "lib/Test/ClassVersionAttr.pm",
content => <<"EOT",
use v5.37.9;
$test->[1]
use builtin qw( true false trim );

class Test::ClassVersionAttr 0.01 :isa(Test::ClassVersion);
EOT
},
{
Expand All @@ -207,6 +228,17 @@ use builtin qw( true false trim );

class Test::ClassVersionBlock 0.03 {
}
EOT
},
{
file => "lib/Test/ClassVersionBlockAttr.pm",
content => <<"EOT",
use v5.37.9;
$test->[1]
use builtin qw( true false trim );

class Test::ClassVersionBlockAttr 0.04 :isa(Test::ClassVersionBlock) {
}
EOT
},
{
Expand Down Expand Up @@ -292,33 +324,40 @@ EOT
my $result = $pause->test_reindex;

$result->package_list_ok([
{ package => 'Test::Class', version => 'undef' },
{ package => 'Test::ClassBlock', version => 'undef' },
{ package => 'Test::ClassBlockOurVersion', version => '0.04' },
{ package => 'Test::ClassOurVersion', version => '0.02' },
{ package => 'Test::ClassVersion', version => '0.01' },
{ package => 'Test::ClassVersionBlock', version => '0.03' },
{ package => 'Test::Role', version => 'undef' },
{ package => 'Test::RoleBlock', version => 'undef' },
{ package => 'Test::RoleBlockOurVersion', version => '0.04' },
{ package => 'Test::RoleOurVersion', version => '0.02' },
{ package => 'Test::RoleVersion', version => '0.01' },
{ package => 'Test::RoleVersionBlock', version => '0.03' },
{ package => 'Test::Class', version => 'undef' },
{ package => 'Test::ClassBlock', version => 'undef' },
{ package => 'Test::ClassBlockAttr', version => 'undef' },
{ package => 'Test::ClassBlockOurVersion', version => '0.04' },
{ package => 'Test::ClassOurVersion', version => '0.02' },
{ package => 'Test::ClassVersion', version => '0.01' },
{ package => 'Test::ClassVersionAttr', version => '0.01' },
{ package => 'Test::ClassVersionBlock', version => '0.03' },
{ package => 'Test::ClassVersionBlockAttr', version => '0.04' },
{ package => 'Test::Role', version => 'undef' },
{ package => 'Test::RoleBlock', version => 'undef' },
{ package => 'Test::RoleBlockOurVersion', version => '0.04' },
{ package => 'Test::RoleOurVersion', version => '0.02' },
{ package => 'Test::RoleVersion', version => '0.01' },
{ package => 'Test::RoleVersionBlock', version => '0.03' },
]);

$result->perm_list_ok({
'Test::Class' => { f => 'SOMEONE' },
'Test::ClassBlock' => { f => 'SOMEONE' },
'Test::ClassVersion' => { f => 'SOMEONE' },
'Test::ClassOurVersion' => { f => 'SOMEONE' },
'Test::ClassVersionBlock' => { f => 'SOMEONE' },
'Test::ClassBlockOurVersion' => { f => 'SOMEONE' },
'Test::Role' => { f => 'SOMEONE' },
'Test::RoleBlock' => { f => 'SOMEONE' },
'Test::RoleVersion' => { f => 'SOMEONE' },
'Test::RoleOurVersion' => { f => 'SOMEONE' },
'Test::RoleVersionBlock' => { f => 'SOMEONE' },
'Test::RoleBlockOurVersion' => { f => 'SOMEONE' },
'Test::Class' => { f => 'SOMEONE' },
'Test::ClassBlock' => { f => 'SOMEONE' },
'Test::ClassBlockAttr' => { f => 'SOMEONE' },
'Test::ClassVersion' => { f => 'SOMEONE' },
'Test::ClassVersionAttr' => { f => 'SOMEONE' },
'Test::ClassOurVersion' => { f => 'SOMEONE' },
'Test::ClassOurVersion' => { f => 'SOMEONE' },
'Test::ClassVersionBlock' => { f => 'SOMEONE' },
'Test::ClassVersionBlockAttr' => { f => 'SOMEONE' },
'Test::ClassBlockOurVersion' => { f => 'SOMEONE' },
'Test::Role' => { f => 'SOMEONE' },
'Test::RoleBlock' => { f => 'SOMEONE' },
'Test::RoleVersion' => { f => 'SOMEONE' },
'Test::RoleOurVersion' => { f => 'SOMEONE' },
'Test::RoleVersionBlock' => { f => 'SOMEONE' },
'Test::RoleBlockOurVersion' => { f => 'SOMEONE' },
});
};
}
Expand Down
Loading