GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-05-03 13:17:33 +02:00
Code Issues Projects Releases Wiki Activity

Interpreter: fix-up a/an article in front of &{cmdsub}s

Browse Source
This commit is contained in:
Pragmatic Software 2021-08-23 13:23:12 -07:00
parent 68490b6ac5
commit b638757f92
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/PBot/Core/Interpreter.pm
View File

@ -15,6 +15,7 @@ use parent 'PBot::Core::Class', 'PBot::Core::Registerable';
use PBot::Imports; use PBot::Imports;
use PBot::Core::MessageHistory::Constants ':all'; use PBot::Core::MessageHistory::Constants ':all';
use PBot::Core::Utils::Indefinite;
use PBot::Core::Utils::ValidateString; use PBot::Core::Utils::ValidateString;
use Encode; use Encode;
@ -370,7 +371,7 @@ sub interpret {
$command =~ s/^\s+|\s+$//g; $command =~ s/^\s+|\s+$//g;
# replace contextual command # replace contextual command
$context->{command} = $command; $context->{command} = $command;
# reset contextual command history # reset contextual command history
$context->{commands} = []; $context->{commands} = [];
@ -593,9 +594,25 @@ sub handle_result {
if (exists $context->{subcmd}) { if (exists $context->{subcmd}) {
my $command = pop @{$context->{subcmd}}; my $command = pop @{$context->{subcmd}};
if (@{$context->{subcmd}} == 0 or $context->{alldone}) { delete $context->{subcmd}; } if (@{$context->{subcmd}} == 0 or $context->{alldone}) {
delete $context->{subcmd};
}
$command =~ s/&\{subcmd\}/$result/; if ($command =~ s/\b(an?)(\s+)&\{subcmd\}/&{subcmd}/i) {
# fix-up a/an article
my ($article, $spaces) = ($1, $2);
my $fixed_article = select_indefinite_article $result;
if ($article eq 'AN') {
$fixed_article = uc $fixed_article;
} elsif ($article eq 'An' or $article eq 'A') {
$fixed_article = ucfirst $fixed_article;
}
$command =~ s/&\{subcmd\}/$fixed_article$spaces$result/;
} else {
$command =~ s/&\{subcmd\}/$result/;
}
if (not $context->{alldone}) { if (not $context->{alldone}) {
$context->{command} = $command; $context->{command} = $command;