lift some of the rspace handling into the Resolution* classes

[scpubgit/DX.git] / lib / DX / Role / Predicate.pm

diff --git a/lib/DX/Role/Predicate.pm b/lib/DX/Role/Predicate.pm
index ffd903a..1738d84 100644 (file)
--- a/lib/DX/Role/Predicate.pm
+++ b/lib/DX/Role/Predicate.pm
@@ -1,50 +1,35 @@
 package DX::Role::Predicate;
 
 use List::Util qw(reduce);
-use DX::Utils qw(step);
+use DX::Utils qw(step CONTENTS_OF);
 use DX::Role;
 
-sub resolution_step_for {
+sub _possible_resolution_list {
   my ($self, @args) = @_;
+  my $rspace = $self->_resolution_space_for(@args);
+  my @res;
+  while (my $next_res = $rspace->next_resolution) {
+    $rspace = $rspace->remaining_resolution_space;
+    push @res, step(
+      actions => $next_res->actions,
+      depends_on => $next_res->veracity_depends_on,
+    );
+  }
+  return @res;
+}
+
+sub resolution_step_for {
+  my ($self, $prop, @args) = @_;
   my ($last, @rest) = reverse $self->_possible_resolution_list(@args);
   return undef unless $last;
-  my $targ = $last;
-  $targ = $_->but_with_alternative_step($targ) for @rest;
+  my $targ = $last->but(resolves => $prop);
+  $targ = $_->but(
+    alternative_step => $targ,
+    resolves => $prop
+  ) for @rest;
   return $targ;
 }
 
-sub _make_equal {
-  my ($self, $left, $right) = @_;
-  if ($left->equals($right)) {
-    return step(
-      actions => [],
-      depends_on => [ $left, $right ],
-    );
-  }
-  return (
-    do {
-      if ($left->is_set and my $set = $right->action_for_set_value($left)) {
-        step(
-          actions => [ $set ],
-          depends_on => [ [ $right => [ $left, $right ] ] ],
-        )
-      } else {
-        ()
-      }
-    },
-    do {
-      if ($right->is_set and my $set = $left->action_for_set_value($right)) {
-        step(
-          actions => [ $set ],
-          depends_on => [ [ $left => [ $left, $right ] ] ],
-        )
-      } else {
-        ()
-      }
-    },
-  );
-}
-
 sub selection_depends_on {
   my ($self, @args) = @_;
   \@args;