tadf	2008-10-05 21:30:54 +0900 (Sun, 05 Oct 2008)

  New Revision: 19689

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19689

  Log:
    * lib/rational.rb: resolved conflicts of aliases.
    
    * lib/mathn.rb: avoided some warnings.

  Modified files:
    trunk/ChangeLog
    trunk/lib/mathn.rb
    trunk/lib/rational.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19688)
+++ ChangeLog	(revision 19689)
@@ -1,3 +1,9 @@
+Sun Oct  5 21:28:58 2008  Tadayoshi Funaba  <tadf@d...>
+
+	* lib/rational.rb: resolved conflicts of aliases.
+
+	* lib/mathn.rb: avoided some warnings.
+
 Sun Oct  5 18:51:50 2008  Tanaka Akira  <akr@f...>
 
 	* lib/open-uri.rb: remove debug code introduced by previous change.
Index: lib/rational.rb
===================================================================
--- lib/rational.rb	(revision 19688)
+++ lib/rational.rb	(revision 19689)
@@ -3,7 +3,7 @@
   alias quof fdiv
   alias rdiv quo
 
-  alias power! **
+  alias power! ** unless defined?(0.power!)
   alias rpower **
 
 end
@@ -13,7 +13,7 @@
   alias quof fdiv
   alias rdiv quo
 
-  alias power! **
+  alias power! ** unless defined?(0.power!)
   alias rpower **
 
 end
Index: lib/mathn.rb
===================================================================
--- lib/mathn.rb	(revision 19688)
+++ lib/mathn.rb	(revision 19689)
@@ -59,9 +59,9 @@
   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 @@
   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 @@
     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 @@
     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 @@
 
 class Float
 
-  def_canon *(instance_methods - Object.methods - [:canon])
+  def_canon(*(instance_methods - Object.methods - [:canon]))
 
   alias power! **
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/