From 63683cb46dc3553e8cb25311f3306aa271bcc92e Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 26 Aug 2014 12:07:57 +0000
Subject: lib/mathn.rb: remove built-in methods

* lib/mathn.rb (Fixnum#**, Bignum#**, Float#**, Rational#**):
  remove as these are now built-in.  [ruby-core:63973] [Bug #10086]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |   5 +++
 lib/mathn.rb | 143 +++--------------------------------------------------------
 2 files changed, 12 insertions(+), 136 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a2ece3d250..8f06810813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 26 21:07:56 2014  gogo tanaka  <mail@tanakakazuki.com>
+
+	* lib/mathn.rb (Fixnum#**, Bignum#**, Float#**, Rational#**):
+	  remove as these are now built-in.  [ruby-core:63973] [Bug #10086]
+
 Tue Aug 26 20:46:55 2014  Tanaka Akira  <akr@fsij.org>
 
 	* time.c (rb_time_unmagnify_to_float): Avoid double rounding.
diff --git a/lib/mathn.rb b/lib/mathn.rb
index 004f41748e..315e5438d7 100644
--- a/lib/mathn.rb
+++ b/lib/mathn.rb
@@ -5,9 +5,8 @@
 ##
 # = mathn
 #
-# mathn is a library for changing the way Ruby does math.  If you need
-# more precise rounding with multiple division or exponentiation
-# operations, then mathn is the right tool.
+# mathn serves to make mathematical operations more precise in Ruby
+# and to integrate other mathematical standard libraries.
 #
 # Without mathn:
 #
@@ -17,7 +16,7 @@
 #
 #   3 / 2 => 3/2 # Rational
 #
-# mathn features late rounding and lacks truncation of intermediate results:
+# mathn keeps value in exact terms.
 #
 # Without mathn:
 #
@@ -55,7 +54,7 @@ unless defined?(Math.exp!)
 end
 
 ##
-# When mathn is required, Fixnum's division and exponentiation are enhanced to
+# When mathn is required, Fixnum's division is enhanced to
 # return more precise values from mathematical expressions.
 #
 #   2/3*3  # => 0
@@ -71,25 +70,13 @@ class Fixnum
   #   1/3  # => (1/3)
 
   alias / quo
-
-  alias power! ** unless method_defined? :power!
-
-  ##
-  # Exponentiate by +other+
-
-  def ** (other)
-    if self < 0 && other.round != other
-      Complex(self, 0.0) ** other
-    else
-      power!(other)
-    end
-  end
-
 end
 
 ##
-# When mathn is required Bignum's division and exponentiation are enhanced to
+# When mathn is required Bignum's division is enhanced to
 # return more precise values from mathematical expressions.
+#
+#   (2**72) / ((2**70) * 3)  # => 4/3
 
 class Bignum
   remove_method :/
@@ -100,103 +87,6 @@ class Bignum
   #   (2**72) / ((2**70) * 3)  # => 4/3
 
   alias / quo
-
-  alias power! ** unless method_defined? :power!
-
-  ##
-  # Exponentiate by +other+
-
-  def ** (other)
-    if self < 0 && other.round != other
-      Complex(self, 0.0) ** other
-    else
-      power!(other)
-    end
-  end
-
-end
-
-##
-# When mathn is required Rational is changed to simplify the use of Rational
-# operations.
-#
-# Normal behaviour:
-#
-#   Rational.new!(1,3) ** 2 # => Rational(1, 9)
-#   (1 / 3) ** 2            # => 0
-#
-# require 'mathn' behaviour:
-#
-#   (1 / 3) ** 2            # => 1/9
-
-class Rational
-  remove_method :**
-
-  ##
-  # Exponentiate by +other+
-  #
-  #   (1/3) ** 2 # => 1/9
-
-  def ** (other)
-    if other.kind_of?(Rational)
-      other2 = other
-      if self < 0
-        return Complex(self, 0.0) ** other
-      elsif other == 0
-        return Rational(1,1)
-      elsif self == 0
-        return Rational(0,1)
-      elsif self == 1
-        return Rational(1,1)
-      end
-
-      npd = numerator.prime_division
-      dpd = denominator.prime_division
-      if other < 0
-        other = -other
-        npd, dpd = dpd, npd
-      end
-
-      for elm in npd
-        elm[1] = elm[1] * other
-        if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
-          return Float(self) ** other2
-        end
-        elm[1] = elm[1].to_i
-      end
-
-      for elm in dpd
-        elm[1] = elm[1] * other
-        if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
-          return Float(self) ** other2
-        end
-        elm[1] = elm[1].to_i
-      end
-
-      num = Integer.from_prime_division(npd)
-      den = Integer.from_prime_division(dpd)
-
-      Rational(num,den)
-
-    elsif other.kind_of?(Integer)
-      if other > 0
-        num = numerator ** other
-        den = denominator ** other
-      elsif other < 0
-        num = denominator ** -other
-        den = numerator ** -other
-      elsif other == 0
-        num = 1
-        den = 1
-      end
-      Rational(num, den)
-    elsif other.kind_of?(Float)
-      Float(self) ** other
-    else
-      x , y = other.coerce(self)
-      x ** y
-    end
-  end
 end
 
 ##
@@ -299,22 +189,3 @@ module Math
   module_function :sqrt
   module_function :rsqrt
 end
-
-##
-# When mathn is required, Float is changed to handle Complex numbers.
-
-class Float
-  alias power! **
-
-  ##
-  # Exponentiate by +other+
-
-  def ** (other)
-    if self < 0 && other.round != other
-      Complex(self, 0.0) ** other
-    else
-      power!(other)
-    end
-  end
-
-end
-- 
cgit v1.2.3