package DX::State;
use Return::MultiLevel qw(with_return);
-use DX::Op::FromCode;
+use DX::Op::Backtrack;
use Scalar::Util qw(blessed);
use Moo;
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 {