bitlair/revbank
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Formal mechanism for retrying input

Browse source 
This allows for alias plugins with better error messages and better
logging than with the $_[2] =~ s/// hack.
This commit is contained in:
Juerd Waalboer 2023-09-18 01:31:13 +02:00
parent b3cd3833f1
commit fbb178d5ac
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/RevBank/Global.pm
View file

@ -18,6 +18,7 @@ sub import {
*{"$caller\::REJECT"} = sub () { \3 };
*{"$caller\::NEXT"} = sub () { \4 };
*{"$caller\::DONE"} = sub () { \5 };
*{"$caller\::REDO"} = sub () { \6 };
*{"$caller\::slurp"} = \&RevBank::FileIO::slurp;
*{"$caller\::spurt"} = \&RevBank::FileIO::spurt;
*{"$caller\::rewrite"} = \&RevBank::FileIO::rewrite;

9
lib/RevBank/Messages.pm
View file

@ -45,8 +45,13 @@ sub hook_abort($class, $cart, @) {
say "\e[1;4mABORTING TRANSACTION.\e[0m";
}
sub hook_invalid_input($class, $cart, $word, @) {
say "$word: No such product, user, or command.";
sub hook_invalid_input($class, $cart, $origword, $lastword, $allwords, @) {
say "$origword: No such product, user, or command.";
my @other = splice @$allwords, 1;
if (@other) {
$other[-1] =~ s/^/ and / if @other > 1;
say "(Also tried as " . join(@other > 2 ? ", " : "", @other) . ".)";
}
}
sub hook_reject($class, $plugin, $reason, $abort, @) {

14
revbank
View file

@ -200,9 +200,10 @@ OUTER: for (;;) {
abort if grep $_ eq 'abort', @words;
my $origword = my $word = shift @words;
my @allwords = ($origword);
push @retry, $word;
PLUGIN: for my $plugin (@plugins) {
ALL_PLUGINS: { PLUGIN: for my $plugin (@plugins) {
my ($rv, @rvargs) = eval { $plugin->$method($cart, $word) };
if ($@) {
call_hooks "plugin_fail", $plugin->id, $@;
@ -225,6 +226,13 @@ OUTER: for (;;) {
if ($rv == ABORT) {
abort(@rvargs);
}
if ($rv == REDO) {
$word = $rvargs[0];
call_hooks "redo", $plugin->id, $origword, $word;
push @allwords, $word;
redo ALL_PLUGINS;
}
if ($rv == REJECT) {
my ($reason) = @rvargs;
#abort if @words;
@ -253,11 +261,11 @@ OUTER: for (;;) {
call_hooks "plugin_fail", $plugin->id, "Invalid return value";
abort;
}
call_hooks "invalid_input", $cart, $origword, $word;
call_hooks "invalid_input", $cart, $origword, $word, \@allwords;
@retry = ();
abort if @words;
redo OUTER;
}
} }
}
}