[GR-20446] Update Kernel#Integer parameter conversion.

PullRequest: truffleruby/1269

Author: bjfish

CHANGELOG.md

@@ -72,6 +72,7 @@ Bug fixes:
 * Fixed character length after conversion to binary from a non-US-ASCII String.
 * Fixed issue with installing latest bundler (#1880).
 * Fixed type conversion for `Numeric#step` `step` parameter.
+* Fixed `Kernel#Integer` conversion.
 
 Compatibility:
 

lib/truffle/truffle/cext.rb

@@ -781,7 +781,7 @@ def rb_intern(str)
   end
 
   def rb_cstr_to_inum(string, base, raise)
-    TrufflePrimitive.string_to_inum string, base, raise != 0
+    TrufflePrimitive.string_to_inum string, base, raise != 0, true
   end
 
   def rb_cstr_to_dbl(string, badcheck)

spec/tags/core/kernel/Integer_tags.txt

@@ -4675,7 +4675,7 @@ protected boolean indexAtEitherBounds(DynamicObject string, int index) {
     public static abstract class StringToInumPrimitiveNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization
-        protected Object stringToInum(DynamicObject string, int fixBase, boolean strict,
+        protected Object stringToInum(DynamicObject string, int fixBase, boolean strict, boolean raiseOnError,
                 @Cached("new()") FixnumOrBignumNode fixnumOrBignumNode,
                 @Cached RopeNodes.BytesNode bytesNode,
                 @Cached BranchProfile exceptionProfile) {
@@ -4690,6 +4690,9 @@ protected Object stringToInum(DynamicObject string, int fixBase, boolean strict,
                         strict);
             } catch (RaiseException e) {
                 exceptionProfile.enter();
+                if (!raiseOnError) {
+                    return nil();
+                }
                 throw e;
             }
         }

src/main/java/org/truffleruby/core/string/StringNodes.java

@@ -88,44 +88,49 @@ def Hash(obj)
   end
   module_function :Hash
 
-  def Integer(obj, base=nil)
+  def Integer(obj, base=0, exception: true)
     obj = Truffle::Interop.unbox_if_needed(obj)
+    converted_base = Truffle::Type.rb_check_to_integer(base, :to_int)
+    base = converted_base.nil? ? 0 : converted_base
+    raise_exception = !exception.equal?(false)
 
-    if obj.kind_of? String
-      if obj.empty?
-        raise ArgumentError, 'invalid value for Integer: (empty string)'
-      else
-        base ||= 0
-        return TrufflePrimitive.string_to_inum(obj, base, true)
-      end
-    end
-
-    if base
-      raise ArgumentError, 'base is only valid for String values'
-    end
-
-    case obj
-    when Integer
-      obj
-    when Float
-      if obj.nan? or obj.infinite?
-        raise FloatDomainError, "unable to coerce #{obj} to Integer"
-      else
-        obj.to_int
-      end
-    when NilClass
-      raise TypeError, "can't convert nil into Integer"
+    if String === obj
+      TrufflePrimitive.string_to_inum(obj, base, true, !exception.equal?(false))
     else
-      # Can't use coerce_to or try_convert because I think there is an
-      # MRI bug here where it will return the value without checking
-      # the return type.
-      if obj.respond_to? :to_int
-        if val = obj.to_int
-          return val
+      bad_base_check = Proc.new do
+        if base != 0
+          return nil unless raise_exception
+          raise ArgumentError, 'base is only valid for String values'
         end
       end
+      case obj
+      when Integer
+        bad_base_check.call
+        obj
+      when Float
+        bad_base_check.call
+        if obj.nan? or obj.infinite?
+          return nil unless raise_exception
+        end
+        # TODO BJF 14-Jan-2020 Add fixable conversion logic
+        obj.to_int
+      when NilClass
+        bad_base_check.call
+        return nil unless raise_exception
+        raise TypeError, "can't convert nil into Integer"
+      else
+        if base != 0
+          converted_to_str_obj = Truffle::Type.rb_check_convert_type(obj, String, :to_str)
+          return TrufflePrimitive.string_to_inum(converted_to_str_obj, base, true, raise_exception) unless converted_to_str_obj.nil?
+          return nil unless raise_exception
+          raise ArgumentError, 'base is only valid for String values'
+        end
+        converted_to_int_obj = Truffle::Type.rb_check_to_integer(obj, :to_int)
+        return converted_to_int_obj unless converted_to_int_obj.nil?
 
-      Truffle::Type.coerce_to obj, Integer, :to_i
+        return Truffle::Type.rb_check_to_integer(obj, :to_i) unless raise_exception
+        Truffle::Type.rb_convert_type(obj, Integer, :to_i)
+      end
     end
   end
   module_function :Integer

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

@@ -157,7 +157,7 @@ def lstrip
   end
 
   def oct
-    TrufflePrimitive.string_to_inum(self, -8, false)
+    TrufflePrimitive.string_to_inum(self, -8, false, true)
   end
 
   # Treats leading characters from <i>self</i> as a string of hexadecimal digits
@@ -169,7 +169,7 @@ def oct
   #    "0".hex        #=> 0
   #    "wombat".hex   #=> 0
   def hex
-    TrufflePrimitive.string_to_inum(self, 16, false)
+    TrufflePrimitive.string_to_inum(self, 16, false, true)
   end
 
   def reverse
@@ -307,7 +307,7 @@ def to_i(base=10)
       raise ArgumentError, "illegal radix #{base}"
     end
 
-    TrufflePrimitive.string_to_inum(self, base, false)
+    TrufflePrimitive.string_to_inum(self, base, false, true)
   end
 
   def tr(source, replacement)
@@ -696,8 +696,8 @@ def upto(stop, exclusive=false)
 
         begin
           # If both the start and end values are strings representing integer values, the encoding must be US-ASCII.
-          TrufflePrimitive.string_to_inum(self, 10, true)
-          TrufflePrimitive.string_to_inum(stop, 10, true)
+          TrufflePrimitive.string_to_inum(self, 10, true, true)
+          TrufflePrimitive.string_to_inum(stop, 10, true, true)
           enc = Encoding::US_ASCII
         rescue ArgumentError
           enc = self.encoding