GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-22 20:09:43 +01:00
Code Issues Projects Releases Wiki Activity

Plugin/Plang: update output_value() to accept scope argument

Browse Source
This commit is contained in:
Pragmatic Software 2023-11-09 20:42:20 -08:00
parent 522915dfde
commit 7b69980eff
No known key found for this signature in database
GPG Key ID: CC916B6E3C84ECCE
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/PBot/Plugin/Plang.pm
View File

@ -104,7 +104,7 @@ sub cmd_plang($self, $context) {
# check to see if we need to append final result to output # check to see if we need to append final result to output
if (defined $result->[1]) { if (defined $result->[1]) {
$self->{output} .= $self->{plang}->{interpreter}->output_value($result, literal => 1); $self->{output} .= $self->{plang}->{interpreter}->output_value({}, $result, literal => 1);
} }
}; };
@ -126,11 +126,11 @@ sub cmd_plangrepl($self, $context) {
my $result = $self->{plang}->interpret_string($context->{arguments}, repl => 1); my $result = $self->{plang}->interpret_string($context->{arguments}, repl => 1);
# check to see if we need to append final result to output # check to see if we need to append final result to output
$self->{output} .= $self->{plang}->{interpreter}->output_value($result, repl => 1) if defined $result->[1]; $self->{output} .= $self->{plang}->{interpreter}->output_value({}, $result, repl => 1) if defined $result->[1];
}; };
if (my $exception = $@) { if (my $exception = $@) {
$exception = $self->{plang}->{interpreter}->output_value($exception); $exception = $self->{plang}->{interpreter}->output_value({}, $exception);
$self->{output} .= "Run-time error: unhandled exception: $exception"; $self->{output} .= "Run-time error: unhandled exception: $exception";
} }
@ -139,8 +139,8 @@ sub cmd_plangrepl($self, $context) {
} }
# overridden `print` built-in # overridden `print` built-in
sub plang_builtin_print($self, $plang, $context, $name, $arguments) { sub plang_builtin_print($self, $plang, $scope, $name, $arguments) {
my ($expr, $end) = ($plang->output_value($arguments->[0]), $arguments->[1]->[1]); my ($expr, $end) = ($plang->output_value($scope, $arguments->[0]), $arguments->[1]->[1]);
$self->{output} .= "$expr$end"; $self->{output} .= "$expr$end";
return [['TYPE', 'Null'], undef]; return [['TYPE', 'Null'], undef];
} }
@ -155,7 +155,7 @@ sub is_locked($self, $channel, $keyword) {
return $self->{pbot}->{factoids}->{data}->get_meta($channel, $keyword, 'locked'); return $self->{pbot}->{factoids}->{data}->get_meta($channel, $keyword, 'locked');
} }
sub plang_builtin_factget($self, $plang, $context, $name, $arguments) { sub plang_builtin_factget($self, $plang, $scope, $name, $arguments) {
my ($channel, $keyword, $meta) = ($arguments->[0]->[1], $arguments->[1]->[1], $arguments->[2]->[1]); my ($channel, $keyword, $meta) = ($arguments->[0]->[1], $arguments->[1]->[1], $arguments->[2]->[1]);
my $result = $self->{pbot}->{factoids}->{data}->get_meta($channel, $keyword, $meta); my $result = $self->{pbot}->{factoids}->{data}->get_meta($channel, $keyword, $meta);
if (defined $result) { if (defined $result) {
@ -169,7 +169,7 @@ sub plang_validate_builtin_factget {
return [['TYPE', 'String'], ""]; return [['TYPE', 'String'], ""];
} }
sub plang_builtin_factset($self, $plang, $context, $name, $arguments) { sub plang_builtin_factset($self, $plang, $scope, $name, $arguments) {
my ($channel, $keyword, $text) = ($arguments->[0]->[1], $arguments->[1]->[1], $arguments->[2]->[1]); my ($channel, $keyword, $text) = ($arguments->[0]->[1], $arguments->[1]->[1], $arguments->[2]->[1]);
die "Factoid $channel.$keyword is locked. Cannot set.\n" if $self->is_locked($channel, $keyword); die "Factoid $channel.$keyword is locked. Cannot set.\n" if $self->is_locked($channel, $keyword);
$self->{pbot}->{factoids}->{data}->add('text', $channel, 'Plang', $keyword, $text); $self->{pbot}->{factoids}->{data}->add('text', $channel, 'Plang', $keyword, $text);
@ -180,7 +180,7 @@ sub plang_validate_builtin_factset {
return [['TYPE', 'String'], ""]; return [['TYPE', 'String'], ""];
} }
sub plang_builtin_factappend($self, $plang, $context, $name, $arguments) { sub plang_builtin_factappend($self, $plang, $scope, $name, $arguments) {
my ($channel, $keyword, $text) = ($arguments->[0]->[1], $arguments->[1]->[1], $arguments->[2]->[1]); my ($channel, $keyword, $text) = ($arguments->[0]->[1], $arguments->[1]->[1], $arguments->[2]->[1]);
die "Factoid $channel.$keyword is locked. Cannot append.\n" if $self->is_locked($channel, $keyword); die "Factoid $channel.$keyword is locked. Cannot append.\n" if $self->is_locked($channel, $keyword);
my $action = $self->{pbot}->{factoids}->{data}->get_meta($channel, $keyword, 'action'); my $action = $self->{pbot}->{factoids}->{data}->get_meta($channel, $keyword, 'action');
@ -194,7 +194,7 @@ sub plang_validate_builtin_factappend {
return [['TYPE', 'String'], ""]; return [['TYPE', 'String'], ""];
} }
sub plang_builtin_userget($self, $plang, $context, $name, $arguments) { sub plang_builtin_userget($self, $plang, $scope, $name, $arguments) {
my ($username) = ($arguments->[0], $arguments->[1]); my ($username) = ($arguments->[0], $arguments->[1]);
my $user = $self->{pbot}->{users}->{storage}->get_data($username->[1]); my $user = $self->{pbot}->{users}->{storage}->get_data($username->[1]);

4
lib/PBot/VERSION.pm
View File

@ -25,8 +25,8 @@ use PBot::Imports;
# These are set by the /misc/update_version script # These are set by the /misc/update_version script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 4689, BUILD_REVISION => 4696,
BUILD_DATE => "2023-09-28", BUILD_DATE => "2023-11-09",
}; };
sub initialize {} sub initialize {}