switchover to rspace next_step and dump step()

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

diff --git a/lib/DX/Step/ResolveProposition.pm b/lib/DX/Step/ResolveProposition.pm
index 1b4cd26..3416c27 100644 (file)
--- a/lib/DX/Step/ResolveProposition.pm
+++ b/lib/DX/Step/ResolveProposition.pm
@@ -4,13 +4,15 @@ use DX::Step::EnterRecheck;
 use DX::Step::Backtrack;
 
 use Types::Standard qw(ArrayRef);
-use DX::Utils qw(deparse step);
 
 use DX::Class;
 
 with 'DX::Role::Step';
 
-has resolves => (is => 'ro', isa => Proposition);
+has resolves => (is => 'lazy', init_arg => undef, builder => sub {
+  my ($self) = @_;
+  $self->resolution_space->proposition;
+});
 
 has resolution_space => (is => 'ro', isa => ResolutionSpace);
 
@@ -41,10 +43,7 @@ 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 step(
-    resolves => $self->resolves,
-    resolution_space => $rspace
-  );
+  return $rspace->next_step;
 });
 
 sub but_first {