[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 02/03: L::DepMap: Rename "map" field to "pending"



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit fd0c9f6dd97dad34879a20c0659b44a30a3c842e
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Aug 20 21:54:44 2013 +0200

    L::DepMap: Rename "map" field to "pending"
    
    Reverse-engineering of L::DepMap suggests that the field "map" seem to
    be the set of pending nodes.  Furthermore, it seems that the actual
    value associated with members in this set is ignored, so just set it
    to 1.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 lib/Lintian/DepMap.pm |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/Lintian/DepMap.pm b/lib/Lintian/DepMap.pm
index 01a27a2..21866c7 100644
--- a/lib/Lintian/DepMap.pm
+++ b/lib/Lintian/DepMap.pm
@@ -154,9 +154,9 @@ sub add {
         $self->{'nodes'}{$node}->{'parents'}->{$parent} = $self->{'nodes'}{$parent};
     }
     unless ($parents || scalar %{$self->{'nodes'}{$node}->{'parents'}}) {
-        $self->{'map'}{$node} = $self->{'nodes'}{$node};
-    } elsif (exists $self->{'map'}{$node}) {
-        delete $self->{'map'}{$node};
+        $self->{'pending'}{$node} = 1;
+    } elsif (exists $self->{'pending'}{$node}) {
+        delete $self->{'pending'}{$node};
     }
     return 1;
 }
@@ -221,7 +221,7 @@ sub satisfy {
         fail("Attempted to mark node '$node' as satisfied but it is not ".
                     'reachable, perhaps you forgot to satisfy() its dependencies first?');
     }
-    return 0 unless (exists($self->{'map'}{$node}));
+    return 0 unless (exists($self->{'pending'}{$node}));
 
     delete $self->{'selected'}{$node}
         if exists($self->{'selected'}{$node});
@@ -232,11 +232,11 @@ sub satisfy {
         delete $self->{'nodes'}{$branch}->{'parents'}->{$node};
         delete $self->{'nodes'}{$node}->{'branches'}->{$branch};
         unless (scalar keys %{$self->{'nodes'}{$branch}->{'parents'}}) {
-            $self->{'map'}{$branch} = $self->{'nodes'}{$branch};
+            $self->{'pending'}{$branch} = 1;
         }
     }
 
-    delete $self->{'map'}{$node};
+    delete $self->{'pending'}{$node};
     delete $self->{'nodes'}{$node};
     return 1;
 }
@@ -299,8 +299,8 @@ sub unlink {
                     ', perhaps it has already been satisfied?');
     }
 
-    delete $self->{'map'}{$node}
-        if (exists($self->{'map'}{$node}));
+    delete $self->{'pending'}{$node}
+        if (exists($self->{'pending'}{$node}));
 
     delete $self->{'selected'}{$node}
         if (exists($self->{'selected'}{$node}));
@@ -344,7 +344,7 @@ sub select {
     my $self = shift;
     my $node = shift;
 
-    if (not exists($self->{'map'}{$node})) {
+    if (not exists($self->{'pending'}{$node})) {
         fail("Attempted to mark node '$node' as selected but it is not ".
                     'known, perhaps its parents are not yet satisfied?');
     }
@@ -370,9 +370,9 @@ sub selectable {
     my $self = shift;
     my $node = shift;
 
-    return (exists $self->{'map'}{$node} and not exists $self->{'selected'}{$node})
+    return (exists $self->{'pending'}{$node} and not exists $self->{'selected'}{$node})
         if (defined($node));
-    return grep {not exists $self->{'selected'}{$_}} keys %{$self->{'map'}};
+    return grep {not exists $self->{'selected'}{$_}} keys %{$self->{'pending'}};
 }
 
 =item selected([node])
@@ -464,7 +464,7 @@ Return the number of nodes that can or have already been selected. E.g.
 sub pending {
     my $self = shift;
 
-    return (scalar keys %{$self->{'map'}});
+    return (scalar keys %{$self->{'pending'}});
 }
 
 =item known()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: