Autocorrect and replace #equal? with Primitive.object_equal

andrykonchin · andrykonchin · commit 6c7e8b0dc4ee · 2023-04-14T18:31:21.000+03:00
diff --git a/src/main/ruby/truffleruby/core/argf.rb b/src/main/ruby/truffleruby/core/argf.rb
@@ -59,7 +59,7 @@ class ARGFClass
     # @see  #advance!
     #
     def initialize(argv = ARGV, *others)
-      @argv = argv.equal?(ARGV) ? ARGV : [argv, *others]
+      @argv = Primitive.object_equal(argv, ARGV) ? ARGV : [argv, *others]
       @lineno = 0
       # Setting $. sets ARGF.last_lineno, but does not set
       # ARGF.lineno, Almost every operation that sets lineno also sets
diff --git a/src/main/ruby/truffleruby/core/array.rb b/src/main/ruby/truffleruby/core/array.rb
@@ -84,7 +84,7 @@ def -(other)
 
   def <=>(other)
     other = Truffle::Type.rb_check_convert_type other, Array, :to_ary
-    return 0 if equal? other
+    return 0 if Primitive.object_equal(self, other)
     return nil if Primitive.nil? other
 
     total = other.size
@@ -125,7 +125,7 @@ def ==(other)
       return result
     end
 
-    return true if equal?(other)
+    return true if Primitive.object_equal(self, other)
     unless Primitive.object_kind_of?(other, Array)
       return false unless other.respond_to? :to_ary
       return other == self
@@ -323,7 +323,7 @@ def cycle(n = nil)
 
     return nil if empty?
 
-    if nil.equal? n
+    if Primitive.object_equal(nil, n)
       until empty?
         each { |x| yield x }
       end
@@ -380,7 +380,7 @@ def eql?(other)
       return result
     end
 
-    return true if equal? other
+    return true if Primitive.object_equal(self, other)
     return false unless Primitive.object_kind_of?(other, Array)
     return false if size != other.size
 
diff --git a/src/main/ruby/truffleruby/core/comparable.rb b/src/main/ruby/truffleruby/core/comparable.rb
@@ -28,7 +28,7 @@
 
 module Comparable
   def ==(other)
-    return true if equal?(other)
+    return true if Primitive.object_equal(self, other)
 
     return false if Truffle::ThreadOperations.detect_pair_recursion(self, other) do
       unless comp = (self <=> other)
diff --git a/src/main/ruby/truffleruby/core/complex.rb b/src/main/ruby/truffleruby/core/complex.rb
@@ -268,7 +268,7 @@ def rationalize(eps = nil)
   def to_s
     result = real.to_s
 
-    if imag < 0 || imag.equal?(-0.0)
+    if imag < 0 || Primitive.object_equal(imag, -0.0)
       result << '-'
     else
       result << '+'
diff --git a/src/main/ruby/truffleruby/core/env.rb b/src/main/ruby/truffleruby/core/env.rb
@@ -243,7 +243,7 @@ def rehash
   end
 
   def replace(other)
-    return self if equal?(other)
+    return self if Primitive.object_equal(self, other)
     other = Truffle::Type.rb_convert_type(other, Hash, :to_hash)
     keys_to_delete = keys
     other.each do |k, v|
@@ -295,7 +295,7 @@ def to_h
   end
 
   def update(other)
-    return self if equal?(other)
+    return self if Primitive.object_equal(self, other)
     other = Truffle::Type.rb_convert_type(other, Hash, :to_hash)
     if block_given?
       other.each do |k, v|
diff --git a/src/main/ruby/truffleruby/core/exception.rb b/src/main/ruby/truffleruby/core/exception.rb
@@ -99,7 +99,7 @@ def exception(message = nil)
   def self.to_tty?
     # Whether $stderr refers to the original STDERR and STDERR is a tty.
     # When using polyglot stdio, we cannot know and assume false.
-    $stderr.equal?(STDERR) && !STDERR.closed? &&
+    Primitive.object_equal($stderr, STDERR) && !STDERR.closed? &&
       (!Truffle::Boot.get_option('polyglot-stdio') && STDERR.tty?)
   end
 end
@@ -282,7 +282,7 @@ def self.new(*args)
     #
     # Otherwise it's called on a Errno subclass and just helps setup
     # a instance of the subclass
-    if self.equal? SystemCallError
+    if Primitive.object_equal(self, SystemCallError)
       case args.size
       when 1
         if Primitive.object_kind_of?(args.first, Integer)
