GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-23 19:22:40 +01:00
Code Issues Projects Releases Wiki Activity

Minor improvements to math.pl

Browse Source
This commit is contained in:
Pragmatic Software 2014-03-24 03:05:48 +00:00
parent 2a933bff87
commit cb6d811ba2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PBot/VERSION.pm
View File

@ -13,7 +13,7 @@ use warnings;
# These are set automatically by the build/commit script # These are set automatically by the build/commit script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 532, BUILD_REVISION => 533,
BUILD_DATE => "2014-03-23", BUILD_DATE => "2014-03-23",
}; };

10
modules/math.pl
View File

@ -7,7 +7,7 @@ my ($arguments, $response, $invalid);
my @valid_keywords = ( my @valid_keywords = (
'sin', 'cos', 'tan', 'atan', 'exp', 'int', 'hex', 'oct', 'log', 'sqrt', 'sin', 'cos', 'tan', 'atan', 'exp', 'int', 'hex', 'oct', 'log', 'sqrt',
'floor', 'ceil', 'asin', 'acos', 'log10', 'sinh', 'cosh', 'tanh', 'abs', 'floor', 'ceil', 'asin', 'acos', 'log10', 'sinh', 'cosh', 'tanh', 'abs',
'pi' 'pi', 'deg2rad', 'rad2deg', 'atan2'
); );
if ($#ARGV < 0) if ($#ARGV < 0)
@ -18,11 +18,12 @@ if ($#ARGV < 0)
$arguments = join(' ', @ARGV); $arguments = join(' ', @ARGV);
if($arguments =~ m/([\$`\|])/) { if($arguments =~ m/([\$`\|{}"'#@=])/) {
$invalid = $1; $invalid = $1;
} else { } else {
while($arguments =~ /([a-zA-Z]+)/g) { while($arguments =~ /([a-zA-Z0-9]+)/g) {
my $keyword = $1; my $keyword = $1;
next if $keyword =~ m/^[0-9]$/;
$invalid = $keyword and last if not grep { /^$keyword$/ } @valid_keywords; $invalid = $keyword and last if not grep { /^$keyword$/ } @valid_keywords;
} }
} }
@ -32,12 +33,13 @@ if($invalid) {
exit 1; exit 1;
} }
$response = eval("use POSIX qw/ceil floor/; use Math::Complex;" . $arguments); $response = eval("use POSIX qw/ceil floor/; use Math::Trig; use Math::Complex;" . $arguments);
if($@) { if($@) {
my $error = $@; my $error = $@;
$error =~ s/ at \(eval \d+\) line \d+.//; $error =~ s/ at \(eval \d+\) line \d+.//;
$error =~ s/[\n\r]+//g; $error =~ s/[\n\r]+//g;
$error =~ s/Died at .*//;
print $error; print $error;
exit 1; exit 1;
} }