Changeset 60

Timestamp:

11/14/08 16:52:59 (7 weeks ago)

Author:

mike

Message:

fun with max (fix regex)

Files:

• trunk/lib/whatbot/Command/Math.pm (modified) (3 diffs)

trunk/lib/whatbot/Command/Math.pm

@@ -13 +13 @@
 use Math::Expression;
 
+my $OP = qr/[\+\-\*\/]/;
+my $NUM = qr/\d[\d\.]*+/;
+
 sub register {
         my ($self) = @_;
@@ -20 +23 @@
 }
 
-sub free_form : GlobalRegEx('^[\d\+\-\*\/ ]+[\d\+\-\*\/ ]+$') {
+sub free_form : GlobalRegEx('^\(*\-?\d[\d\.]*+[\+\-\*\/][\d\(\)\+\-\*\/\.]*\d\)*$') {
         my ( $self, $message ) = @_;
         
@@ -26 +29 @@
 }
 
-sub parse_message : CommandRegEx('') {
+sub parse_message : Monitor {
         my ( $self, $message ) = @_;
 
         my $expression = $message->content;
-    $expression =~ s/^calc\s*//i;
+        $expression =~ s/^calc\s*//i;
     
-        return undef unless ( $expression and $expression =~ /\d/ );
+        return undef unless $expression;
 
         return $message->from . ": " . $self->_parse($expression);