[GR-17457] Undef Rational.new to avoid public use.

PullRequest: truffleruby/2855

Author: aardvark179

lib/truffle/truffle/cext.rb

@@ -1310,7 +1310,7 @@ def rb_Rational(num, den)
   end
 
   def rb_rational_raw(num, den)
-    Rational.new(num, den)
+    Rational.__send__(:new_already_canonical, num, den)
   end
 
   def rb_rational_new(num, den)

spec/ruby/core/rational/rational_spec.rb

@@ -4,4 +4,8 @@
   it "includes Comparable" do
     Rational.include?(Comparable).should == true
   end
+
+  it "does not respond to new" do
+    -> { Rational.new(1) }.should raise_error(NoMethodError)
+  end
 end

src/main/ruby/truffleruby/core/complex.rb

@@ -197,7 +197,7 @@ def ** (other)
         z
       else
         if defined? Rational
-          (Rational.new(1, 1) / self) ** -other
+          (Rational.__send__(:new_already_canonical, 1, 1) / self) ** -other
         else
           self ** Float(other)
         end

src/main/ruby/truffleruby/core/float.rb

@@ -134,7 +134,7 @@ def rationalize(eps=undefined)
       f = Math.ldexp(f, Float::MANT_DIG).to_i
       n -= Float::MANT_DIG
 
-      Rational.new(2 * f, 1 << (1 - n)).rationalize(Rational.new(1, 1 << (1 - n)))
+      Rational.__send__(:new_already_canonical, 2 * f, 1 << (1 - n)).rationalize(Rational.__send__(:new_already_canonical, 1, 1 << (1 - n)))
     else
       to_r.rationalize(eps)
     end

src/main/ruby/truffleruby/core/integer.rb

@@ -51,7 +51,7 @@ def **(o)
     if (Primitive.object_kind_of?(o, Float) || Primitive.object_kind_of?(o, Rational)) && self < 0 && o != o.round
       return Complex.new(self, 0) ** o
     elsif Primitive.object_kind_of?(o, Integer) && o < 0
-      return Rational.new(self, 1) ** o
+      return Rational.__send__(:new_already_canonical, self, 1) ** o
     elsif Primitive.object_kind_of?(o, Integer) && o > 0
       return self ** o.to_f
     end

src/main/ruby/truffleruby/core/rational.rb

@@ -38,6 +38,12 @@ class Rational < Numeric
   attr_reader :numerator
   attr_reader :denominator
 
+  class << self
+    alias_method :new_already_canonical, :new
+    undef_method :new
+    private :new_already_canonical
+  end
+
   def *(other)
     case other
     when Rational
@@ -67,19 +73,19 @@ def **(other)
           raise ZeroDivisionError, 'divided by 0' if self == 0
           Rational(@denominator ** -other, @numerator ** -other)
         elsif other == 0
-          Rational.new(1, 1)
+          Rational.__send__(:new_already_canonical, 1, 1)
         end
       else
         if self == 0
           if other < 0
             raise ZeroDivisionError, 'divided by 0'
           elsif other > 0
-            Rational.new(0, 1)
+            Rational.__send__(:new_already_canonical, 0, 1)
           end
         elsif self == 1
-          Rational.new(1, 1)
+          Rational.__send__(:new_already_canonical, 1, 1)
         elsif self == -1
-          Rational.new(other.even? ? 1 : -1, 1)
+          Rational.__send__(:new_already_canonical, other.even? ? 1 : -1, 1)
         else
           to_f ** other
         end
@@ -176,7 +182,7 @@ def ==(other)
   def abs
     return self if @numerator >= 0
 
-    Rational.new(-@numerator, @denominator)
+    Rational.__send__(:new_already_canonical, -@numerator, @denominator)
   end
 
   def ceil(precision = 0)
@@ -190,7 +196,7 @@ def ceil(precision = 0)
   def coerce(other)
     case other
     when Integer
-      [Rational.new(other, 1), self]
+      [Rational.__send__(:new_already_canonical, other, 1), self]
     when Float
       [other, self.to_f]
     when Rational
@@ -263,7 +269,7 @@ def rationalize(eps = undefined)
     end
 
     # The rational number is guaranteed to be in lowest terms.
-    Rational.new(c * p1 + p0, c * q1 + q0)
+    Rational.__send__(:new_already_canonical, c * p1 + p0, c * q1 + q0)
   end
 
   def round(precision = 0, half: nil)
@@ -373,7 +379,7 @@ def self.reduce(num, den)
       end
 
       if den == 1
-        return new(num, den)
+        return Rational.__send__(:new_already_canonical, num, den)
       end
     when Numeric
       den = den.to_i
@@ -385,7 +391,7 @@ def self.reduce(num, den)
     num = num / gcd
     den = den / gcd
 
-    new(num, den)
+    Rational.__send__(:new_already_canonical, num, den)
   end
   private_class_method :reduce
 

src/main/ruby/truffleruby/core/rationalizer.rb

@@ -54,7 +54,7 @@ def convert
         ifp, exp = nu.split(/[eE]/)
         ip, fp = ifp.split(/\./)
 
-        value = Rational.new(ip.to_i, 1)
+        value = Rational.__send__(:new_already_canonical, ip.to_i, 1)
 
         if fp
           ctype = Truffle::CType

test/mri/excludes/Rational_Test.rb

@@ -5,7 +5,6 @@
 exclude :test_marshal_compatibility, "needs investigation"
 exclude :test_parse, "needs investigation"
 exclude :test_power_of_0, "needs investigation"
-exclude :test_ruby19, "needs investigation"
 exclude :test_supp, "needs investigation"
 exclude :test_to_f, "needs investigation"
 exclude :test_Rational_without_exception, "needs investigation"