GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-10-15 15:37:22 +02:00
Code Issues Projects Releases Wiki Activity

Factoids: minor style clean-up

Browse Source
This commit is contained in:
Pragmatic Software 2020-06-12 01:53:25 -07:00
parent 287d102aed
commit 9b0696b898
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PBot/Factoids.pm
View File

@ -545,7 +545,6 @@ sub make_list {
$item =~ s/^\s+|\s+$//g; $item =~ s/^\s+|\s+$//g;
$item =~ s/\\\|/|/g; $item =~ s/\\\|/|/g;
if ($settings->{'uc'}) { $item = uc $item; } if ($settings->{'uc'}) { $item = uc $item; }
if ($settings->{'lc'}) { $item = lc $item; } if ($settings->{'lc'}) { $item = lc $item; }
@ -582,7 +581,6 @@ sub make_list {
sub select_item { sub select_item {
my ($self, $context, $extracted, $modifier, %opts) = @_; my ($self, $context, $extracted, $modifier, %opts) = @_;
my %settings = $self->parse_expansion_modifiers($modifier); my %settings = $self->parse_expansion_modifiers($modifier);
my $item; my $item;
@ -742,11 +740,9 @@ sub expand_factoid_vars {
my $matches = 0; my $matches = 0;
my $expansions = 0; my $expansions = 0;
while ($rest =~ s/(.*?)(?<!\\)\$([\w|{])/$2/ms) { while ($rest =~ s/(.*?)(?<!\\)\$([\w|{])/$2/ms) {
$result .= $1; $result .= $1;
my $var; my $var;
my $extract_method; my $extract_method;
@ -812,14 +808,11 @@ sub expand_factoid_vars {
if (wantarray) { if (wantarray) {
@replacements = $self->select_item($context, join ('|', @list), \$rest, %opts); @replacements = $self->select_item($context, join ('|', @list), \$rest, %opts);
return @replacements;
} else { } else {
push @replacements, scalar $self->select_item($context, join ('|', @list), \$rest, %opts); push @replacements, scalar $self->select_item($context, join ('|', @list), \$rest, %opts);
} }
if (wantarray) {
return @replacements;
}
my $replacement = $opts{nested} ? join('|', @replacements) : "@replacements"; my $replacement = $opts{nested} ? join('|', @replacements) : "@replacements";
if (not length $replacement) { if (not length $replacement) {
@ -849,9 +842,7 @@ sub expand_factoid_vars {
} }
} }
if ($matches == 0 or $expansions == 0) { last if $matches == 0 or $expansions == 0;
last;
}
if (not length $rest) { if (not length $rest) {
$rest = $result; $rest = $result;