@@ -326,7 +326,7 @@ def self.new(*args)
 
       if defined?(self::Errno) && Primitive.object_kind_of?(self::Errno, Integer)
         error = SystemCallError.errno_error(self, message, self::Errno, location)
-        if error && Primitive.object_class(error).equal?(self)
+        if error && Primitive.object_equal(Primitive.object_class(error), self)
           return error
         end
       end
diff --git a/src/main/ruby/truffleruby/core/float.rb b/src/main/ruby/truffleruby/core/float.rb
@@ -120,7 +120,7 @@ def to_r
   def arg
     if nan?
       self
-    elsif self < 0 || equal?(-0.0)
+    elsif self < 0 || Primitive.object_equal(self, -0.0)
       Math::PI
     else
       0
diff --git a/src/main/ruby/truffleruby/core/hash.rb b/src/main/ruby/truffleruby/core/hash.rb
@@ -41,7 +41,7 @@ def self.contains_all_internal(one, two)
     one.all? do |key, value|
       if two.has_key?(key)
         two_value = two[key]
-        value.equal?(two_value) || value == two_value
+        Primitive.object_equal(value, two_value) || value == two_value
       else
         false
       end
@@ -130,7 +130,7 @@ def eql?(other)
   end
 
   def eql_op(op, other)
-    return true if self.equal? other
+    return true if Primitive.object_equal(self, other)
     unless Primitive.object_kind_of?(other, Hash)
       return false unless other.respond_to? :to_hash
       return other.send(op, self)
diff --git a/src/main/ruby/truffleruby/core/io.rb b/src/main/ruby/truffleruby/core/io.rb
@@ -487,7 +487,7 @@ def self.read_encode(io, str)
     internal = io.internal_encoding
     external = io.external_encoding || Encoding.default_external
 
-    if external.equal? Encoding::BINARY
+    if Primitive.object_equal(external, Encoding::BINARY)
       str.force_encoding external
     elsif internal and external
       ec = Encoding::Converter.new external, internal
diff --git a/src/main/ruby/truffleruby/core/kernel.rb b/src/main/ruby/truffleruby/core/kernel.rb
@@ -54,7 +54,7 @@ def Complex(real, imag = undefined, exception: true)
   module_function :Complex
 
   def Float(obj, exception: true)
-    raise_exception = !exception.equal?(false)
+    raise_exception = !Primitive.object_equal(exception, false)
     obj = Truffle::Interop.unbox_if_needed(obj)
 
     case obj
@@ -74,7 +74,7 @@ def Float(obj, exception: true)
         nil
       end
     when Complex
-      if obj.respond_to?(:imag) && obj.imag.equal?(0)
+      if obj.respond_to?(:imag) && Primitive.object_equal(obj.imag, 0)
         Truffle::Type.coerce_to obj, Float, :to_f
       else
         raise RangeError, "can't convert #{obj} into Float"
@@ -90,7 +90,7 @@ def Float(obj, exception: true)
   module_function :Float
 
   def Hash(obj)
-    return {} if obj.equal?(nil) || obj == []
+    return {} if Primitive.object_equal(obj, nil) || obj == []
 
     if hash = Truffle::Type.rb_check_convert_type(obj, Hash, :to_hash)
       return hash
@@ -104,7 +104,7 @@ def Integer(obj, base = 0, exception: true)
     obj = Truffle::Interop.unbox_if_needed(obj)
     converted_base = Truffle::Type.rb_check_to_integer(base, :to_int)
     base = Primitive.nil?(converted_base) ? 0 : converted_base
-    raise_exception = !exception.equal?(false)
+    raise_exception = !Primitive.object_equal(exception, false)
 
     if Primitive.object_kind_of?(obj, String)
       Primitive.string_to_inum(obj, base, true, raise_exception)
@@ -203,8 +203,8 @@ def abort(msg = nil)
 
   def autoload(name, file)
     nesting = Primitive.caller_nesting
-    mod = nesting.first || (Kernel.equal?(self) ? Kernel : Object)
-    if mod.equal?(self)
+    mod = nesting.first || (Primitive.object_equal(Kernel, self) ? Kernel : Object)
+    if Primitive.object_equal(mod, self)
       super(name, file) # Avoid recursion
     else
       mod.autoload(name, file)
@@ -213,7 +213,7 @@ def autoload(name, file)
   module_function :autoload
 
   def autoload?(name)
-    if Kernel.equal?(self)
+    if Primitive.object_equal(Kernel, self)
       super(name) # Avoid recursion
     else
       Object.autoload?(name)
