Rename Primitive.object_class to Primitive.class

Author: eregon

lib/truffle/objspace.rb

@@ -56,7 +56,7 @@ def count_nodes(nodes = {})
 
   def count_objects_size(hash = {})
     ObjectSpace.each_object do |obj|
-      class_name = Primitive.object_class(obj).name
+      class_name = Primitive.class(obj).name
       if class_name
         class_name_sym = class_name.to_sym
         hash[class_name_sym] = hash.fetch(class_name_sym, 0) + ObjectSpace.memsize_of(obj)
@@ -69,7 +69,7 @@ def count_objects_size(hash = {})
 
   def count_tdata_objects(hash = {})
     ObjectSpace.each_object do |object|
-      klass = Primitive.object_class(object)
+      klass = Primitive.class(object)
       hash[klass] ||= 0
       hash[klass] += 1
     end
@@ -82,7 +82,7 @@ def _dump(object, output)
       require 'json'
       json = {
         address: '0x' + object.object_id.to_s(16),
-        class: '0x' + Primitive.object_class(object).object_id.to_s(16),
+        class: '0x' + Primitive.class(object).object_id.to_s(16),
         memsize: memsize_of(object),
         flags: { }
       }

lib/truffle/truffle/cext.rb

@@ -266,7 +266,7 @@ def rbimpl_rtypeddata_p(obj)
   end
 
   def ensure_class(obj, klass, message = 'expected class %s, but object class is %s')
-    raise TypeError, format(message, klass, Primitive.object_class(obj)) unless Primitive.is_a?(obj, klass)
+    raise TypeError, format(message, klass, Primitive.class(obj)) unless Primitive.is_a?(obj, klass)
   end
 
   def rb_method_boundp(klass, id, ex)
@@ -278,7 +278,7 @@ def rb_method_boundp(klass, id, ex)
   end
 
   def rb_obj_is_instance_of(object, ruby_class)
-    Primitive.object_class(object) == ruby_class
+    Primitive.class(object) == ruby_class
   end
 
   def rb_obj_is_kind_of(object, ruby_class)
@@ -443,11 +443,11 @@ def rb_hash_start(h)
   end
 
   def rb_obj_class(object)
-    Primitive.object_class(object)
+    Primitive.class(object)
   end
 
   def rb_obj_classname(object)
-    Primitive.object_class(object).name
+    Primitive.class(object).name
   end
 
   def rb_class_of(object)

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

@@ -85,8 +85,8 @@ protected boolean respondTo(Object object, Object name, boolean includePrivate,
         }
     }
 
