cut support

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

diff --git a/lib/DX/State.pm b/lib/DX/State.pm
index 66287dd..83e8cc3 100644 (file)
--- a/lib/DX/State.pm
+++ b/lib/DX/State.pm
@@ -2,6 +2,7 @@ package DX::State;
 
 use Return::MultiLevel qw(with_return);
 use DX::Op::FromCode;
+use Scalar::Util qw(blessed);
 use Moo;
 
 has next_op => (is => 'ro', required => 1);
@@ -14,16 +15,61 @@ has scope => (is => 'ro', required => 1);
 
 has last_choice => (is => 'ro', required => 1);
 
+has id_gen => (is => 'ro', default => sub { {} });
+
+has rule_set => (is => 'ro');
+
+has facts => (is => 'ro');
+
 sub scope_var {
   my ($self, $name) = @_;
   $self->by_id->{$self->scope->{$name}};
 }
 
+sub allocate_var {
+  my ($self, $name, $var, $id_gen) = @_;
+  my $id = join('_', $name, ++($id_gen->{$name}||='000'));
+  DX::Var->new(id => $id, %$var);
+}
+
+sub expand_vars {
+  my ($self, %vars) = @_;
+  my %by_id = %{$self->by_id};
+  my %id_gen = %{$self->id_gen};
+  foreach my $name (keys %vars) {
+    unless (blessed($vars{$name})) {
+      my $var = $vars{$name} = $self->allocate_var(
+        $name, $vars{$name}, \%id_gen
+      );
+      $by_id{$var->id} = $var;
+    }
+  }
+  $self->but(
+    by_id => \%by_id, id_gen => \%id_gen,
+  ), %vars;
+}
+
+sub assign_vars {
+  my ($self, %vars) = @_;
+  my ($state, %expanded) = $self->expand_vars(%vars);
+  $state->but(
+    scope => { %{$self->scope}, map +($_ => $expanded{$_}->id), keys %expanded }
+  );
+}
+
+sub bind_var_then {
+  my ($self, $var, $value, $then) = @_;
+  my $bound = $var->with_value($value);
+  $self->but(
+    by_id => { %{$self->by_id}, $var->id => $bound },
+    next_op => $then
+  );
+}
+
 sub bind_stream_then {
   my ($self, $var, $stream, $then) = @_;
-  warn "Binding ".$var->id." to $stream";
   my $bound = $var->with_stream($stream);
-  $self->new(%$self,
+  $self->but(
     by_id => { %{$self->by_id}, $var->id => $bound },
     next_op => $then
   )->mark_choice($bound);
@@ -31,9 +77,7 @@ sub bind_stream_then {
 
 sub mark_choice {
   my ($self, $var) = @_;
-  $self->new(%$self,
-    last_choice => [ $self, $var ]
-  );
+  $self->but(last_choice => [ $self, $var ]);
 }
 
 sub backtrack {
@@ -43,39 +87,25 @@ sub backtrack {
     $var->bound_value; $var->clear_bound_value;
     return $state->mark_choice($var) unless $var->bound_stream->is_exhausted;
   }
-  if (our $No_Options_Handler) {
-    $No_Options_Handler->(undef);
-  }
-  die "Out of options";
+  $self->return_from_run(undef);
 }
 
 sub then {
   my ($self, $then) = @_;
-  $self->new(%$self, next_op => $then);
+  $self->but(next_op => $then);
 }
 
-sub select_next_op {
-  my ($self) = @_;
-  return $self->next_op || do {
-    if (my @stack = @{$self->return_stack}) {
-      my $top = pop @stack;
-      DX::Op::FromCode->new(
-        code => sub {
-          $_[1]->new(%{$_[1]}, return_stack => \@stack, next_op => $top)
-        }
-      );
-    } else {
-      undef;
-    }
-  };
+sub return_from_run {
+  my (undef, $return) = @_;
+  (our $Nonlocal_Return)->($return);
 }
 
 sub run {
   my ($state) = @_;
   with_return {
     my ($return) = @_;
-    local our $No_Options_Handler = $return;
-    while (my $op = $state->select_next_op) {
+    local our $Nonlocal_Return = $return;
+    while (my $op = $state->next_op) {
       $state = $op->run($state);
     }
     return $state;
@@ -86,4 +116,24 @@ sub push_backtrack {
   $_[0]->then(DX::Op::FromCode->new(code => sub { $_[1]->backtrack }));
 }
 
+sub but {
+  my ($self, @but) = @_;
+  $self->new(%$self, @but);
+}
+
+sub pop_return_stack {
+  my ($self) = @_;
+  my @stack = @{$self->return_stack};
+  my $top = pop @stack;
+  $self->but(return_stack => \@stack, next_op => $top->[0]);
+}
+
+sub push_return_then {
+  my ($self, $return, $then) = @_;
+  $self->but(
+    return_stack => [ @{$self->return_stack}, [ $return, $self ] ],
+    next_op => $then
+  );
+}
+
 1;