* lib/rational.rb (floor, ceil, truncate, round): do not use

	  definitions of Numeric.

	* lib/rational.rb (to_i): should returns truncated self.

	* lib/complex.rb (numerator): requires
	  Integer#{numerator,denominator}.

	* lib/complex.rb (quo): do not use definition of Numeric.

	* lib/complex.rb (div, divmod, floor, ceil, truncate, round):
	  undef'ed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 86 insertions, 20 deletions

diff --git a/lib/complex.rb b/lib/complex.rb
index 9300f391e8..fbf50ffece 100644
--- a/lib/complex.rb
+++ b/lib/complex.rb
@@ -102,6 +102,8 @@ class Complex < Numeric
   @RCS_ID='-$Id: complex.rb,v 1.3 1998/07/08 10:05:28 keiju Exp keiju $-'
 
   undef step
+  undef div, divmod
+  undef floor, truncate, ceil, round
 
   def Complex.generic?(other) # :nodoc:
     other.kind_of?(Integer) or
@@ -194,6 +196,10 @@ class Complex < Numeric
     end
   end
   
+  def quo(other)
+    Complex(@real.quo(1), @image.quo(1)) / other
+  end
+
   #
   # Raise this complex number to the given (real or complex) power.
   #
@@ -409,8 +415,34 @@ class Complex < Numeric
   
 end
 
+class Integer
+
+  unless defined?(1.numerator)
+    def numerator() self end
+    def denominator() 1 end
+
+    def gcd(other)
+      min = self.abs
+      max = other.abs
+      while min > 0
+        tmp = min
+        min = max % min
+        max = tmp
+      end
+      max
+    end
+
+    def lcm(other)
+      if self.zero? or other.zero?
+        0
+      else
+        (self.div(self.gcd(other)) * other).abs
+      end
+    end
 
+  end
 
+end
 
 module Math
   alias sqrt! sqrt
diff --git a/lib/rational.rb b/lib/rational.rb
index ce754cfa3c..4d0097b02e 100644
--- a/lib/rational.rb
+++ b/lib/rational.rb
@@ -240,6 +240,10 @@ class Rational < Numeric
     end
   end
 
+  def div(other)
+    (self / other).floor
+  end
+
   #
   # Returns the remainder when this value is divided by +other+.
   #
@@ -251,7 +255,7 @@ class Rational < Numeric
   #   r % 0.26             # -> 0.19
   #
   def % (other)
-    value = (self / other).to_i
+    value = (self / other).floor
     return self - other * value
   end
 
@@ -263,7 +267,7 @@ class Rational < Numeric
   #   r.divmod Rational(1,2)   # -> [3, Rational(1,4)]
   #
   def divmod(other)
-    value = (self / other).to_i
+    value = (self / other).floor
     return value, self - other * value
   end
 
@@ -272,7 +276,7 @@ class Rational < Numeric
   #
   def abs
     if @numerator > 0
-      Rational.new!(@numerator, @denominator)
+      self
     else
       Rational.new!(-@numerator, @denominator)
     end
@@ -347,8 +351,36 @@ class Rational < Numeric
   #   Rational(-7,4) == -1.75                 # -> true
   #   Rational(-7,4).to_i == (-1.75).to_i     # false
   #
-  def to_i
-    Integer(@numerator.div(@denominator))
+
+
+  def floor()
+    @numerator.div(@denominator)
+  end
+
+  def ceil()
+    -((-@numerator).div(@denominator))
+  end
+
+  def truncate()
+    if @numerator < 0
+      return -((-@numerator).div(@denominator))
+    end
+    @numerator.div(@denominator)
+  end
+
+  alias_method :to_i, :truncate
+
+  def round()
+    if @numerator < 0
+      num = -@numerator
+      num = num * 2 + @denominator
+      den = @denominator * 2
+      -(num.div(den))
+    else
+      num = @numerator * 2 + @denominator
+      den = @denominator * 2
+      num.div(den)
+    end
   end
 
   #
@@ -481,10 +513,11 @@ class Integer
 end
 
 class Fixnum
-  undef quo
-  # If Rational is defined, returns a Rational number instead of a Fixnum.
+  remove_method :quo
+
+  # If Rational is defined, returns a Rational number instead of a Float.
   def quo(other)
-    Rational.new!(self,1) / other
+    Rational.new!(self, 1) / other
   end
   alias rdiv quo
 
@@ -493,25 +526,18 @@ class Fixnum
     if other >= 0
       self.power!(other)
     else
-      Rational.new!(self,1)**other
+      Rational.new!(self, 1)**other
     end
   end
 
-  unless defined? 1.power!
-    alias power! **
-    alias ** rpower
-  end
 end
 
 class Bignum
-  unless defined? Complex
-    alias power! **
-  end
+  remove_method :quo
 
-  undef quo
-  # If Rational is defined, returns a Rational number instead of a Bignum.
+  # If Rational is defined, returns a Rational number instead of a Float.
   def quo(other)
-    Rational.new!(self,1) / other
+    Rational.new!(self, 1) / other
   end
   alias rdiv quo
 
@@ -524,7 +550,15 @@ class Bignum
     end
   end
 
-  unless defined? Complex
+end
+
+unless defined? 1.power!
+  class Fixnum
+    alias power! **
+    alias ** rpower
+  end
+  class Bignum
+    alias power! **
     alias ** rpower
   end
 end