X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FModules%2FMath.pl;h=a3b966b247ceadc88b3d29393aa269ba277a665c;hb=cb81fea9939f349b36e3b5a0cdc0343a6b781da1;hp=f84fc3d5ac474e7df9b184b799be7a560a5bd4c1;hpb=7b10e30e5b35efc954900e9b9b5fdba79dd75ab9;p=infobot.git

diff --git a/src/Modules/Math.pl b/src/Modules/Math.pl
index f84fc3d..a3b966b 100644
--- a/src/Modules/Math.pl
+++ b/src/Modules/Math.pl
@@ -7,26 +7,26 @@ use strict;
 use vars qw($message);
 
 my %digits = (
-	"first",   "1",
-	"second",  "2",
-	"third",   "3",
-	"fourth",  "4",
-	"fifth",   "5",
-	"sixth",   "6",
-	"seventh", "7",
-	"eighth",  "8",
-	"ninth",   "9",
-	"tenth",   "10",
-	"one",     "1",
-	"two",     "2",
-	"three",   "3",
-	"four",    "4",
-	"five",    "5",
-	"six",     "6",
-	"seven",   "7",
-	"eight",   "8",
-	"nine",    "9",
-	"ten",     "10"
+	'first',   '1',
+	'second',  '2',
+	'third',   '3',
+	'fourth',  '4',
+	'fifth',   '5',
+	'sixth',   '6',
+	'seventh', '7',
+	'eighth',  '8',
+	'ninth',   '9',
+	'tenth',   '10',
+	'one',     '1',
+	'two',     '2',
+	'three',   '3',
+	'four',    '4',
+	'five',    '5',
+	'six',     '6',
+	'seven',   '7',
+	'eight',   '8',
+	'nine',    '9',
+	'ten',     '10'
 );
 
 sub perlMath {
@@ -60,13 +60,13 @@ sub perlMath {
 
     while ($locMsg =~ /(log\s*((\d+\.?\d*)|\d*\.?\d+))\s*/) {
 	my ($exp, $res) = ($1, $2);
-	my $val = ($res) ? log($res) : "Infinity";
+	my $val = ($res) ? log($res) : 'Infinity';
 	$locMsg =~ s/$exp/+$val/g;
     }
 
     while ($locMsg =~ /(bin2dec ([01]+))/) {
 	my $exp = $1;
-	my $val = join ("", unpack("B*",$2)) ;
+	my $val = join ('', unpack('B*',$2)) ;
 	$locMsg =~ s/$exp/+$val/g;
     }
 
@@ -80,7 +80,6 @@ sub perlMath {
     for ($locMsg) {
 	s/\bpi\b/3.14159265/g;
 	s/ to the / ** /g;
-	s/\^/ ** /g;
 	s/\btimes\b/\*/g;
 	s/\bdiv(ided by)? /\/ /g;
 	s/\bover /\/ /g;
@@ -119,14 +118,14 @@ sub perlMath {
 	    }
 	} else {
 	    if (defined $locMsg) {
-		&DEBUG("math: locMsg => '$locMsg'... FIXME");
+		&FIXME("math: locMsg => '$locMsg'...");
 	    } else {
 		&status("math: could not really compute.");
-		$locMsg = "";
+		$locMsg = '';
 	    }
 	}
     } else {
-	$locMsg = "";
+	$locMsg = '';
     }
 
     if (defined $locMsg and $locMsg ne $message) {
@@ -139,3 +138,5 @@ sub perlMath {
 }
 
 1;
+
+# vim:ts=4:sw=4:expandtab:tw=80