[GR-20446] Fix Numeric#step step argument conversion.

PullRequest: truffleruby/1268

Author: bjfish

CHANGELOG.md

@@ -71,6 +71,7 @@ Bug fixes:
 * Fixed argument handling in `Kernel.printf`.
 * 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.
 
 Compatibility:
 

spec/tags/core/numeric/step_tags.txt

@@ -1,37 +1,13 @@
-fails:Numeric#step with positional args when step is a String with self and stop as Fixnums raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with positional args when step is a String with self and stop as Fixnums raises an ArgumentError with step as an alphanumeric string
-fails:Numeric#step with positional args when step is a String with self and stop as Floats raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with positional args when step is a String with self and stop as Floats raises an ArgumentError with step as an alphanumeric string
-fails:Numeric#step with keyword arguments when step is a String with self and stop as Fixnums raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with keyword arguments when step is a String with self and stop as Fixnums raises an ArgumentError with step as an alphanumeric string
-fails:Numeric#step with keyword arguments when step is a String with self and stop as Floats raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with keyword arguments when step is a String with self and stop as Floats raises an ArgumentError with step as an alphanumeric string
-fails:Numeric#step with mixed arguments when step is a String with self and stop as Fixnums raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with mixed arguments when step is a String with self and stop as Fixnums raises an ArgumentError with step as an alphanumeric string
-fails:Numeric#step with mixed arguments when step is a String with self and stop as Floats raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with mixed arguments when step is a String with self and stop as Floats raises an ArgumentError with step as an alphanumeric string
 fails:Numeric#step with positional args when no block is given returns an Enumerator::ArithmeticSequence when step is 0
 fails:Numeric#step with positional args when no block is given returns an Enumerator::ArithmeticSequence when not passed a block and self > stop
 fails:Numeric#step with positional args when no block is given returns an Enumerator::ArithmeticSequence when not passed a block and self < stop
-fails:Numeric#step with positional args when no block is given returned Enumerator size when step is a String with self and stop as Fixnums raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with positional args when no block is given returned Enumerator size when step is a String with self and stop as Fixnums raises an ArgumentError with step as an alphanumeric string
-fails:Numeric#step with positional args when no block is given returned Enumerator size when step is a String with self and stop as Floats raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with positional args when no block is given returned Enumerator size when step is a String with self and stop as Floats raises an ArgumentError with step as an alphanumeric string
 fails:Numeric#step with positional args when no block is given returns an Enumerator::ArithmeticSequence when step is 0.0
 fails:Numeric#step with positional args when no block is given returned Enumerator::ArithmeticSequence size is infinity when step is 0
 fails:Numeric#step with positional args when no block is given returned Enumerator::ArithmeticSequence size is infinity when step is 0.0
 fails:Numeric#step with positional args when no block is given returned Enumerator::ArithmeticSequence type returns an instance of Enumerator::ArithmeticSequence
 fails:Numeric#step with keyword arguments when no block is given returns an Enumerator::ArithmeticSequence when step is 0
 fails:Numeric#step with keyword arguments when no block is given returns an Enumerator::ArithmeticSequence when not passed a block and self > stop
 fails:Numeric#step with keyword arguments when no block is given returns an Enumerator::ArithmeticSequence when not passed a block and self < stop
-fails:Numeric#step with keyword arguments when no block is given returned Enumerator size when step is a String with self and stop as Fixnums raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with keyword arguments when no block is given returned Enumerator size when step is a String with self and stop as Fixnums raises an ArgumentError with step as an alphanumeric string
-fails:Numeric#step with keyword arguments when no block is given returned Enumerator size when step is a String with self and stop as Floats raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with keyword arguments when no block is given returned Enumerator size when step is a String with self and stop as Floats raises an ArgumentError with step as an alphanumeric string
 fails:Numeric#step with mixed arguments when no block is given returns an Enumerator::ArithmeticSequence when step is 0
 fails:Numeric#step with mixed arguments when no block is given returns an Enumerator::ArithmeticSequence when not passed a block and self > stop
 fails:Numeric#step with mixed arguments when no block is given returns an Enumerator::ArithmeticSequence when not passed a block and self < stop
-fails:Numeric#step with mixed arguments when no block is given returned Enumerator size when step is a String with self and stop as Fixnums raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with mixed arguments when no block is given returned Enumerator size when step is a String with self and stop as Fixnums raises an ArgumentError with step as an alphanumeric string
-fails:Numeric#step with mixed arguments when no block is given returned Enumerator size when step is a String with self and stop as Floats raises an ArgumentError when step is a numeric representation
-fails:Numeric#step with mixed arguments when no block is given returned Enumerator size when step is a String with self and stop as Floats raises an ArgumentError with step as an alphanumeric string

src/main/ruby/truffleruby/core/truffle/numeric_operations.rb

@@ -110,7 +110,12 @@ def self.step_fetch_args(value, limit, step, uses_kwargs)
         raise ArgumentError, "step can't be 0" if step == 0
       end
 
-      step = Truffle::Type.coerce_to_int(step) unless Numeric === step
+      unless Numeric === step
+        coerced = Truffle::Type.check_funcall(step, :>, [0])
+        raise TypeError, "0 can't be coerced into #{Truffle::Type.object_class(step)}" if TrufflePrimitive.undefined?(coerced)
+        step = coerced
+      end
+
       desc = step < 0
       default_limit = desc ? -Float::INFINITY : Float::INFINITY
 

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

@@ -303,7 +303,7 @@ def self.check_funcall(recv, meth, args = [])
     def self.check_funcall_default(recv, meth, args, default)
       if Truffle::Interop.foreign?(recv)
         if recv.respond_to?(meth)
-          return recv.__send__(meth)
+          return recv.__send__(meth, *args)
         else
           return default
         end
@@ -313,7 +313,7 @@ def self.check_funcall_default(recv, meth, args, default)
       unless check_funcall_callable(recv, meth)
         return check_funcall_missing(recv, meth, args, respond, default, true);
       end
-      recv.__send__(meth)
+      recv.__send__(meth, *args)
     end
 
     def self.check_funcall_respond_to(obj, meth, priv)