Autocorrect and replace #class with Primitive.object_class

Author: andrykonchin

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

@@ -507,7 +507,7 @@ def flatten!(level = -1)
     level = Primitive.rb_num2int level
     return nil if level == 0
 
-    out = self.class.allocate # new_reserved size
+    out = Primitive.object_class(self).allocate # new_reserved size
     if Primitive.array_flatten_helper(self, out, level)
       Primitive.steal_array_storage(self, out)
       return self
@@ -1283,7 +1283,7 @@ def to_h
     each_with_index do |elem, i|
       elem = yield(elem) if block_given?
       unless elem.respond_to?(:to_ary)
-        raise TypeError, "wrong element type #{elem.class} at #{i} (expected array)"
+        raise TypeError, "wrong element type #{Primitive.object_class(elem)} at #{i} (expected array)"
       end
 
       ary = elem.to_ary
@@ -1362,7 +1362,7 @@ def zip(*others)
       elsif Primitive.object_respond_to?(other, :each, false)
         other.to_enum(:each)
       else
-        raise TypeError, "wrong argument type #{other.class} (must respond to :each)"
+        raise TypeError, "wrong argument type #{Primitive.object_class(other)} (must respond to :each)"
       end
     end
 

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

@@ -82,7 +82,7 @@ def between?(min, max)
   def clamp(min, max = undefined)
     if Primitive.undefined?(max)
       range = min
-      raise TypeError, "wrong argument type #{range.class} (expected Range)" unless Primitive.object_kind_of?(range, Range)
+      raise TypeError, "wrong argument type #{Primitive.object_class(range)} (expected Range)" unless Primitive.object_kind_of?(range, Range)
       raise ArgumentError, 'cannot clamp with an exclusive range' if range.exclude_end?
       min, max = range.begin, range.end
     end

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

@@ -199,8 +199,8 @@ def ==(other)
 
   def eql?(other)
     Primitive.object_kind_of?(other, Complex) and
-    imag.class == other.imag.class and
-    real.class == other.real.class and
+    Primitive.object_class(imag) == Primitive.object_class(other.imag) and
+    Primitive.object_class(real) == Primitive.object_class(other.real) and
     self == other
   end
 
@@ -210,7 +210,7 @@ def coerce(other)
     elsif Primitive.object_kind_of?(other, Complex)
       [other, self]
     else
-      raise TypeError, "#{other.class} can't be coerced into Complex"
+      raise TypeError, "#{Primitive.object_class(other)} can't be coerced into Complex"
     end
   end
 
@@ -305,7 +305,7 @@ def inspect
   end
 
   def fdiv(other)
-    raise TypeError, "#{other.class} can't be coerced into Complex" unless Primitive.object_kind_of?(other, Numeric)
+    raise TypeError, "#{Primitive.object_class(other)} can't be coerced into Complex" unless Primitive.object_kind_of?(other, Numeric)
 
     # FIXME
     self / other

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

@@ -141,7 +141,7 @@ def each_child
   end
 
   def inspect
-    "#<#{self.class}:#{@path}>"
+    "#<#{Primitive.object_class(self)}:#{@path}>"
   end
 
   class << self

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

@@ -319,7 +319,7 @@ def to_h(*arg)
     each_with_index(*arg) do |elem, i|
       elem = yield(elem) if block_given?
       unless elem.respond_to?(:to_ary)
-        raise TypeError, "wrong element type #{elem.class} at #{i} (expected array)"
+        raise TypeError, "wrong element type #{Primitive.object_class(elem)} at #{i} (expected array)"
       end
 
       ary = elem.to_ary
@@ -342,7 +342,7 @@ def zip(*enums)
       elsif Primitive.object_respond_to?(enum, :each, false)
         enum.to_enum(:each)
       else
-        raise TypeError, "wrong argument type #{enum.class} (must respond to :each)"
+        raise TypeError, "wrong argument type #{Primitive.object_class(enum)} (must respond to :each)"
       end
     end
 
@@ -798,7 +798,7 @@ def min_max(relative)
       else
         comp = block_given? ? yield(o, chosen) : o <=> chosen
         unless comp
-          raise ArgumentError, "comparison of #{o.class} with #{chosen} failed"
+          raise ArgumentError, "comparison of #{Primitive.object_class(o)} with #{chosen} failed"
         end
 
         if (Comparable.compare_int(comp) <=> 0) == relative

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

@@ -70,11 +70,11 @@ class Enumerator
   end
 
   def inspect
