script plugin: per-script permissions

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / math.rb

diff --git a/data/rbot/plugins/math.rb b/data/rbot/plugins/math.rb
index 945b2c78abf915742511249a012f27741ad63f52..9dd35c985fabdb2f53be5e942b1a4644aab6a4f5 100644 (file)
--- a/data/rbot/plugins/math.rb
+++ b/data/rbot/plugins/math.rb
@@ -85,8 +85,8 @@ class MathPlugin < Plugin
     expr.gsub!(/\bpercent/, "*0.01")
     expr.gsub!(/\% of\b/, "*0.01*")
     expr.gsub!(/\%/, "*0.01")
-    expr.gsub!(/\bsquare root of (\d+)/, '\1 ** 0.5 ')
-    expr.gsub!(/\bcubed? root of (\d+)/, '\1 **(1.0/3.0) ')
+    expr.gsub!(/\bsquare root of (\d+(\.\d+)?)/, '\1 ** 0.5 ')
+    expr.gsub!(/\bcubed? root of (\d+(\.\d+)?)/, '\1 **(1.0/3.0) ')
     expr.gsub!(/ of /, " * ")
     expr.gsub!(/(bit(-| )?)?xor(\'?e?d( with))?/, "^")
     expr.gsub!(/(bit(-| )?)?or(\'?e?d( with))?/, "|")
@@ -110,9 +110,9 @@ class MathPlugin < Plugin
              answer = "a number with >30 digits..."
            end
          end
-         m.reply answer
+         m.reply answer.to_s
        rescue Exception => e
-         error "couldn't evaluate expression \"#{m.params}\": #{e.inspect}"
+         error e
          m.reply "illegal expression \"#{m.params}\""
          return
        end