switch to preserving original step in alt list

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

diff --git a/lib/DX/SearchState.pm b/lib/DX/SearchState.pm
index 4966512..1742ff5 100644 (file)
--- a/lib/DX/SearchState.pm
+++ b/lib/DX/SearchState.pm
@@ -2,7 +2,7 @@ package DX::SearchState;
 
 use Types::Standard qw(Maybe);
 use DX::Step::Backtrack;
-use DX::Step::InvokeNextPredicate;
+use DX::Step::ConsiderProposition;
 use DX::Step::MarkAsSolution;
 use DX::Class;
 
@@ -21,10 +21,10 @@ has on_exhaustion_step => (is => 'ro', isa => Maybe[Step], required => 1);
 has on_solution_step => (is => 'ro', isa => Maybe[Step], required => 1);
 
 sub next_proposition {
-  my ($self, $hyp) = @_;
-  $hyp ||= $self->current_hypothesis;
+  my ($self) = @_;
+  my $hyp = $self->current_hypothesis;
   $self->propositions->members->[
-    $hyp->resolved_propositions->resolved_count
+    $hyp->resolved_propositions->resolved_count + 1
   ];
 }
 
@@ -36,7 +36,7 @@ sub new_for {
     propositions => $props,
     (@{$props->members}
       ? (
-          next_step => DX::Step::InvokeNextPredicate->new(
+          next_step => DX::Step::ConsiderProposition->new(
             proposition => $props->members->[0],
           ),
           is_solution_state => 0,
@@ -51,6 +51,7 @@ sub new_for {
 sub with_one_step {
   my ($self) = @_;
   return undef unless my $step = $self->next_step;
+  trace step => $step;
   return $step->apply_to($self);
 }
 
@@ -58,7 +59,6 @@ sub force_backtrack {
   my ($self) = @_;
   my ($first_alt, @rest_alt) = @{$self->alternatives};
   return undef unless $first_alt;
-  trace 'search.backtrack.forced' => $first_alt->[0];
   return $self->but(
     next_step => DX::Step::Backtrack->new,
   )->with_one_step;