indirect via resolve_value method

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

diff --git a/lib/DX/State.pm b/lib/DX/State.pm
index 106bbfc..d397958 100644 (file)
--- a/lib/DX/State.pm
+++ b/lib/DX/State.pm
@@ -21,11 +21,18 @@ 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) = @_;
+  $var->bound_value;
+}
+
 sub allocate_var {
   my ($self, $name, $var, $id_gen) = @_;
   my $id = join('_', $name, ++($id_gen->{$name}||='000'));
@@ -58,28 +65,26 @@ sub assign_vars {
 }
 
 sub bind_value {
-  my ($self, $var, $value) = @_;
-  my $bound = $var->with_value($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 },
+    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_then {
-  my ($self, $var, $set, $then) = @_;
-  my $bound = $var->with_root_set($set);
+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 },
-    next_op => $then
+    by_id => { %{$self->by_id}, $var_id => $bound },
   )->mark_choice($bound);
 }
 
@@ -157,4 +162,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;