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

Let ^C interrupt only current command's argument prompts

Browse source 
Also, move the sub `abort` outside the infinite loop because it's just
too weird to have a named global function in a loop; the scope of the
outer lexicals is non-obvious.
This commit is contained in:
Juerd Waalboer 2025-01-05 05:30:16 +01:00
parent b396943881
commit 21f35a812e
1 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
revbank
View file

@ -17,7 +17,7 @@ use RevBank::Messages;
use RevBank::Cart; use RevBank::Cart;
use RevBank::Prompt; use RevBank::Prompt;
our $VERSION = "8.2.0"; our $VERSION = "8.2.2";
our %HELP1 = ( our %HELP1 = (
"abort" => "Abort the current transaction", "abort" => "Abort the current transaction",
@ -54,25 +54,40 @@ call_hooks("startup");
my $retry; # reason (text) my $retry; # reason (text)
my @retry; # (@accepted, $rejected, [@trailing]) my @retry; # (@accepted, $rejected, [@trailing])
my $prompt;
my @plugins;
my $method;
sub abort {
@words = ();
@retry = ();
my $is_interrupt = @_ && $_[0] eq "^C";
print "\n" if $is_interrupt;
if ($is_interrupt and $cart->size and ref $method) {
call_hooks "interrupt", $cart, \@_;
call_hooks "cart_changed", $cart; # XXX ugly; refactor redisplay with instructions
print "Pressing ^C again will also abort.\n";
} else {
print @_, " " unless $is_interrupt;
call_hooks "abort", $cart, \@_;
$cart->empty;
RevBank::FileIO::release_all_locks;
}
no warnings qw(exiting);
redo OUTER;
}
OUTER: for (;;) { OUTER: for (;;) {
if (not @words) { if (not @words) {
call_hooks("cart_changed", $cart) if $cart->changed; call_hooks("cart_changed", $cart) if $cart->changed;
print "\n"; print "\n";
} }
my $prompt = ""; $prompt = "";
my @plugins = RevBank::Plugins->new; @plugins = RevBank::Plugins->new;
my $method = "command"; $method = "command";
sub abort {
print @_, " " if @_;
@words = ();
@retry = ();
call_hooks "abort", $cart, \@_;
$cart->empty;
RevBank::FileIO::release_all_locks;
{ no warnings; redo OUTER; }
}
PROMPT: { PROMPT: {
if (not @words) { if (not @words) {