package DX::Step::ResolveProposition;
use DX::Step::EnterRecheck;
+use DX::Step::Backtrack;
use Types::Standard qw(ArrayRef);
use DX::Utils qw(deparse);
has actions => (is => 'ro', isa => ArrayRef[Action], required => 1);
-has depends_on => (is => 'ro', isa => DependencyGroupList, required => 1);
+#has depends_on => (is => 'ro', isa => DependencyGroupList, required => 1);
+
+has depends_on => (is => 'ro', required => 1, coerce => sub {
+ my ($dep_groups) = @_;
+ my @exp;
+ assert_DependencyGroupList $dep_groups;
+ [ map {
+ my ($on, @deps) = @$_;
+ my @exp;
+ DEP: foreach my $dep (@deps) {
+ my ($type, @path) = @$dep;
+ push @exp, [
+ $type,
+ map { ref() ? @{$_->identity_path or next DEP} : $_ } @path
+ ];
+ }
+ (@exp ? [ $on, @exp ] : ());
+ } @$dep_groups ];
+});
has resolves => (is => 'ro', isa => Proposition);
}
sub apply_to {
- my ($self, $ss) = @_;
- trace 'step.apply.old_hyp '.$self => $ss->current_hypothesis;
- trace 'step.apply.actions '.$self => $self->actions;
- my $new_ss = $self->_apply_to_ss($ss);
- return $ss->but(next_step => DX::Step::Backtrack->new) unless $new_ss;
- trace 'step.apply.new_hyp '.$self => $new_ss->current_hypothesis;
+ my ($self, $old_ss) = @_;
my $ns = do {
- if (my $prop = $new_ss->next_proposition) {
+ if (my $prop = $old_ss->next_proposition) {
DX::Step::ConsiderProposition->new(
proposition => $prop
)
} else {
- $new_ss->on_solution_step
+ $old_ss->on_solution_step
}
};
my $alt_step = $self->alternative_step;
- return (
- $new_ss->but(
- next_step => $ns,
- ($alt_step
- ? (alternatives => [
- [ $ss->current_hypothesis, $alt_step ],
- @{$ss->alternatives}
- ])
- : ()
- ),
+ my $ss = $old_ss->but(
+ next_step => $ns,
+ ($alt_step
+ ? (alternatives => [
+ [ $old_ss->current_hypothesis, $alt_step ],
+ @{$old_ss->alternatives}
+ ])
+ : ()
),
);
+ 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 {
sub _recheck_for {
my ($self, $old_ss, @recheck) = @_;
- return $old_ss unless @recheck;
- my $ss = $old_ss;
- foreach my $prop (@recheck) {
- return undef unless $ss = $self->_recheck_one($ss, $prop);
- }
- return $ss;
-}
-sub _recheck_one {
- my ($self, $old_ss, $prop) = @_;
+ return $old_ss unless @recheck;
my $ss = $old_ss->but(
next_step => DX::Step::EnterRecheck->new(
- proposition_list => [ $prop ],
- on_completion_step => DX::Step::MarkAsSolution->new,
+ proposition_list => \@recheck,
+ on_completion_step => $old_ss->next_step,
+ on_failure_step => DX::Step::Backtrack->new,
),
);
- my $sp = DX::SearchProcess->new(
- current_search_state => $ss,
- );
-
- my $sol_sp = $sp->find_solution;
-
- unless ($sol_sp) {
- trace 'step.recheck.fail' => 'argh';
- return undef;
- }
-
- return $sol_sp->current_search_state->but(is_solution_state => 0);
+ return $ss;
}
1;