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(deparse);
+use DX::Utils qw(expand_deps);
use DX::Class;
with 'DX::Role::Step';
-has actions => (is => 'ro', isa => ArrayRef[Action], required => 1);
-
-#has depends_on => (is => 'ro', isa => DependencyGroupList, required => 1);
-
-has depends_on => (is => 'ro', required => 1, coerce => sub {
- my ($deps) = @_;
- my @exp;
- DEP: foreach my $dep (@$deps) {
- my ($type, @path) = @$dep;
- push @exp, [
- $type,
- map { ref() ? @{$_->value_path or next DEP} : $_ } @path
- ];
- }
- \@exp
-});
-
-has resolves => (is => 'ro', isa => Proposition);
-
-has alternative_step => (is => 'ro', isa => Step);
+has resolution_space => (is => 'ro', isa => ResolutionSpace);
sub but_first {
my ($self, @actions) = @_;
sub apply_to {
my ($self, $old_ss) = @_;
- my $ns = do {
- if (my $prop = $old_ss->next_proposition) {
- DX::Step::ConsiderProposition->new(
- proposition => $prop
- )
- } else {
- $old_ss->on_solution_step
- }
- };
- my $alt_step = $self->alternative_step;
+ my $rspace = $self->resolution_space;
+ my $prop = $rspace->proposition;
+ my $res = $rspace->next_resolution;
+ my $vdeps = $res->veracity_depends_on;
+ trace resolve => [ statement => [
+ [ symbol => 'resolve' ],
+ [ block => [
+ [ statement => [
+ [ symbol => 'proposition' ],
+ @{$prop->for_deparse->[1]},
+ ] ],
+ (@{$res->actions}
+ ? [ statement => [
+ [ symbol => 'actions' ],
+ [ block => $res->actions ],
+ ] ]
+ : ()),
+ [ statement => [
+ [ symbol => 'depends_on' ],
+ [ block => [
+ map [ statement => [
+ [ symbol => (split '::', ${$_->[0]})[-1] ],
+ [ value_path => [ @{$_}[1..$#$_] ] ]
+ ] ], @{$vdeps}
+ ] ],
+ ] ],
+ ] ]
+ ] ];
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
+ $prop, $vdeps, $res->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(
+ unless ($hyp) {
+ return $ss->but(
+ next_step
+ => $rspace->remaining_resolution_space->next_step
+ );
+ }
+ 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,
+ resolution_space => $rspace,
),
);
-
- return $ss;
}
1;