factor action execution out into solver method

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

diff --git a/lib/DX/Solver.pm b/lib/DX/Solver.pm
index 51fcdbe..2042a10 100644 (file)
--- a/lib/DX/Solver.pm
+++ b/lib/DX/Solver.pm
@@ -18,8 +18,7 @@ sub query {
   my ($self, $vars, @terms) = @_;
   my $rule_set = $self->rule_set;
   push @terms, map +[ materialize => $_ ], @$vars;
-  my $head = reduce { $b->but(next => $a) }
-               reverse map $rule_set->expand(@$_), @terms;
+  my $head = $rule_set->expand_and_link(undef, @terms);
   my $state = DX::State->new(
     next_op => $head,
     return_stack => [],
@@ -37,4 +36,12 @@ sub query {
   );
 }
 
+sub run_action {
+  my ($self, $action) = @_;
+  my @invalidate = $action->run;
+  while (my ($type, $value) = splice @invalidate, 0, 2) {
+    $self->facts->{$type}->remove_value($value);
+  }
+}
+
 1;