add exists, convert dot_ssh to use prop for everything

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

diff --git a/lib/DX/State.pm b/lib/DX/State.pm
index c430176..e87682a 100644 (file)
--- a/lib/DX/State.pm
+++ b/lib/DX/State.pm
@@ -1,7 +1,7 @@
 package DX::State;
 
 use Return::MultiLevel qw(with_return);
-use DX::Op::FromCode;
+use DX::Op::Backtrack;
 use Scalar::Util qw(blessed);
 use Moo;
 
@@ -57,12 +57,11 @@ 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 },
   );
 }
 
@@ -75,6 +74,15 @@ sub bind_stream_then {
   )->mark_choice($bound);
 }
 
+sub bind_root_set_then {
+  my ($self, $var_id, $set, $then) = @_;
+  my $bound = $self->by_id->{$var_id}->with_root_set($set);
+  $self->but(
+    by_id => { %{$self->by_id}, $var_id => $bound },
+    next_op => $then
+  )->mark_choice($bound);
+}
+
 sub mark_choice {
   my ($self, $var) = @_;
   $self->but(last_choice => [ $self, $var ]);
@@ -97,23 +105,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 {
@@ -125,13 +146,13 @@ sub pop_return_stack {
   my ($self) = @_;
   my @stack = @{$self->return_stack};
   my $top = pop @stack;
-  $self->but(return_stack => \@stack, next_op => $top);
+  $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 ],
+    return_stack => [ @{$self->return_stack}, [ $return, $self ] ],
     next_op => $then
   );
 }