rspace tracing

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

diff --git a/lib/DX/Step/ResolveProposition.pm b/lib/DX/Step/ResolveProposition.pm
index 07a0d5c..3969867 100644 (file)
--- a/lib/DX/Step/ResolveProposition.pm
+++ b/lib/DX/Step/ResolveProposition.pm
@@ -4,13 +4,16 @@ use DX::Step::EnterRecheck;
 use DX::Step::Backtrack;
 
 use Types::Standard qw(ArrayRef);
-use DX::Utils qw(deparse step);
+use DX::Utils qw(expand_deps);
 
 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);
 
@@ -26,25 +29,14 @@ has actions => (is => 'lazy', init_arg => undef, builder => sub {
 
 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} ];
+  expand_deps($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
-  );
+  return $rspace->next_step;
 });
 
 sub but_first {
@@ -59,6 +51,30 @@ sub but_with_dependencies_on {
 
 sub apply_to {
   my ($self, $old_ss) = @_;
+  trace resolve => [ statement => [
+    [ symbol => 'resolve' ],
+    [ block => [
+      [ statement => [
+        [ symbol => 'proposition' ],
+        @{$self->resolves->for_deparse->[1]},
+      ] ],
+      (@{$self->actions}
+        ? [ statement => [
+            [ symbol => 'actions' ],
+            [ block => $self->actions ],
+          ] ]
+        : ()),
+      [ statement => [
+        [ symbol => 'depends_on' ],
+        [ pairs => [
+          map [
+            (split '::', ${$_->[0]})[-1],
+            [ value_path => [ @{$_}[1..$#$_] ] ]
+          ], @{$self->depends_on}
+        ] ],
+      ] ],
+    ] ]
+  ] ];
   my $ns = do {
     if (my $prop = $old_ss->next_proposition) {
       DX::Step::ConsiderProposition->new(
@@ -70,13 +86,10 @@ sub apply_to {
   };
   my $ss = $old_ss->but(
     next_step => $ns,
-    (@{$self->actions}
-      ? (adjustments_made => [
-          [ $self, $old_ss ],
-          @{$old_ss->adjustments_made}
-        ])
-      : ()
-    ),
+    decisions_taken => [
+      [ $self->resolution_space, $old_ss ],
+      @{$old_ss->decisions_taken}
+    ],
   );
   my $new_ss = $self->_apply_to_ss($ss);
   return $ss->but(next_step => DX::Step::Backtrack->new) unless $new_ss;