diff --git a/src/main/ruby/truffleruby/core/match_data.rb b/src/main/ruby/truffleruby/core/match_data.rb
@@ -45,7 +45,7 @@ def offset(idx)
   end
 
   def ==(other)
-    return true if equal?(other)
+    return true if Primitive.object_equal(self, other)
 
     Primitive.object_kind_of?(other, MatchData) &&
       string == other.string  &&
diff --git a/src/main/ruby/truffleruby/core/module.rb b/src/main/ruby/truffleruby/core/module.rb
@@ -57,8 +57,8 @@ def include?(mod)
       raise TypeError, "wrong argument type #{Primitive.object_class(mod)} (expected Module)"
     end
 
-    return false if self.equal?(mod)
-    ancestors.any? { |m| mod.equal?(m) }
+    return false if Primitive.object_equal(self, mod)
+    ancestors.any? { |m| Primitive.object_equal(mod, m) }
   end
 
   private def method_added(name)
diff --git a/src/main/ruby/truffleruby/core/numeric.rb b/src/main/ruby/truffleruby/core/numeric.rb
@@ -57,7 +57,7 @@ def <=>(other)
     # It's important this method NOT contain the coercion protocols!
     # MRI doesn't and doing so breaks stuff!
 
-    return 0 if self.equal? other
+    return 0 if Primitive.object_equal(self, other)
     nil
   end
 
diff --git a/src/main/ruby/truffleruby/core/range.rb b/src/main/ruby/truffleruby/core/range.rb
@@ -48,7 +48,7 @@ def initialize(first, last, exclude_end = false)
   private :initialize
 
   def ==(other)
-    return true if equal? other
+    return true if Primitive.object_equal(self, other)
 
     Primitive.object_kind_of?(other, Range) and
       self.begin == other.begin and
@@ -57,7 +57,7 @@ def ==(other)
   end
 
   def eql?(other)
-    return true if equal? other
+    return true if Primitive.object_equal(self, other)
 
     Primitive.object_kind_of?(other, Range) and
         self.begin.eql?(other.begin) and
diff --git a/src/main/ruby/truffleruby/core/rational.rb b/src/main/ruby/truffleruby/core/rational.rb
@@ -330,7 +330,7 @@ def truncate(precision = 0)
   end
 
   def self.convert(num, den)
-    if num.equal?(nil) || den.equal?(nil)
+    if Primitive.object_equal(num, nil) || Primitive.object_equal(den, nil)
       raise TypeError, 'cannot convert nil into Rational'
     end
 
@@ -354,7 +354,7 @@ def self.convert(num, den)
       den = den.to_r
     end
 
-    if den.equal?(1) && !(Primitive.object_kind_of?(num, Integer))
+    if Primitive.object_equal(den, 1) && !(Primitive.object_kind_of?(num, Integer))
       return Truffle::Type.coerce_to(num, Rational, :to_r)
     elsif Primitive.object_kind_of?(num, Numeric) && Primitive.object_kind_of?(den, Numeric) &&
         !(Primitive.object_kind_of?(num, Integer) && Primitive.object_kind_of?(den, Integer))
diff --git a/src/main/ruby/truffleruby/core/struct.rb b/src/main/ruby/truffleruby/core/struct.rb
@@ -286,7 +286,7 @@ def dig(key, *more)
   end
 
   def eql?(other)
-    return true if equal? other
+    return true if Primitive.object_equal(self, other)
     return false if Primitive.object_class(self) != Primitive.object_class(other)
 
     Truffle::ThreadOperations.detect_pair_recursion self, other do
@@ -452,7 +452,7 @@ def self._specialize(attrs)
     # the specialize if we're trying new Struct's directly from Struct itself,
     # not a Struct subclass.
 
-    return unless superclass.equal? Struct
+    return unless Primitive.object_equal(superclass, Struct)
     return unless attrs.map(&:to_s).all? { |a| a.ascii_only? || (a.encoding == Encoding::UTF_8 && a.valid_encoding?) }
 
     args, assigns, hashes, vars = [], [], [], []
diff --git a/src/main/ruby/truffleruby/core/truffle/complex_operations.rb b/src/main/ruby/truffleruby/core/truffle/complex_operations.rb
@@ -11,8 +11,8 @@
 module Truffle
   module ComplexOperations
     def self.convert_not_real_arguments(real, imag, exception)
-      raise_exception = !exception.equal?(false)
-      if nil.equal?(real) || nil.equal?(imag)
+      raise_exception = !Primitive.object_equal(exception, false)
+      if Primitive.object_equal(nil, real) || Primitive.object_equal(nil, imag)
         return nil unless raise_exception
         raise TypeError, "can't convert nil into Complex"
       end
