follow alternative rspace entries without backtracking, explicitly resolve

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

diff --git a/lib/DX/Step/ResolveProposition.pm b/lib/DX/Step/ResolveProposition.pm
index 3416c27..15ecf86 100644 (file)
--- a/lib/DX/Step/ResolveProposition.pm
+++ b/lib/DX/Step/ResolveProposition.pm
@@ -1,50 +1,24 @@
 package DX::Step::ResolveProposition;
 
 use DX::Step::EnterRecheck;
+use DX::Step::CompleteResolution;
 use DX::Step::Backtrack;
 
-use Types::Standard qw(ArrayRef);
+use DX::Utils qw(expand_deps);
 
 use DX::Class;
 
 with 'DX::Role::Step';
 
-has resolves => (is => 'lazy', init_arg => undef, builder => sub {
-  my ($self) = @_;
-  $self->resolution_space->proposition;
-});
-
 has resolution_space => (is => 'ro', isa => ResolutionSpace);
 
-has current_resolution => (is => 'lazy', init_arg => undef, builder => sub {
-  my ($self) = @_;
-  $self->resolution_space->next_resolution;
-});
+sub resolves { shift->resolution_space->proposition }
 
-has actions => (is => 'lazy', init_arg => undef, builder => sub {
-  my ($self) = @_;
-  $self->current_resolution->actions;
-});
+sub current_resolution { shift->resolution_space->next_resolution }
 
-has depends_on => (is => 'lazy', init_arg => undef, builder => sub {
-  my ($self) = @_;
-  my $_expand_dep = sub {
-    my ($type, @path) = @{$_[0]};
-    my @expanded = map {
-      ref() ? @{$_->value_path or return ()} : $_
-    } @path;
-    return [ $type, @expanded ];
-  };
-  [ map $_expand_dep->($_),
-      @{$self->current_resolution->veracity_depends_on} ];
-});
+sub actions { shift->current_resolution->actions }
 
-has alternative_step => (is => 'lazy', init_arg => undef, builder => sub {
-  my ($self) = @_;
-  my $rspace = $self->resolution_space->remaining_resolution_space;
-  return undef unless @{$rspace->members};
-  return $rspace->next_step;
-});
+sub depends_on { shift->current_resolution->veracity_depends_on }
 
 sub but_first {
   my ($self, @actions) = @_;
@@ -68,71 +42,41 @@ sub apply_to {
       (@{$self->actions}
         ? [ statement => [
             [ symbol => 'actions' ],
-            [ block => [ @{$self->actions} ] ],
+            [ block => $self->actions ],
           ] ]
         : ()),
       [ statement => [
         [ symbol => 'depends_on' ],
-        [ pairs => [
-          map [
-            (split '::', ${$_->[0]})[-1],
+        [ block => [
+          map [ statement => [
+            [ symbol => (split '::', ${$_->[0]})[-1] ],
             [ value_path => [ @{$_}[1..$#$_] ] ]
-          ], @{$self->depends_on}
+          ] ], @{$self->depends_on}
         ] ],
       ] ],
     ] ]
   ] ];
-  my $ns = do {
-    if (my $prop = $old_ss->next_proposition) {
-      DX::Step::ConsiderProposition->new(
-        proposition => $prop
-      )
-    } else {
-      $old_ss->on_solution_step
-    }
-  };
+  my $rspace = $self->resolution_space;
   my $ss = $old_ss->but(
-    next_step => $ns,
-    (@{$self->actions}
-      ? (adjustments_made => [
-          [ $self, $old_ss ],
-          @{$old_ss->adjustments_made}
-        ])
-      : ()
-    ),
+    next_step => DX::Step::CompleteResolution->new(
+      original_search_state => $old_ss,
+      resolution_space => $rspace,
+    )
   );
-  my $new_ss = $self->_apply_to_ss($ss);
-  return $ss->but(next_step => DX::Step::Backtrack->new) unless $new_ss;
-  return $new_ss;
-}
-
-sub _apply_to_ss {
-  my ($self, $old_ss) = @_;
   my $old_hyp = $old_ss->current_hypothesis;
   (my $hyp, my @recheck) = $old_hyp->with_resolution(
     $self->resolves, $self->depends_on, $self->actions
   );
-  return undef unless $hyp;
-  return $self->_recheck_for(
-    $old_ss->but(current_hypothesis => $hyp),
-    @recheck
-  );
-}
-
-sub _recheck_for {
-  my ($self, $old_ss, @recheck) = @_;
-
-  return $old_ss unless @recheck;
-
-  my $ss = $old_ss->but(
+  return $ss->but(next_step => DX::Step::Backtrack->new) unless $hyp;
+  return $ss->but(current_hypothesis => $hyp) unless @recheck;
+  return $ss->but(
+    current_hypothesis => $hyp,
     next_step => DX::Step::EnterRecheck->new(
       proposition_list => \@recheck,
-      on_completion_step => $old_ss->next_step,
-      on_failure_step => DX::Step::Backtrack->new,
+      on_completion_step => $ss->next_step,
+      on_failure_step => $rspace->remaining_resolution_space->next_step,
     ),
   );
-
-  return $ss;
 }
 
 1;