rename Deparse to TraceFormatter and add ambient indent level

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

diff --git a/lib/DX/Step/EnterRecheck.pm b/lib/DX/Step/EnterRecheck.pm
index 2b7ac56..f0fffd1 100644 (file)
--- a/lib/DX/Step/EnterRecheck.pm
+++ b/lib/DX/Step/EnterRecheck.pm
@@ -7,17 +7,25 @@ use DX::Class;
 
 with 'DX::Role::Step';
 
-has proposition_list => (is => 'ro', required => 1);
+has proposition_list => (
+  is => 'ro', isa => PropositionList, required => 1
+);
 
-has on_completion_step => (is => 'ro', required => 1);
+has on_completion_step => (is => 'ro', isa => Step, required => 1);
 
-has on_failure_step => (is => 'ro', required => 1);
+has on_failure_step => (is => 'ro', isa => Maybe[Step], required => 1);
 
 sub apply_to {
   my ($self, $old_ss) = @_;
 
   my ($prop, @rest) = @{$self->proposition_list};
 
+  trace recheck => [ statement => [
+    [ symbol => 'recheck' ],
+    @{$prop->for_deparse->[1]},
+    [ 'enter_block' ],
+  ] ];
+
   my $old_hyp = $old_ss->current_hypothesis;
 
   # we should probably be doing something about pruning the scope
@@ -49,7 +57,7 @@ sub apply_to {
 
   my $ss = DX::SearchState->new(
     current_hypothesis => $hyp,
-    alternatives => [],
+    adjustments_made => [],
     propositions => $pseq,
     next_step => DX::Step::ConsiderProposition->new(
                    proposition => $prop,