Add string comparison for atoms

[perl/modules/CPANPLUS-Dist-Gentoo.git] / lib / CPANPLUS / Dist / Gentoo / Atom.pm

diff --git a/lib/CPANPLUS/Dist/Gentoo/Atom.pm b/lib/CPANPLUS/Dist/Gentoo/Atom.pm
index a560326e6c19636cd43c7ef3b32e9663c307f7f4..002b349be48a31dc5ff532f80760a49bf5456df6 100644 (file)
--- a/lib/CPANPLUS/Dist/Gentoo/Atom.pm
+++ b/lib/CPANPLUS/Dist/Gentoo/Atom.pm
@@ -10,6 +10,7 @@ use Scalar::Util ();
 
 use overload (
  '<=>' => \&_spaceship,
+ 'cmp' => \&_cmp,
  '""'  => \&_stringify,
 );
 
@@ -75,6 +76,8 @@ BEGIN {
  eval "sub $_ { \$_[0]->{$_} }" for qw/category name version range ebuild/;
 }
 
+sub qualified_name { join '/', $_[0]->category, $_[0]->name }
+
 sub _spaceship {
  my ($a1, $a2, $r) = @_;
 
@@ -94,10 +97,29 @@ sub _spaceship {
  return $v1 <=> $v2;
 }
 
+sub _cmp {
+ my ($a1, $a2, $r) = @_;
+
+ my $s1 = $a1->qualified_name;
+ my $v1 = $a1->version;
+ $s1   .= "-$v1" if defined $v1;
+
+ my $s2;
+ if (Scalar::Util::blessed($a2) and $a2->isa(__PACKAGE__)) {
+  $s2    = $a2->qualified_name;
+  my $v2 = $a2->version;
+  $s2   .= "-$v2" if defined $v2;
+ } else {
+  $s2 = $a2;
+ }
+
+ $s1 cmp $s2;
+}
+
 sub _stringify {
  my ($a) = @_;
 
- my $atom = $a->category . '/' . $a->name;
+ my $atom = $a->qualified_name;
 
  my $version = $a->version;
  $atom = $a->range . $atom . '-' . $version if defined $version;
@@ -120,8 +142,8 @@ sub and {
  my $a2 = shift;
  $a2 = $a2->and(@_) if @_;
 
- my $p1 = join '/', $a1->category, $a1->name;
- my $p2 = join '/', $a2->category, $a2->name;
+ my $p1 = $a1->qualified_name;
+ my $p2 = $a2->qualified_name;
  Carp::confess("Atoms for different packages $p1 and $p2") unless $p1 eq $p2;
 
  my $v1 = $a1->version;
@@ -160,7 +182,7 @@ sub fold {
 
  my %seen;
  for my $atom (@_) {
-  my $key = join '/', $atom->category, $atom->name;
+  my $key = $atom->qualified_name;
 
   my $cur = $seen{$key};
   $seen{$key} = defined $cur ? $cur->and($atom) : $atom;