pass rspace to backtrack (as yet unused), tweak DependencyMap API

[scpubgit/DX.git] / lib / DX / ResolvedPropositionSet.pm

diff --git a/lib/DX/ResolvedPropositionSet.pm b/lib/DX/ResolvedPropositionSet.pm
index af12e5b..3a383b4 100644 (file)
--- a/lib/DX/ResolvedPropositionSet.pm
+++ b/lib/DX/ResolvedPropositionSet.pm
@@ -1,14 +1,16 @@
 package DX::ResolvedPropositionSet;
 
 use DX::DependencyMap;
-use Types::Standard qw(ArrayRef);
+use DX::Utils qw(deparse);
 use DX::Class;
 
 has dependency_map => (is => 'ro', isa => DependencyMap, required => 1);
 
 has propositions => (is => 'ro', isa => ArrayRef[Proposition], required => 1);
 
-has scope_depth => (is => 'ro', required => 1);
+has scope_depth => (is => 'ro', isa => Int, required => 1);
+
+sub resolved_count { scalar @{$_[0]->propositions} }
 
 sub new_empty {
   my ($class) = @_;
@@ -23,7 +25,7 @@ sub with_resolution_for {
   my ($self, $prop, $deps) = @_;
   my $id = my @already = @{$self->propositions};
   my $new_depmap = $self->dependency_map
-                        ->with_entry_for($id, $deps);
+                        ->with_dependencies_for($id, $deps);
   ref($self)->new(
     dependency_map => $new_depmap,
     propositions => [ @already, $prop ],
@@ -38,7 +40,7 @@ sub with_updated_dependencies_for {
   # 0 is valid, undef means the grep failed
   die "Unable to find $prop in proplist" unless defined $id;
   my $new_depmap = $self->dependency_map
-                        ->with_entry_for($id, $deps);
+                        ->with_dependencies_for($id, $deps);
   ref($self)->new(
     dependency_map => $new_depmap,
     propositions => \@props,
@@ -65,7 +67,7 @@ sub dependencies_for {
   my ($id) = grep $props[$_] eq $prop, 0..$#props;
   # 0 is valid, undef means the grep failed
   die "Unable to find $prop in proplist" unless defined $id;
-  return $self->dependency_map->dependencies_for($id);
+  return $self->dependency_map->dependencies_for($id)||[];
 }
 
 1;