[GR-18163] Rename primitive predicate methods and add terminating ?

PullRequest: truffleruby/4301

Author: andrykonchin

doc/contributor/how-to-guide.md

@@ -1011,8 +1011,8 @@ Use `Truffle::Debug.primitive_names` method:
 ```
 jt -q ruby -e 'puts Truffle::Debug.primitive_names.sort'
 ...
-array_eql
-array_equal
+array_eql?
+array_equal?
 array_flatten_helper
 array_inject
 ...

spec/truffle/interop/fixtures/classes.rb

@@ -152,7 +152,7 @@ def polyglot_array_element_modifiable?(index)
 
     def polyglot_array_element_insertable?(index)
       @log << [__callee__, index]
-      index >= @storage.size && Primitive.integer_fits_into_int(index)
+      index >= @storage.size && Primitive.integer_fits_into_int?(index)
     end
 
     def polyglot_array_element_removable?(index)

src/main/java/org/truffleruby/core/VMPrimitiveNodes.java

@@ -161,7 +161,7 @@ Object vmExtendedModules(Object object, RubyProc block,
 
     }
 
-    @Primitive(name = "vm_method_is_basic")
+    @Primitive(name = "vm_method_is_basic?")
     public abstract static class VMMethodIsBasicNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization

src/main/java/org/truffleruby/core/array/ArrayNodes.java

@@ -831,7 +831,7 @@ public void accept(Node node, CallBlockNode yieldNode, RubyArray array, Object s
 
     }
 
-    @Primitive(name = "array_equal")
+    @Primitive(name = "array_equal?")
     @ImportStatic(ArrayGuards.class)
     public abstract static class EqualNode extends PrimitiveArrayArgumentsNode {
 
@@ -904,7 +904,7 @@ Object equalNotArray(RubyArray a, Object b) {
 
     }
 
-    @Primitive(name = "array_eql")
+    @Primitive(name = "array_eql?")
     @ImportStatic(ArrayGuards.class)
     public abstract static class EqlNode extends PrimitiveArrayArgumentsNode {
 

src/main/java/org/truffleruby/core/encoding/EncodingNodes.java

@@ -521,7 +521,7 @@ RubyEncoding defineAlias(RubyEncoding encoding, RubySymbol aliasName) {
         }
     }
 
-    @Primitive(name = "encoding_is_unicode")
+    @Primitive(name = "encoding_is_unicode?")
     public abstract static class IsUnicodeNode extends PrimitiveArrayArgumentsNode {
         @Specialization
         boolean isUnicode(RubyEncoding encoding) {

src/main/java/org/truffleruby/core/numeric/IntegerNodes.java

@@ -1614,7 +1614,7 @@ boolean other(Object a) {
         }
     }
 
-    @Primitive(name = "integer_fits_into_int")
+    @Primitive(name = "integer_fits_into_int?")
     public abstract static class FixnumFitsIntoIntNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization
@@ -1634,7 +1634,7 @@ boolean fitsIntoIntBignum(RubyBignum a) {
 
     }
 
-    @Primitive(name = "integer_fits_into_uint")
+    @Primitive(name = "integer_fits_into_uint?")
     public abstract static class IntegerFitsIntoUIntNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization
@@ -1654,7 +1654,7 @@ boolean fitsIntoUIntBignum(RubyBignum a) {
 
     }
 
-    @Primitive(name = "integer_fits_into_long")
+    @Primitive(name = "integer_fits_into_long?")
     public abstract static class IntegerFitsIntoLongNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization
@@ -1674,7 +1674,7 @@ boolean fitsIntoLongBignum(RubyBignum a) {
 
     }
 
-    @Primitive(name = "integer_fits_into_ulong")
+    @Primitive(name = "integer_fits_into_ulong?")
     public abstract static class IntegerFitsIntoULongNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization

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

@@ -120,7 +120,7 @@ def *(count)
   end
 
   def ==(other)
-    result = Primitive.array_equal self, other
+    result = Primitive.array_equal? self, other
     unless Primitive.undefined?(result)
       return result
     end
@@ -376,7 +376,7 @@ def each_index
   end
 
   def eql?(other)
-    result = Primitive.array_eql self, other
+    result = Primitive.array_eql? self, other
     unless Primitive.undefined?(result)
       return result
     end
@@ -844,7 +844,7 @@ def product(*args)
     # Check the result size will fit in an Array.
     sum = args.inject(size) { |n, x| n * x.size }
 
-    unless Primitive.integer_fits_into_long(sum)
+    unless Primitive.integer_fits_into_long?(sum)
       raise RangeError, 'product result is too large'
     end
 

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

@@ -136,7 +136,7 @@ def pow(e, m = undefined)
     raise TypeError, '2nd argument not allowed unless all arguments are integers' unless Primitive.is_a?(m, Integer)
     raise RangeError, '1st argument cannot be negative when 2nd argument specified' if e.negative?
 
-    if Primitive.integer_fits_into_long(m)
+    if Primitive.integer_fits_into_long?(m)
       Truffle::IntegerOperations.modular_exponentiation(self, e, m)
     else
       Primitive.mod_pow(self, e, m)
@@ -165,15 +165,15 @@ def truncate(precision = 0)
 
   def chr(enc = undefined)
     if self < 0 || (self & 0xffff_ffff) != self
-      subject = Primitive.integer_fits_into_int(self) ? self : 'bignum'
+      subject = Primitive.integer_fits_into_int?(self) ? self : 'bignum'
       raise RangeError, "#{subject} out of char range"
     end
 
     if Primitive.undefined? enc
       if 0xff < self
         enc = Encoding.default_internal
         if Primitive.nil? enc
-          subject = Primitive.integer_fits_into_int(self) ? self : 'bignum'
+          subject = Primitive.integer_fits_into_int?(self) ? self : 'bignum'
           raise RangeError, "#{subject} out of char range"
         end
       elsif self < 0x80

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

@@ -63,7 +63,7 @@ def byteslice(index_or_range, length = undefined)
         return if length < 0
       end
 
-      length = bytesize unless Primitive.integer_fits_into_int(index)
+      length = bytesize unless Primitive.integer_fits_into_int?(index)
       return if index < 0 or index > bytesize
     end
 
@@ -431,7 +431,7 @@ def encode!(to = undefined, from = undefined, **options)
 
     case options[:invalid]
     when :replace
-      replacement = options[:replace] || (Primitive.encoding_is_unicode(from_enc) ? "\ufffd" : '?')
+      replacement = options[:replace] || (Primitive.encoding_is_unicode?(from_enc) ? "\ufffd" : '?')
       self.scrub!(replacement)
     end
     case xml = options[:xml]
@@ -486,13 +486,13 @@ def inspect
 
     enc = encoding
     ascii = enc.ascii_compatible?
-    unicode = Primitive.encoding_is_unicode enc
+    unicode = Primitive.encoding_is_unicode? enc
 
     actual_encoding = Primitive.get_actual_encoding(self)
     if actual_encoding != enc
       enc = actual_encoding
       if unicode
-        unicode = Primitive.encoding_is_unicode enc
+        unicode = Primitive.encoding_is_unicode? enc
       end
     end
 

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

@@ -64,7 +64,7 @@ module Truffle
   module Type
     def self.object_respond_to_no_built_in?(obj, name, include_private = false)
       meth = Primitive.vm_method_lookup obj, name
-      !Primitive.nil?(meth) && !Primitive.vm_method_is_basic(meth)
+      !Primitive.nil?(meth) && !Primitive.vm_method_is_basic?(meth)
     end
 
     def self.check_funcall_callable(obj, name)
@@ -123,7 +123,7 @@ def self.rb_num2ulong(val)
       raise TypeError, 'no implicit conversion from nil to integer' if Primitive.nil? val
 
       if Primitive.is_a?(val, Integer)
-        if Primitive.integer_fits_into_long(val)
+        if Primitive.integer_fits_into_long?(val)
           val
         else
           rb_big2ulong(val)
@@ -192,21 +192,21 @@ def self.conversion_mismatch(obj, cls, meth, res)
     end
 
     def self.fits_into_int?(val)
-      Primitive.is_a?(val, Integer) && Primitive.integer_fits_into_int(val)
+      Primitive.is_a?(val, Integer) && Primitive.integer_fits_into_int?(val)
     end
 
     def self.fits_into_long?(val)
-      Primitive.is_a?(val, Integer) && Primitive.integer_fits_into_long(val)
+      Primitive.is_a?(val, Integer) && Primitive.integer_fits_into_long?(val)
     end
 
     def self.check_uint(val)
-      unless Primitive.integer_fits_into_uint(val)
+      unless Primitive.integer_fits_into_uint?(val)
         raise RangeError, "integer #{val} too #{val < 0 ? 'small' : 'big'} to convert to `uint'"
       end
     end
 
     def self.check_ulong(val)
-      unless Primitive.integer_fits_into_ulong(val)
+      unless Primitive.integer_fits_into_ulong?(val)
         raise RangeError, "integer #{val} too #{val < 0 ? 'small' : 'big'} to convert to `ulong'"
       end
     end