Skip to content

Add support for attributes in version extraction for 'class' statements #39

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/Module/Metadata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ my $CLASS_REGEXP = qr{ # match a class declaration (core since 5.38)
\s* # optional whitespace
($V_NUM_REGEXP)? # optional version number
\s* # optional whitespace
[;\{] # semicolon line terminator or block start
[:;\{] # attribute start, semicolon line terminator or block start
}x;

my $VARNAME_REGEXP = qr{ # match fully-qualified VERSION name
Expand Down
72 changes: 72 additions & 0 deletions t/extract-version.t
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,38 @@ our $VERSION = '1.23_00_00';
vers => 'v1.2_3',
all_versions => { Simple => 'v1.2_3' },
},
{
name => 'class NAME VERSION ATTRIBUTE',
code => <<'---',
class Simple 1.23 :isa(Complex);
---
vers => '1.23',
all_versions => { Simple => '1.23' },
},
{
name => 'class NAME VERSION ATTRIBUTE',
code => <<'---',
class Simple 1.23_01 :isa(Complex);
---
vers => '1.23_01',
all_versions => { Simple => '1.23_01' },
},
{
name => 'class NAME VERSION ATTRIBUTE',
code => <<'---',
class Simple v1.2.3 :isa(Complex);
---
vers => 'v1.2.3',
all_versions => { Simple => 'v1.2.3' },
},
{
name => 'class NAME VERSION ATTRIBUTE',
code => <<'---',
class Simple v1.2_3 :isa(Complex);
---
vers => 'v1.2_3',
all_versions => { Simple => 'v1.2_3' },
},
{
name => 'trailing crud',
code => <<'---',
Expand Down Expand Up @@ -506,6 +538,46 @@ class Simple v1.2.3_4 {
vers => 'v1.2.3_4',
all_versions => { Simple => 'v1.2.3_4' },
},
{
name => 'class NAME ATTRIBUTE BLOCK, undef $VERSION',
code => <<'---',
class Simple :isa(Complex) {
our $VERSION;
}
---
vers => $undef,
all_versions => {},
},
{
name => 'class NAME ATTRIBUTE BLOCK, with $VERSION',
code => <<'---',
class Simple :isa(Complex) {
our $VERSION = '1.23';
}
---
vers => '1.23',
all_versions => { Simple => '1.23' },
},
{
name => 'class NAME VERSION ATTRIBUTE BLOCK (1)',
code => <<'---',
class Simple 1.23 :isa(Complex) {
1;
}
---
vers => '1.23',
all_versions => { Simple => '1.23' },
},
{
name => 'class NAME VERSION ATTRIBUTE BLOCK (2)',
code => <<'---',
class Simple v1.2.3_4 :isa(Complex) {
1;
}
---
vers => 'v1.2.3_4',
all_versions => { Simple => 'v1.2.3_4' },
},
{
name => 'set from separately-initialised variable, two lines',
code => <<'---',
Expand Down