skip backtracking rspaces with no alternatives left

[scpubgit/DX.git] / lib / DX / Step / Backtrack.pm

diff --git a/lib/DX/Step/Backtrack.pm b/lib/DX/Step/Backtrack.pm
index d14ca2f..9a92677 100644 (file)
--- a/lib/DX/Step/Backtrack.pm
+++ b/lib/DX/Step/Backtrack.pm
@@ -4,14 +4,21 @@ use DX::Class;
 
 with 'DX::Role::Step';
 
+#has resolution_space => (is => 'ro', isa => ResolutionSpace, required => 1);
+
 sub apply_to {
   my ($self, $ss) = @_;
   trace backtrack => [ statement => [ [ symbol => 'backtrack' ] ] ];
-  foreach my $adj (@{$ss->adjustments_made}) {
-    my ($step_was, $ss_was) = @$adj;
-    if (my $alt = $step_was->alternative_step) {
-      return $ss_was->but(next_step => $alt);
-    }
+  foreach my $adj (@{$ss->decisions_taken}) {
+    my ($rspace_was, $ss_was) = @$adj;
+    next unless @{$rspace_was->remaining_resolution_space->members};
+    trace rspace => [ statement => [
+      [ symbol => 'remaining' ],
+      @{$rspace_was->remaining_resolution_space->for_deparse->[1]}
+    ] ];
+    return $ss_was->but(
+      next_step => $rspace_was->remaining_resolution_space->next_step
+    );
   }
   return $ss->but(next_step => $ss->on_exhaustion_step);
 }