diff --git a/src/main/ruby/truffleruby/core/truffle/exception_operations.rb b/src/main/ruby/truffleruby/core/truffle/exception_operations.rb
@@ -127,15 +127,15 @@ def self.message_and_class(exception, highlight)
     end
 
     def self.full_message(exception, highlight, order)
-      highlight = if highlight.equal?(nil)
+      highlight = if Primitive.object_equal(highlight, nil)
                     Exception.to_tty?
                   else
-                    raise ArgumentError, "expected true of false as highlight: #{highlight}" unless highlight.equal?(true) || highlight.equal?(false)
-                    !highlight.equal?(false)
+                    raise ArgumentError, "expected true of false as highlight: #{highlight}" unless Primitive.object_equal(highlight, true) || Primitive.object_equal(highlight, false)
+                    !Primitive.object_equal(highlight, false)
                   end
 
-      raise ArgumentError, "expected :top or :bottom as order: #{order}" unless order.equal?(:top) || order.equal?(:bottom)
-      reverse = !order.equal?(:top)
+      raise ArgumentError, "expected :top or :bottom as order: #{order}" unless Primitive.object_equal(order, :top) || Primitive.object_equal(order, :bottom)
+      reverse = !Primitive.object_equal(order, :top)
 
       result = ''.b
       bt = exception.backtrace || caller(2)
diff --git a/src/main/ruby/truffleruby/core/truffle/ffi/pointer.rb b/src/main/ruby/truffleruby/core/truffle/ffi/pointer.rb
@@ -125,7 +125,7 @@ def [](idx)
     end
 
     def ==(other)
-      return true if nil.equal?(other) && null?
+      return true if Primitive.object_equal(nil, other) && null?
       return false unless Primitive.object_kind_of?(other, Pointer)
       address == other.address
     end
diff --git a/src/main/ruby/truffleruby/core/truffle/ffi/pointer_access.rb b/src/main/ruby/truffleruby/core/truffle/ffi/pointer_access.rb
@@ -628,7 +628,7 @@ def put_array_of_double(offset, ary)
   private def get_pointer_value(value)
     if Primitive.object_kind_of?(value, Truffle::FFI::Pointer)
       value.address
-    elsif nil.equal?(value)
+    elsif Primitive.object_equal(nil, value)
       0
     elsif Primitive.object_kind_of?(value, Integer)
       value
diff --git a/src/main/ruby/truffleruby/core/truffle/io_operations.rb b/src/main/ruby/truffleruby/core/truffle/io_operations.rb
@@ -32,7 +32,7 @@ def self.puts(io, *args)
         io.write DEFAULT_RECORD_SEPARATOR
       else
         args.each do |arg|
-          if arg.equal? nil
+          if Primitive.object_equal(arg, nil)
             str = ''
           elsif Primitive.object_kind_of?(arg, String)
             # might be a Foreign String we need to convert
diff --git a/src/main/ruby/truffleruby/core/truffle/polyglot.rb b/src/main/ruby/truffleruby/core/truffle/polyglot.rb
@@ -585,7 +585,7 @@ def self.import(name)
     type = Java.type(name)
     if mod.const_defined?(simple_name)
       current = mod.const_get(simple_name)
-      if current.equal?(type)
+      if Primitive.object_equal(current, type)
         # Ignore - it's already set
       else
         raise NameError, "constant #{simple_name} already set"

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class ARGFClass`
`59`	`59`	`# @see #advance!`
`60`	`60`	`#`
`61`	`61`	`def initialize(argv = ARGV, *others)`
`62`		`- @argv = argv.equal?(ARGV) ? ARGV : [argv, *others]`
	`62`	`+ @argv = Primitive.object_equal(argv, ARGV) ? ARGV : [argv, *others]`
`63`	`63`	`@lineno = 0`
`64`	`64`	`# Setting $. sets ARGF.last_lineno, but does not set`
`65`	`65`	`# ARGF.lineno, Almost every operation that sets lineno also sets`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ def to_r`
`120`	`120`	`def arg`
`121`	`121`	`if nan?`
`122`	`122`	`self`
`123`		`- elsif self < 0 \|\| equal?(-0.0)`
	`123`	`+ elsif self < 0 \|\| Primitive.object_equal(self, -0.0)`
`124`	`124`	`Math::PI`
`125`	`125`	`else`
`126`	`126`	`0`