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

Move code around

Browse source 
With the weird hack gone (see previous commit), the code could be
written in a more straight-forward order, with some duplication removed.
This commit is contained in:
Juerd Waalboer 2023-01-29 23:05:52 +01:00
parent 5e5c27a203
commit fefa371e18
1 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
plugins/repeat
View file

@ -19,11 +19,24 @@ sub command($self, $cart, $command, @) {
my $last = ($cart->entries)[-1]; my $last = ($cart->entries)[-1];
return NEXT if $lhs and $rhs; # 123x123 -> invalid syntax return NEXT if $lhs and $rhs; # 123x123 -> invalid, likely user or product
if ($lhs) {
return REJECT, $err_postfix if $op eq '+' or $op eq '-';
$lhs = abs $lhs; # withdrawal is negative
return REJECT, $err_limit if $lhs > $limit;
$cart
->add(0, "? (The next thing you add will be multiplied.)", { _repeat => 1, refuse_checkout => 1 })
->quantity($lhs);
return ACCEPT;
}
return ABORT, "Can't modify an empty transaction." if not $cart->size;
return REJECT, $err_nope if $last->attribute('no_repeat');
if ($rhs) { if ($rhs) {
return ABORT, "Can't modify an empty transaction." if not $cart->size;
return REJECT, $err_nope if $last->attribute('no_repeat');
return REJECT, $err_limit if $rhs > $limit; return REJECT, $err_limit if $rhs > $limit;
if ($op eq '+') { if ($op eq '+') {
@ -43,39 +56,20 @@ sub command($self, $cart, $command, @) {
} }
return ACCEPT; return ACCEPT;
} }
# $op is not + or -, so it must be * (or x). # $op is not + or -, so it must be * (or x).
return REJECT, $err_stacked if $last->multiplied; return REJECT, $err_stacked if $last->multiplied;
$last->quantity($rhs); $last->quantity($rhs);
return ACCEPT; return ACCEPT;
} }
if (not $lhs and not $rhs) { if ($op eq '+' or $op eq '-') {
# Lone operator. Convert withdrawal into repetition. $self->{op} = $op;
return "$op how many?", \&plusminus;
return ABORT, "Can't modify an empty transaction." if not $cart->size;
if ($op eq '+' or $op eq '-') {
$self->{op} = $op;
return "$op how many?", \&plusminus;
}
}
if ($lhs) {
return REJECT, $err_postfix if $op eq '+' or $op eq '-';
$lhs = abs $lhs; # withdrawal is negative
return REJECT, $err_limit if $lhs > $limit;
$cart
->add(0, "? (The next thing you add will be multiplied.)", { _repeat => 1, refuse_checkout => 1 })
->quantity($lhs);
return ACCEPT;
} }
# $op is not + or -, so it must be * (or x).
return REJECT, $err_stacked if $last->multiplied; return REJECT, $err_stacked if $last->multiplied;
return REJECT, $err_nope if $last->attribute('no_repeat');
return "Multiply previous product by", \&repeat; return "Multiply previous product by", \&repeat;
} }