Rename Primitive.object_kind_of? to Primitive.is_a?

Author: eregon

lib/truffle/digest.rb

@@ -138,7 +138,7 @@ def size
     alias_method :length, :size
 
     def ==(other)
-      if Primitive.object_kind_of?(other, Digest::Instance)
+      if Primitive.is_a?(other, Digest::Instance)
         self_str = self.digest
         other_str = other.digest
       else

lib/truffle/io/wait.rb

@@ -52,12 +52,12 @@ def wait_priority(timeout = nil)
   def wait(*args)
     ensure_open
 
-    if args.size != 2 || Primitive.object_kind_of?(args[0], Symbol) || Primitive.object_kind_of?(args[1], Symbol)
+    if args.size != 2 || Primitive.is_a?(args[0], Symbol) || Primitive.is_a?(args[1], Symbol)
       # Slow/messy path:
       timeout = :undef
       events = 0
       args.each do |arg|
-        if Primitive.object_kind_of?(arg, Symbol)
+        if Primitive.is_a?(arg, Symbol)
           events |= case arg
                     when :r, :read, :readable then IO::READABLE
                     when :w, :write, :writable then IO::WRITABLE

lib/truffle/objspace.rb

@@ -78,7 +78,7 @@ def count_tdata_objects(hash = {})
 
   # Helper method for ObjectSpace.dump
   def _dump(object, output)
