Skip to content

Optimizations in _parse_fh #4

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Optimizations in _parse_fh #4

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
762356c
Fix package version parsing in $PKG_REGEXP
dolmen Apr 3, 2014
b50a51e
Optimization in _parse_fh: use index() instead of a regexp
dolmen Apr 3, 2014
64d7abb
Encode source as UTF-8
dolmen Apr 3, 2014
e0b96c2
_parse_fh: optimize expression order in conditions
dolmen Apr 3, 2014
4bc9783
_parse_fh: minor regexp optimization
dolmen Apr 3, 2014
145dec7
_init: several micro-optimizations in module name extraction
dolmen Apr 3, 2014
17432d7
_do_find_module: micro-optimization
dolmen Apr 3, 2014
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
26 changes: 14 additions & 12 deletions lib/Module/Metadata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,10 @@ my $PKG_REGEXP = qr{ # match a package declaration
package # the word 'package'
\s+ # whitespace
($PKG_NAME_REGEXP) # a package name
\s* # optional whitespace
($V_NUM_REGEXP)? # optional version number
(?:
\s+ # whitespace
($V_NUM_REGEXP) # optional version number
)?
\s* # optional whitesapce
[;\{] # semicolon line terminator or block start (since 5.16)
}x;
Expand All @@ -78,7 +80,7 @@ my $VARNAME_REGEXP = qr{ # match fully-qualified VERSION name
([\$*]) # sigil - $ or *
(
( # optional leading package name
(?:::|\')? # possibly starting like just :: (� la $::VERSION)
(?:::|\')? # possibly starting like just :: (à la $::VERSION)
(?:\w+(?:::|\'))* # Foo::Bar:: ...
)?
VERSION
Expand Down Expand Up @@ -399,13 +401,12 @@ sub _init {

unless($self->{module} and length($self->{module})) {
my ($v, $d, $f) = File::Spec->splitpath($self->{filename});
if($f =~ /\.pm$/) {
$f =~ s/\..+$//;
my @candidates = grep /$f$/, @{$self->{packages}};
if($f =~ s/\.pm$//) {
my @candidates = grep /\Q$f\E$/, @{$self->{packages}};
$self->{module} = shift(@candidates); # punt
}
else {
if(grep /main/, @{$self->{packages}}) {
if(grep $_ eq 'main', @{$self->{packages}}) {
$self->{module} = 'main';
}
else {
Expand All @@ -431,8 +432,9 @@ sub _do_find_module {
my $testfile = File::Spec->catfile($dir, $file);
return [ File::Spec->rel2abs( $testfile ), $dir ]
if -e $testfile and !-d _; # For stuff like ExtUtils::xsubpp
return [ File::Spec->rel2abs( "$testfile.pm" ), $dir ]
if -e "$testfile.pm";
$testfile .= '.pm';
return [ File::Spec->rel2abs( $testfile ), $dir ]
if -e $testfile;
}
return;
}
Expand Down Expand Up @@ -571,7 +573,7 @@ sub _parse_fh {

# parse $line to see if it's a $VERSION declaration
my( $version_sigil, $version_fullname, $version_package ) =
($line =~ /VERSION/)
index($line, 'VERSION') >= 1
? $self->_parse_version_expression( $line )
: ();

Expand All @@ -591,14 +593,14 @@ sub _parse_fh {
}

# first non-comment line in undeclared package main is VERSION
} elsif ( !exists($vers{main}) && $package eq 'main' && $version_fullname ) {
} elsif ( $package eq 'main' && $version_fullname && !exists($vers{main}) ) {
$need_vers = 0;
my $v = $self->_evaluate_version_line( $version_sigil, $version_fullname, $line );
$vers{$package} = $v;
push( @packages, 'main' );

# first non-comment line in undeclared package defines package main
} elsif ( !exists($vers{main}) && $package eq 'main' && $line =~ /\w+/ ) {
} elsif ( $package eq 'main' && !exists($vers{main}) && $line =~ /\w/ ) {
$need_vers = 1;
$vers{main} = '';
push( @packages, 'main' );
Expand Down