-    return "#<#{self.class}: uninitialized>" if Primitive.nil?(@object) && Primitive.nil?(@iter)
+    return "#<#{Primitive.object_class(self)}: uninitialized>" if Primitive.nil?(@object) && Primitive.nil?(@iter)
 
     args = @kwargs.empty? ? @args : [*@args, @kwargs]
     args = args.empty? ? '' : "(#{args.map(&:inspect).join(', ')})"
-    "#<#{self.class}: #{@object.inspect}:#{@iter}#{args}>"
+    "#<#{Primitive.object_class(self)}: #{@object.inspect}:#{@iter}#{args}>"
   end
 
   def each(*args, **kwargs, &block)
@@ -538,7 +538,7 @@ def zip(*lists)
         elsif Primitive.object_respond_to?(list, :each, false)
           list.to_enum :each
         else
-          raise TypeError, "wrong argument type #{list.class} (must respond to :each)"
+          raise TypeError, "wrong argument type #{Primitive.object_class(list)} (must respond to :each)"
         end
       end
 
@@ -795,8 +795,8 @@ def rewind
   end
 
   def inspect
-    return "#<#{self.class.name}: ...>" if Truffle::ThreadOperations.detect_recursion(self) do
-      return "#<#{self.class.name}: #{@enums || "uninitialized"}>"
+    return "#<#{Primitive.object_class(self).name}: ...>" if Truffle::ThreadOperations.detect_recursion(self) do
+      return "#<#{Primitive.object_class(self).name}: #{@enums || "uninitialized"}>"
     end
   end
 end

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

@@ -281,7 +281,7 @@ def to_h
     each_pair do |*elem|
       elem = yield(elem)
       unless elem.respond_to?(:to_ary)
-        raise TypeError, "wrong element type #{elem.class} (expected array)"
+        raise TypeError, "wrong element type #{Primitive.object_class(elem)} (expected array)"
       end
 
       ary = elem.to_ary

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

@@ -47,7 +47,7 @@ def message
 
   def to_s
     msg = Truffle::ExceptionOperations.compute_message(self)
-    return self.class.to_s if Primitive.nil?(msg)
+    return Primitive.object_class(self).to_s if Primitive.nil?(msg)
     msg
   end
 
@@ -71,9 +71,9 @@ def set_backtrace(bt)
   def inspect
     s = self.to_s
     if s.empty?
-      self.class.name
+      Primitive.object_class(self).name
     else
-      "#<#{self.class.name}: #{s}>"
+      "#<#{Primitive.object_class(self).name}: #{s}>"
     end
   end
 
@@ -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 && error.class.equal?(self)
+        if error && Primitive.object_class(error).equal?(self)
           return error
         end
       end
@@ -377,7 +377,7 @@ def initialize(sig, message = undefined)
         sig = sig.to_s
       else
         sig_converted = Truffle::Type.rb_check_convert_type sig, String, :to_str
-        raise ArgumentError, "bad signal type #{sig.class.name}" if Primitive.nil? sig_converted
+        raise ArgumentError, "bad signal type #{Primitive.object_class(sig).name}" if Primitive.nil? sig_converted
         sig = sig_converted
       end
       signal_name = sig

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

@@ -1228,7 +1228,7 @@ def truncate(length)
   end
 
   def inspect
-    return_string = "#<#{self.class}:0x#{object_id.to_s(16)} path=#{@path}"
+    return_string = "#<#{Primitive.object_class(self)}:0x#{object_id.to_s(16)} path=#{@path}"
     return_string << ' (closed)' if closed?
     return_string << '>'
   end

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

@@ -112,13 +112,13 @@ def self.ruby2_keywords_hash(hash)
   def <(other)
     other = Truffle::Type.coerce_to(other, Hash, :to_hash)
     return false if self.size >= other.size
-    self.class.contains_all_internal(self, other)
+    Primitive.object_class(self).contains_all_internal(self, other)
   end
 
   def <=(other)
     other = Truffle::Type.coerce_to(other, Hash, :to_hash)
     return false if self.size > other.size
-    self.class.contains_all_internal(self, other)
+    Primitive.object_class(self).contains_all_internal(self, other)
   end
 
   def ==(other)
@@ -159,13 +159,13 @@ def eql_op(op, other)
   def >(other)
     other = Truffle::Type.coerce_to(other, Hash, :to_hash)
     return false if self.size <= other.size
-    self.class.contains_all_internal(other, self)
+    Primitive.object_class(self).contains_all_internal(other, self)
   end
 
   def >=(other)
     other = Truffle::Type.coerce_to(other, Hash, :to_hash)
     return false if self.size < other.size
-    self.class.contains_all_internal(other, self)
+    Primitive.object_class(self).contains_all_internal(other, self)
   end
 
   def assoc(key)