X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git;a=blobdiff_plain;f=lib%2FCPANPLUS%2FDist%2FGentoo%2FVersion.pm;h=9b32f79548346a4d9c3b04e3909955c53cef40db;hp=d76bcb47df96ef041db48f4deb8253c3dfbf60dc;hb=6c4e16d17f4bee5aa01c2048f0a1e12d348eee67;hpb=400c6076d23a0fa83acac09fc3351653c527cb65 diff --git a/lib/CPANPLUS/Dist/Gentoo/Version.pm b/lib/CPANPLUS/Dist/Gentoo/Version.pm index d76bcb4..9b32f79 100644 --- a/lib/CPANPLUS/Dist/Gentoo/Version.pm +++ b/lib/CPANPLUS/Dist/Gentoo/Version.pm @@ -28,10 +28,9 @@ use overload ( '""' => \&_stringify, ); -my $int_rx = qr/[0-9]+/; -my $positive_int_rx = qr/0*[1-9][0-9]*/; -my $letter_rx = qr/[a-zA-Z]/; -my $dotted_num_rx = qr/$int_rx(?:\.$int_rx)*/o; +my $int_rx = qr/[0-9]+/; +my $letter_rx = qr/[a-zA-Z]/; +my $dotted_num_rx = qr/$int_rx(?:\.$int_rx)*/o; my @suffixes = qw; my $suffix_rx = join '|', grep !/^normal$/, @suffixes; @@ -39,14 +38,14 @@ $suffix_rx = qr/(?:$suffix_rx)/o; our $version_rx = qr{ $dotted_num_rx $letter_rx? - (?:_$suffix_rx$positive_int_rx?)* - (?:-r$positive_int_rx)? + (?:_$suffix_rx$int_rx?)* + (?:-r$int_rx)? }xo; my $capturing_version_rx = qr{ ($dotted_num_rx) ($letter_rx)? - ((?:_$suffix_rx$positive_int_rx?)*) - (?:-r($positive_int_rx))? + ((?:_$suffix_rx$int_rx?)*) + (?:-r($int_rx))? }xo; =head1 METHODS @@ -71,7 +70,7 @@ sub new { string => $vstring, version => [ split /\.+/, $1 ], letter => $2, - suffixes => [ map /_($suffix_rx)($positive_int_rx)?/go, $3 ], + suffixes => [ map /_($suffix_rx)($int_rx)?/go, $3 ], revision => $4, }, $class; }