Rename Primitive.object_equal to Primitive.equal?

Author: eregon

lib/mri/monitor.rb

@@ -241,7 +241,7 @@ def initialize(...)
   # Initializes the MonitorMixin after being included in a class or when an
   # object has been extended with the MonitorMixin
   def mon_initialize
-    if defined?(@mon_mutex) && Primitive.object_equal(@mon_mutex_owner_object, self)
+    if defined?(@mon_mutex) && Primitive.equal?(@mon_mutex_owner_object, self)
       raise ThreadError, 'already initialized'
     end
     @mon_mutex = Thread::Mutex.new

lib/truffle/truffle/cext.rb

@@ -1059,7 +1059,7 @@ def rb_protect(function, arg, write_status, status)
       res = Truffle::Interop.execute_without_conversion(function, arg)
     end
 
-    unless Primitive.object_equal(nil, e)
+    unless Primitive.equal?(nil, e)
       store_exception(e)
       pos = extract_tag(e)
       Primitive.thread_set_exception(extract_ruby_exception(e))

src/main/java/org/truffleruby/core/support/TypeNodes.java

@@ -103,10 +103,10 @@ protected RubyClass classOf(Object object,
         }
     }
 
-    @Primitive(name = "object_equal")
-    public abstract static class ObjectEqualNode extends PrimitiveArrayArgumentsNode {
+    @Primitive(name = "equal?")
+    public abstract static class EqualPrimitiveNode extends PrimitiveArrayArgumentsNode {
         @Specialization
-        protected boolean objectEqual(Object a, Object b,
+        protected boolean equal(Object a, Object b,
                 @Cached ReferenceEqualNode referenceEqualNode) {
             return referenceEqualNode.executeReferenceEqual(a, b);
         }

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

@@ -59,7 +59,7 @@ class ARGFClass
     # @see  #advance!
     #
     def initialize(argv = ARGV, *others)
-      @argv = Primitive.object_equal(argv, ARGV) ? ARGV : [argv, *others]
+      @argv = Primitive.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

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 Primitive.object_equal(self, other)
+    return 0 if Primitive.equal?(self, other)
     return nil if Primitive.nil? other
 
     total = other.size
@@ -125,7 +125,7 @@ def ==(other)
       return result
     end
 
-    return true if Primitive.object_equal(self, other)
+    return true if Primitive.equal?(self, other)
     unless Primitive.is_a?(other, Array)
       return false unless other.respond_to? :to_ary
       return other == self
@@ -381,7 +381,7 @@ def eql?(other)
       return result
     end
 
-    return true if Primitive.object_equal(self, other)
+    return true if Primitive.equal?(self, other)
     return false unless Primitive.is_a?(other, Array)
     return false if size != other.size
 

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

@@ -28,7 +28,7 @@
 
 module Comparable
   def ==(other)
-    return true if Primitive.object_equal(self, other)
+    return true if Primitive.equal?(self, other)
 
     return false if Truffle::ThreadOperations.detect_pair_recursion(self, other) do
       unless comp = (self <=> other)

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 || Primitive.object_equal(imag, -0.0)
+    if imag < 0 || Primitive.equal?(imag, -0.0)
       result << '-'
     else
       result << '+'

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

@@ -266,7 +266,7 @@ def glob(pattern, flags = 0, base: nil, sort: true, &block)
 
       matches = []
       index = 0
-      flags |= File::FNM_GLOB_NOSORT if Primitive.object_equal(sort, false)
+      flags |= File::FNM_GLOB_NOSORT if Primitive.equal?(sort, false)
 
       normalized_base = if Primitive.nil? base
                           nil

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

@@ -243,7 +243,7 @@ def rehash
   end
 
   def replace(other)
-    return self if Primitive.object_equal(self, other)
+    return self if Primitive.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 Primitive.object_equal(self, other)
+    return self if Primitive.equal?(self, other)
     other = Truffle::Type.rb_convert_type(other, Hash, :to_hash)
     if block_given?
       other.each do |k, v|

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

@@ -87,7 +87,7 @@ class << self
 
   def exception(message = nil)
     # As strange as this may seem, this is actually the protocol that CRuby implements
-    if message and !Primitive.object_equal(message, self)
+    if message and !Primitive.equal?(message, self)
       copy = clone # note: rb_obj_clone() in CRuby
       Primitive.exception_set_message copy, message
       copy
@@ -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.
-    Primitive.object_equal($stderr, STDERR) && !STDERR.closed? &&
+    Primitive.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 Primitive.object_equal(self, SystemCallError)
+    if Primitive.equal?(self, SystemCallError)
       case args.size
       when 1
         if Primitive.is_a?(args.first, Integer)
@@ -326,7 +326,7 @@ def self.new(*args)
 
       if defined?(self::Errno) && Primitive.is_a?(self::Errno, Integer)
         error = SystemCallError.errno_error(self, message, self::Errno, location)
-        if error && Primitive.object_equal(Primitive.object_class(error), self)
+        if error && Primitive.equal?(Primitive.object_class(error), self)
           return error
         end
       end