move ResolveProposition step over to rspace system

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

diff --git a/lib/DX/Step/ResolveProposition.pm b/lib/DX/Step/ResolveProposition.pm
index 173a0fa..07a0d5c 100644 (file)
--- a/lib/DX/Step/ResolveProposition.pm
+++ b/lib/DX/Step/ResolveProposition.pm
@@ -4,19 +4,48 @@ use DX::Step::EnterRecheck;
 use DX::Step::Backtrack;
 
 use Types::Standard qw(ArrayRef);
-use DX::Utils qw(deparse);
+use DX::Utils qw(deparse step);
 
 use DX::Class;
 
 with 'DX::Role::Step';
 
-has actions => (is => 'ro', isa => ArrayRef[Action], required => 1);
-
-has depends_on => (is => 'ro', isa => ArrayRef[DependencySpec], required => 1);
-
 has resolves => (is => 'ro', isa => Proposition);
 
-has alternative_step => (is => 'ro', isa => Step);
+has resolution_space => (is => 'ro', isa => ResolutionSpace);
+
+has current_resolution => (is => 'lazy', init_arg => undef, builder => sub {
+  my ($self) = @_;
+  $self->resolution_space->next_resolution;
+});
+
+has actions => (is => 'lazy', init_arg => undef, builder => sub {
+  my ($self) = @_;
+  $self->current_resolution->actions;
+});
+
+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} ];
+});
+
+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
+  );
+});
 
 sub but_first {
   my ($self, @actions) = @_;
@@ -39,7 +68,6 @@ sub apply_to {
       $old_ss->on_solution_step
     }
   };
-  my $alt_step = $self->alternative_step;
   my $ss = $old_ss->but(
     next_step => $ns,
     (@{$self->actions}