Deprecate assignment to $[

[p5sagit/p5-mst-13.2.git] / lib / CPAN / Version.pm

diff --git a/lib/CPAN/Version.pm b/lib/CPAN/Version.pm
index 04f3780..da876aa 100644 (file)
--- a/lib/CPAN/Version.pm
+++ b/lib/CPAN/Version.pm
@@ -2,55 +2,78 @@ package CPAN::Version;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = sprintf "%.6f", substr(q$Rev: 844 $,4)/1000000 + 5.4;
+$VERSION = "5.5";
 
 # CPAN::Version::vcmp courtesy Jost Krieger
 sub vcmp {
-  my($self,$l,$r) = @_;
-  local($^W) = 0;
-  CPAN->debug("l[$l] r[$r]") if $CPAN::DEBUG;
-
-  return 0 if $l eq $r; # short circuit for quicker success
-
-  for ($l,$r) {
-      next unless tr/.// > 1;
-      s/^v?/v/;
-      1 while s/\.0+(\d)/.$1/;
-  }
-  if ($l=~/^v/ <=> $r=~/^v/) {
-      for ($l,$r) {
-          next if /^v/;
-          $_ = $self->float2vv($_);
-      }
-  }
-
-  return (
-          ($l ne "undef") <=> ($r ne "undef") ||
-          (
-           $] >= 5.006 &&
-           $l =~ /^v/ &&
-           $r =~ /^v/ &&
-           $self->vstring($l) cmp $self->vstring($r)
-          ) ||
-          $l <=> $r ||
-          $l cmp $r
-         );
+    my($self,$l,$r) = @_;
+    local($^W) = 0;
+    CPAN->debug("l[$l] r[$r]") if $CPAN::DEBUG;
+
+    return 0 if $l eq $r; # short circuit for quicker success
+
+    for ($l,$r) {
+        s/_//g;
+    }
+    CPAN->debug("l[$l] r[$r]") if $CPAN::DEBUG;
+    for ($l,$r) {
+        next unless tr/.// > 1 || /^v/;
+        s/^v?/v/;
+        1 while s/\.0+(\d)/.$1/; # remove leading zeroes per group
+    }
+    CPAN->debug("l[$l] r[$r]") if $CPAN::DEBUG;
+    if ($l=~/^v/ <=> $r=~/^v/) {
+        for ($l,$r) {
+            next if /^v/;
+            $_ = $self->float2vv($_);
+        }
+    }
+    CPAN->debug("l[$l] r[$r]") if $CPAN::DEBUG;
+    my $lvstring = "v0";
+    my $rvstring = "v0";
+    if ($] >= 5.006
+     && $l =~ /^v/
+     && $r =~ /^v/) {
+        $lvstring = $self->vstring($l);
+        $rvstring = $self->vstring($r);
+        CPAN->debug(sprintf "lv[%vd] rv[%vd]", $lvstring, $rvstring) if $CPAN::DEBUG;
+    }
+
+    return (
+            ($l ne "undef") <=> ($r ne "undef")
+            ||
+            $lvstring cmp $rvstring
+            ||
+            $l <=> $r
+            ||
+            $l cmp $r
+    );
 }
 
 sub vgt {
-  my($self,$l,$r) = @_;
-  $self->vcmp($l,$r) > 0;
+    my($self,$l,$r) = @_;
+    $self->vcmp($l,$r) > 0;
 }
 
 sub vlt {
-  my($self,$l,$r) = @_;
-  0 + ($self->vcmp($l,$r) < 0);
+    my($self,$l,$r) = @_;
+    0 + ($self->vcmp($l,$r) < 0);
+}
+
+sub vge {
+    my($self,$l,$r) = @_;
+    $self->vcmp($l,$r) >= 0;
+}
+
+sub vle {
+    my($self,$l,$r) = @_;
+    0 + ($self->vcmp($l,$r) <= 0);
 }
 
 sub vstring {
-  my($self,$n) = @_;
-  $n =~ s/^v// or die "CPAN::Version::vstring() called with invalid arg [$n]";
-  pack "U*", split /\./, $n;
+    my($self,$n) = @_;
+    $n =~ s/^v// or die "CPAN::Version::vstring() called with invalid arg [$n]";
+    pack "U*", split /\./, $n;
 }
 
 # vv => visible vstring
@@ -69,35 +92,36 @@ sub float2vv {
         $ret .= ".".int($1);
     }
     # warn "n[$n]ret[$ret]";
+    $ret =~ s/(\.0)+/.0/; # v1.0.0 => v1.0
     $ret;
 }
 
 sub readable {
-  my($self,$n) = @_;
-  $n =~ /^([\w\-\+\.]+)/;
-
-  return $1 if defined $1 && length($1)>0;
-  # if the first user reaches version v43, he will be treated as "+".
-  # We'll have to decide about a new rule here then, depending on what
-  # will be the prevailing versioning behavior then.
-
-  if ($] < 5.006) { # or whenever v-strings were introduced
-    # we get them wrong anyway, whatever we do, because 5.005 will
-    # have already interpreted 0.2.4 to be "0.24". So even if he
-    # indexer sends us something like "v0.2.4" we compare wrongly.
-
-    # And if they say v1.2, then the old perl takes it as "v12"
-
-    if (defined $CPAN::Frontend) {
-      $CPAN::Frontend->mywarn("Suspicious version string seen [$n]\n");
-    } else {
-      warn("Suspicious version string seen [$n]\n");
+    my($self,$n) = @_;
+    $n =~ /^([\w\-\+\.]+)/;
+
+    return $1 if defined $1 && length($1)>0;
+    # if the first user reaches version v43, he will be treated as "+".
+    # We'll have to decide about a new rule here then, depending on what
+    # will be the prevailing versioning behavior then.
+
+    if ($] < 5.006) { # or whenever v-strings were introduced
+        # we get them wrong anyway, whatever we do, because 5.005 will
+        # have already interpreted 0.2.4 to be "0.24". So even if he
+        # indexer sends us something like "v0.2.4" we compare wrongly.
+
+        # And if they say v1.2, then the old perl takes it as "v12"
+
+        if (defined $CPAN::Frontend) {
+            $CPAN::Frontend->mywarn("Suspicious version string seen [$n]\n");
+        } else {
+            warn("Suspicious version string seen [$n]\n");
+        }
+        return $n;
     }
-    return $n;
-  }
-  my $better = sprintf "v%vd", $n;
-  CPAN->debug("n[$n] better[$better]") if $CPAN::DEBUG;
-  return $better;
+    my $better = sprintf "v%vd", $n;
+    CPAN->debug("n[$n] better[$better]") if $CPAN::DEBUG;
+    return $better;
 }
 
 1;
@@ -145,5 +169,5 @@ modify it under the same terms as Perl itself.
 
 # Local Variables:
 # mode: cperl
-# cperl-indent-level: 2
+# cperl-indent-level: 4
 # End: