use FactRef objects to sanify action handling

[scpubgit/DKit.git] / lib / DX / State.pm

diff --git a/lib/DX/State.pm b/lib/DX/State.pm
index 83e8cc3..1f84991 100644 (file)
--- a/lib/DX/State.pm
+++ b/lib/DX/State.pm
@@ -1,8 +1,9 @@
 package DX::State;
 
 use Return::MultiLevel qw(with_return);
-use DX::Op::FromCode;
+use DX::Op::Backtrack;
 use Scalar::Util qw(blessed);
+use Safe::Isa;
 use Moo;
 
 has next_op => (is => 'ro', required => 1);
@@ -21,11 +22,22 @@ has rule_set => (is => 'ro');
 
 has facts => (is => 'ro');
 
+has dependencies => (is => 'ro', default => sub { {} });
+
 sub scope_var {
   my ($self, $name) = @_;
   $self->by_id->{$self->scope->{$name}};
 }
 
+sub resolve_value {
+  my ($self, $var) = @_;
+  my $val = $var->bound_value;
+  if ($val->$_does('DX::Role::Ref')) {
+    return $val->resolve($self);
+  }
+  return $val;
+}
+
 sub allocate_var {
   my ($self, $name, $var, $id_gen) = @_;
   my $id = join('_', $name, ++($id_gen->{$name}||='000'));
@@ -57,21 +69,27 @@ sub assign_vars {
   );
 }
 
-sub bind_var_then {
-  my ($self, $var, $value, $then) = @_;
-  my $bound = $var->with_value($value);
+sub bind_value {
+  my ($self, $var_id, $value) = @_;
+  my $bound = $self->by_id->{$var_id}->with_value($value);
   $self->but(
-    by_id => { %{$self->by_id}, $var->id => $bound },
-    next_op => $then
+    by_id => { %{$self->by_id}, $var_id => $bound },
   );
 }
 
-sub bind_stream_then {
-  my ($self, $var, $stream, $then) = @_;
+sub bind_stream {
+  my ($self, $var, $stream) = @_;
   my $bound = $var->with_stream($stream);
   $self->but(
     by_id => { %{$self->by_id}, $var->id => $bound },
-    next_op => $then
+  )->mark_choice($bound);
+}
+
+sub bind_root_set {
+  my ($self, $var_id, $set) = @_;
+  my $bound = $self->by_id->{$var_id}->with_root_set($set);
+  $self->but(
+    by_id => { %{$self->by_id}, $var_id => $bound },
   )->mark_choice($bound);
 }
 
@@ -97,23 +115,36 @@ sub then {
 
 sub return_from_run {
   my (undef, $return) = @_;
-  (our $Nonlocal_Return)->($return);
+  (our $Run_Return)->($return);
+}
+
+sub return_from_op {
+  my (undef, $return) = @_;
+  if (our $Op_Return) {
+    $Op_Return->($return);
+  }
 }
 
 sub run {
   my ($state) = @_;
   with_return {
     my ($return) = @_;
-    local our $Nonlocal_Return = $return;
+    local our $Run_Return = $return;
     while (my $op = $state->next_op) {
-      $state = $op->run($state);
+      my $backtrack = with_return {
+        my ($return) = @_;
+        local our $Op_Return = $return;
+        $state = $op->run($state);
+        return;
+      };
+      if ($backtrack) { $state = $state->backtrack }
     }
     return $state;
   }
 }
 
 sub push_backtrack {
-  $_[0]->then(DX::Op::FromCode->new(code => sub { $_[1]->backtrack }));
+  $_[0]->then(DX::Op::Backtrack->new);
 }
 
 sub but {
@@ -136,4 +167,38 @@ sub push_return_then {
   );
 }
 
+sub add_dependencies {
+  my ($self, @pairs) = @_;
+  my %deps = %{$self->dependencies};
+  while (my ($from, $to) = splice(@pairs, 0, 2)) {
+    unless ($deps{$from}{$to}) {
+      $deps{$from} = { %{$deps{$from}||{}}, $to => 1 };
+    }
+  }
+  $self->but(dependencies => \%deps);
+}
+
+sub action_dependencies {
+  my ($self, @ids) = @_;
+  my @found;
+  my $deps = $self->dependencies;
+  my $by_id = $self->by_id;
+  my %seen;
+  my @queue = @ids;
+  while (my $id = shift @queue) {
+    $seen{$id}++;
+    push @found, $id if $by_id->{$id}->has_action;
+    push @queue, grep !$seen{$_}, keys %{$deps->{$id}};
+  }
+  return @found;
+}
+
+sub copy_vars {
+  my ($self) = @_;
+  my $by_id = $self->by_id;
+  $self->but(by_id => {
+    map +($_ => $by_id->{$_}->copy), keys %$by_id
+  });
+}
+
 1;