diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/mathn.rb | 14 | ||||
| -rw-r--r-- | lib/rational.rb | 4 |
3 files changed, 15 insertions, 9 deletions
@@ -1,3 +1,9 @@ +Sun Oct 5 21:28:58 2008 Tadayoshi Funaba <tadf@dotrb.org> + + * lib/rational.rb: resolved conflicts of aliases. + + * lib/mathn.rb: avoided some warnings. + Sun Oct 5 18:51:50 2008 Tanaka Akira <akr@fsij.org> * lib/open-uri.rb: remove debug code introduced by previous change. diff --git a/lib/mathn.rb b/lib/mathn.rb index a4a006e2d6..992eae7098 100644 --- a/lib/mathn.rb +++ b/lib/mathn.rb @@ -59,9 +59,9 @@ class Fixnum remove_method :/ alias / quo - def_canon *(instance_methods - Object.methods - [:canon]) + def_canon(*(instance_methods - Object.methods - [:canon])) - alias power! ** + alias power! ** unless defined?(0.power!) def ** (other) if self < 0 && other.round != other @@ -77,9 +77,9 @@ class Bignum remove_method :/ alias / quo - def_canon *(instance_methods - Object.methods - [:canon]) + def_canon(*(instance_methods - Object.methods - [:canon])) - alias power! ** + alias power! ** unless defined?(0.power!) def ** (other) if self < 0 && other.round != other @@ -104,7 +104,7 @@ class Rational def convert(*args) convert_orig(*args).__send__(:canon) end end - def_canon *(instance_methods - Object.methods - [:canon]) + def_canon(*(instance_methods - Object.methods - [:canon])) alias power! ** @@ -257,7 +257,7 @@ class Complex def convert(*args) convert_orig(*args).__send__(:canon) end end - def_canon *(instance_methods - Object.methods - [:canon]) + def_canon(*(instance_methods - Object.methods - [:canon])) end @@ -281,7 +281,7 @@ end class Float - def_canon *(instance_methods - Object.methods - [:canon]) + def_canon(*(instance_methods - Object.methods - [:canon])) alias power! ** diff --git a/lib/rational.rb b/lib/rational.rb index 4b39f83152..5acfa5433d 100644 --- a/lib/rational.rb +++ b/lib/rational.rb @@ -3,7 +3,7 @@ class Fixnum alias quof fdiv alias rdiv quo - alias power! ** + alias power! ** unless defined?(0.power!) alias rpower ** end @@ -13,7 +13,7 @@ class Bignum alias quof fdiv alias rdiv quo - alias power! ** + alias power! ** unless defined?(0.power!) alias rpower ** end |