GitHub
/
pbot
mirror of https://github.com/pragma-/pbot.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve factoid variable expansion

This commit is contained in:
Pragmatic Software 2018-03-23 13:34:28 -07:00
parent dbe37226c6
commit e70e016112
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PBot/Factoids.pm
View File

@ -413,9 +413,10 @@ sub expand_factoid_vars {
my $matches = 0; my $matches = 0;
$action =~ s/\$0/$root_keyword/g; $action =~ s/\$0/$root_keyword/g;
my $const_action = $action; my $const_action = $action;
while ($const_action =~ /(\ba\s*|\ban\s*)?(?<!\\)\$([a-zA-Z0-9_:#\[\]]+)/gi) { my $offset = 0;
while ($const_action =~ /(\ba\s*|\ban\s*)?(?<!\\)\$([a-zA-Z0-9_:#]+)/gi) {
my ($a, $v) = ($1, $2); my ($a, $v) = ($1, $2);
$v =~ s/(.):$/$1/; $v =~ s/(.):$/$1/; # remove trailing : only if at least one character precedes it
next if $v =~ m/^[\W_]/; # special character prefix skipped for shell/code-factoids/etc next if $v =~ m/^[\W_]/; # special character prefix skipped for shell/code-factoids/etc
next if $v =~ m/^(nick|channel|randomnick|arglen|args|arg\[.+\]|[_0])$/i; # don't override special variables next if $v =~ m/^(nick|channel|randomnick|arglen|args|arg\[.+\]|[_0])$/i; # don't override special variables
next if @exclude && grep { $v =~ m/^\Q$_\E$/i } @exclude; next if @exclude && grep { $v =~ m/^\Q$_\E$/i } @exclude;
@ -480,14 +481,15 @@ sub expand_factoid_vars {
if ($a) { if ($a) {
my $fixed_a = select_indefinite_article $mylist[$line]; my $fixed_a = select_indefinite_article $mylist[$line];
$fixed_a = ucfirst $fixed_a if $a =~ m/^A/; $fixed_a = ucfirst $fixed_a if $a =~ m/^A/;
$action =~ s/$a\$$v$modifier/$fixed_a $mylist[$line]/; $mylist[$line] = "$fixed_a $mylist[$line]";
} else {
if (not length $mylist[$line]) {
$action =~ s/\s+\$$v$modifier//;
} else {
$action =~ s/\$$v$modifier/$mylist[$line]/;
}
} }
if (not length $mylist[$line]) {
substr($action, $offset) =~ s/\s+\$$v$modifier//;
} else {
substr($action, $offset) =~ s/\$$v$modifier/$mylist[$line]/;
}
$offset = $+[0];
} }
} }
last if $matches == 0; last if $matches == 0;