-    @Primitive(name = "object_class")
-    public abstract static class ObjectClassNode extends PrimitiveArrayArgumentsNode {
+    @Primitive(name = "class")
+    public abstract static class ClassPrimitiveNode extends PrimitiveArrayArgumentsNode {
         @Specialization
         protected RubyClass objectClass(Object object,
                 @Cached LogicalClassNode logicalClassNode) {

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

@@ -508,7 +508,7 @@ def flatten!(level = -1)
     level = Primitive.rb_num2int level
     return nil if level == 0
 
-    out = Primitive.object_class(self).allocate # new_reserved size
+    out = Primitive.class(self).allocate # new_reserved size
     if Primitive.array_flatten_helper(self, out, level)
       Primitive.steal_array_storage(self, out)
       return self
@@ -1286,7 +1286,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 #{Primitive.object_class(elem)} at #{i} (expected array)"
+        raise TypeError, "wrong element type #{Primitive.class(elem)} at #{i} (expected array)"
       end
 
       ary = elem.to_ary
@@ -1365,7 +1365,7 @@ def zip(*others)
       elsif Primitive.respond_to?(other, :each, false)
         other.to_enum(:each)
       else
-        raise TypeError, "wrong argument type #{Primitive.object_class(other)} (must respond to :each)"
+        raise TypeError, "wrong argument type #{Primitive.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 #{Primitive.object_class(range)} (expected Range)" unless Primitive.is_a?(range, Range)
+      raise TypeError, "wrong argument type #{Primitive.class(range)} (expected Range)" unless Primitive.is_a?(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.is_a?(other, Complex) and
-    Primitive.object_class(imag) == Primitive.object_class(other.imag) and
-    Primitive.object_class(real) == Primitive.object_class(other.real) and
+    Primitive.class(imag) == Primitive.class(other.imag) and
+    Primitive.class(real) == Primitive.class(other.real) and
     self == other
   end
 
@@ -210,7 +210,7 @@ def coerce(other)
     elsif Primitive.is_a?(other, Complex)
       [other, self]
     else
-      raise TypeError, "#{Primitive.object_class(other)} can't be coerced into Complex"
+      raise TypeError, "#{Primitive.class(other)} can't be coerced into Complex"
     end
   end
 
@@ -305,7 +305,7 @@ def inspect
   end
 
   def fdiv(other)
-    raise TypeError, "#{Primitive.object_class(other)} can't be coerced into Complex" unless Primitive.is_a?(other, Numeric)
+    raise TypeError, "#{Primitive.class(other)} can't be coerced into Complex" unless Primitive.is_a?(other, Numeric)
 
     # FIXME
     self / other

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

@@ -141,7 +141,7 @@ def each_child
   end
 
   def inspect
-    "#<#{Primitive.object_class(self)}:#{@path}>"
+    "#<#{Primitive.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 #{Primitive.object_class(elem)} at #{i} (expected array)"
+        raise TypeError, "wrong element type #{Primitive.class(elem)} at #{i} (expected array)"
       end
 
       ary = elem.to_ary
@@ -342,7 +342,7 @@ def zip(*enums)
       elsif Primitive.respond_to?(enum, :each, false)
         enum.to_enum(:each)
       else
-        raise TypeError, "wrong argument type #{Primitive.object_class(enum)} (must respond to :each)"
+        raise TypeError, "wrong argument type #{Primitive.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 #{Primitive.object_class(o)} with #{chosen} failed"
+          raise ArgumentError, "comparison of #{Primitive.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 "#<#{Primitive.object_class(self)}: uninitialized>" if Primitive.nil?(@object) && Primitive.nil?(@iter)
+    return "#<#{Primitive.class(self)}: uninitialized>" if Primitive.nil?(@object) && Primitive.nil?(@iter)
 
     args = @kwargs.empty? ? @args : [*@args, @kwargs]
     args = args.empty? ? '' : "(#{args.map(&:inspect).join(', ')})"
-    "#<#{Primitive.object_class(self)}: #{@object.inspect}:#{@iter}#{args}>"
+    "#<#{Primitive.class(self)}: #{@object.inspect}:#{@iter}#{args}>"
   end
 
   def each(*args, **kwargs, &block)
@@ -538,7 +538,7 @@ def zip(*lists)
         elsif Primitive.respond_to?(list, :each, false)
           list.to_enum :each
         else
-          raise TypeError, "wrong argument type #{Primitive.object_class(list)} (must respond to :each)"
+          raise TypeError, "wrong argument type #{Primitive.class(list)} (must respond to :each)"
         end
       end
 
@@ -795,8 +795,8 @@ def rewind
   end
 
   def inspect
-    return "#<#{Primitive.object_class(self).name}: ...>" if Truffle::ThreadOperations.detect_recursion(self) do
-      return "#<#{Primitive.object_class(self).name}: #{@enums || "uninitialized"}>"
+    return "#<#{Primitive.class(self).name}: ...>" if Truffle::ThreadOperations.detect_recursion(self) do
+      return "#<#{Primitive.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 #{Primitive.object_class(elem)} (expected array)"
+        raise TypeError, "wrong element type #{Primitive.class(elem)} (expected array)"
       end
 
       ary = elem.to_ary