-    if Primitive.object_kind_of?(output, String)
+    if Primitive.is_a?(output, String)
       require 'json'
       json = {
         address: '0x' + object.object_id.to_s(16),
@@ -120,7 +120,7 @@ def _dump(object, output)
 
   # Helper method for ObjectSpace.dump_all
   def _dump_all(output, full, since)
-    if Primitive.object_kind_of?(output, String)
+    if Primitive.is_a?(output, String)
       objects = []
       ObjectSpace.each_object do |object|
         objects.push dump(object)

lib/truffle/strscan.rb

@@ -333,7 +333,7 @@ def peep(len)
   private def scan_internal(pattern, advance_pos, getstr, headonly)
     scan_check_args(pattern, headonly)
 
-    if Primitive.object_kind_of?(pattern, String)
+    if Primitive.is_a?(pattern, String)
       md = scan_internal_string_pattern(pattern)
     else
       start = @fixed_anchor ? 0 : @pos

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.object_kind_of?(obj, klass)
+    raise TypeError, format(message, klass, Primitive.object_class(obj)) unless Primitive.is_a?(obj, klass)
   end
 
   def rb_method_boundp(klass, id, ex)
@@ -282,7 +282,7 @@ def rb_obj_is_instance_of(object, ruby_class)
   end
 
   def rb_obj_is_kind_of(object, ruby_class)
-    Primitive.object_kind_of?(object, ruby_class)
+    Primitive.is_a?(object, ruby_class)
   end
 
   def SYMBOL_P(value)
@@ -310,7 +310,7 @@ def RB_FIXNUM_P(value)
   end
 
   def RB_FLOAT_TYPE_P(value)
-    Primitive.object_kind_of?(value, Float)
+    Primitive.is_a?(value, Float)
   end
 
   def rb_integer_type_p(value)
@@ -406,7 +406,7 @@ def rb_num_coerce_relop(x, y, func)
     if Primitive.nil?(ary) && !raise_error
       return nil
     end
-    if !Primitive.object_kind_of?(ary, Array) || ary.size != 2
+    if !Primitive.is_a?(ary, Array) || ary.size != 2
       raise TypeError, 'coerce must return [x, y]'
     end
     ary
@@ -785,7 +785,7 @@ def coderange_java_to_rb(cr)
   end
 
   def RB_ENC_CODERANGE(obj)
-    if Primitive.object_kind_of?(obj, String)
+    if Primitive.is_a?(obj, String)
       rb_enc_str_coderange(obj)
     else
       raise "Unknown coderange for obj with class `#{obj.class}`"
@@ -847,7 +847,7 @@ def rb_enc_get_index(obj)
               0
             end
           end
-    enc = rb_enc_to_index(enc) if Primitive.object_kind_of?(enc, Encoding)
+    enc = rb_enc_to_index(enc) if Primitive.is_a?(enc, Encoding)
     enc
   end
 
@@ -1007,7 +1007,7 @@ def rb_path_to_class(path)
     rescue NameError
       raise ArgumentError, "undefined class/module #{path}"
     end
-    unless Primitive.object_kind_of?(const, ::Module)
+    unless Primitive.is_a?(const, ::Module)
       raise TypeError, "#{path} does not refer to class/module"
     end
     const
@@ -1129,7 +1129,7 @@ def rb_exc_raise(exception)
   end
 
   def rb_set_errinfo(error)
-    if Primitive.nil?(error) || Primitive.object_kind_of?(error, Exception)
+    if Primitive.nil?(error) || Primitive.is_a?(error, Exception)
       Primitive.thread_set_exception(error)
     else
       raise TypeError, 'assigning non-exception to ?!'
@@ -1544,7 +1544,7 @@ def rb_tr_error(message)
   def test_kwargs(kwargs, raise_error)
     return false if kwargs.nil?
 
-    if Primitive.object_kind_of?(kwargs, Hash) && kwargs.keys.all? { |k| Primitive.object_kind_of?(k, Symbol) }
+    if Primitive.is_a?(kwargs, Hash) && kwargs.keys.all? { |k| Primitive.is_a?(k, Symbol) }
       true
     elsif raise_error
       raise ArgumentError, "the value is not a Hash with all keys being Symbols as kwargs requires: #{kwargs}"
@@ -1698,7 +1698,7 @@ def rb_time_num_new(timev, off)
 
   def rb_time_interval_acceptable(time_val)
     # TODO (pitr-ch 09-Mar-2017): more precise error messages
-    raise TypeError, 'cannot be Time' if Primitive.object_kind_of?(time_val, Time)
+    raise TypeError, 'cannot be Time' if Primitive.is_a?(time_val, Time)
     raise ArgumentError, 'cannot be negative' if time_val < 0
   end
 
@@ -1789,7 +1789,7 @@ def rb_obj_as_string(object)
   end
 
   def rb_class_inherited_p(ruby_module, object)
-    if Primitive.object_kind_of?(object, Module)
+    if Primitive.is_a?(object, Module)
       ruby_module <= object
     else
       raise TypeError

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

@@ -66,10 +66,10 @@
 @CoreModule("Truffle::Type")
 public abstract class TypeNodes {
 
-    @Primitive(name = "object_kind_of?")
-    public abstract static class ObjectKindOfNode extends PrimitiveArrayArgumentsNode {
+    @Primitive(name = "is_a?")
+    public abstract static class IsAPrimitiveNode extends PrimitiveArrayArgumentsNode {
         @Specialization
-        protected boolean objectKindOf(Object object, RubyModule module,
+        protected boolean isA(Object object, RubyModule module,
                 @Cached IsANode isANode) {
             return isANode.executeIsA(object, module);
         }

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

@@ -126,7 +126,7 @@ def ==(other)
     end
 
     return true if Primitive.object_equal(self, other)
-    unless Primitive.object_kind_of?(other, Array)
+    unless Primitive.is_a?(other, Array)
       return false unless other.respond_to? :to_ary
       return other == self
     end
@@ -204,7 +204,7 @@ def ==(other)
 
   def assoc(obj)
     each do |x|
-      if Primitive.object_kind_of?(x, Array) and x.first == obj
+      if Primitive.is_a?(x, Array) and x.first == obj
         return x
       end
     end
@@ -382,7 +382,7 @@ def eql?(other)
     end
 
     return true if Primitive.object_equal(self, other)
-    return false unless Primitive.object_kind_of?(other, Array)
+    return false unless Primitive.is_a?(other, Array)
     return false if size != other.size
 
     Truffle::ThreadOperations.detect_pair_recursion self, other do
@@ -442,7 +442,7 @@ def fetch(idx, default = undefined)
     if Primitive.undefined?(index) || !index
       left = 0
       right = size
-    elsif Primitive.object_kind_of?(index, Range)
+    elsif Primitive.is_a?(index, Range)
       raise TypeError, 'length invalid with range' unless Primitive.undefined?(length)
 
       left, length = Primitive.range_normalized_start_length(index, size)
@@ -862,7 +862,7 @@ def product(*args)
 
   def rassoc(obj)
     each do |elem|
-      if Primitive.object_kind_of?(elem, Array) and elem.at(1) == obj
+      if Primitive.is_a?(elem, Array) and elem.at(1) == obj
         return elem
       end
     end
@@ -1334,7 +1334,7 @@ def values_at(*args)
 
     args.each do |elem|
       # Cannot use #[] because of subtly different errors
-      if Primitive.object_kind_of?(elem, Range)
+      if Primitive.is_a?(elem, Range)
         start, length = Primitive.range_normalized_start_length(elem, size)
         finish = start + length - 1
         next if start < 0
@@ -1351,7 +1351,7 @@ def values_at(*args)
 
   # Synchronize with Enumerator#zip and Enumerable#zip
   def zip(*others)
-    if !block_given? and others.size == 1 and Primitive.object_kind_of?(others[0], Array)
+    if !block_given? and others.size == 1 and Primitive.is_a?(others[0], Array)
       return Primitive.array_zip self, others[0]
     end
 
@@ -1619,7 +1619,7 @@ def slice!(start, length = undefined)
     Primitive.check_frozen self
 
     if Primitive.undefined? length
-      if Primitive.object_kind_of?(start, Range)
+      if Primitive.is_a?(start, Range)
         range = start
         out = self[range]
 

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.object_kind_of?(range, Range)
+      raise TypeError, "wrong argument type #{Primitive.object_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
@@ -96,7 +96,7 @@ def clamp(min, max = undefined)
 
   # A version of MRI's rb_cmpint (sort of)
   def self.compare_int(int)
-    return int if Primitive.object_kind_of?(int, Integer)
+    return int if Primitive.is_a?(int, Integer)
 
     return 1  if int > 0
     return -1 if int < 0