From 84d12df5691451e4f76cac92128ff8e9307f4cbf Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 25 Jul 2016 12:33:15 +0000
Subject: range.c: check_step_domain

* range.c (check_step_domain): check step argument domain by <=>
  method, instead of < and >.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  5 +++++
 range.c   | 39 ++++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16193fd16f..11e4246a59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 25 21:33:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (check_step_domain): check step argument domain by <=>
+	  method, instead of < and >.
+
 Mon Jul 25 21:11:32 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* doc/maintainers.rdoc: fix filenames.
diff --git a/range.c b/range.c
index ab3f1af9e2..1d0cc1b008 100644
--- a/range.c
+++ b/range.c
@@ -334,22 +334,31 @@ linear_object_p(VALUE obj)
 }
 
 static VALUE
-range_step_size(VALUE range, VALUE args, VALUE eobj)
+check_step_domain(VALUE step)
 {
-    VALUE b = RANGE_BEG(range), e = RANGE_END(range);
-    VALUE step = INT2FIX(1);
-    if (args) {
-	step = RARRAY_AREF(args, 0);
-	if (!rb_obj_is_kind_of(step, rb_cNumeric)) {
-	    step = rb_to_int(step);
-	}
+    VALUE zero = INT2FIX(0);
+    int cmp;
+    if (!rb_obj_is_kind_of(step, rb_cNumeric)) {
+	step = rb_to_int(step);
     }
-    if (rb_funcall(step, '<', 1, INT2FIX(0))) {
+    cmp = rb_cmpint(rb_funcallv(step, idCmp, 1, &zero), step, zero);
+    if (cmp < 0) {
 	rb_raise(rb_eArgError, "step can't be negative");
     }
-    else if (!rb_funcall(step, '>', 1, INT2FIX(0))) {
+    else if (cmp == 0) {
 	rb_raise(rb_eArgError, "step can't be 0");
     }
+    return step;
+}
+
+static VALUE
+range_step_size(VALUE range, VALUE args, VALUE eobj)
+{
+    VALUE b = RANGE_BEG(range), e = RANGE_END(range);
+    VALUE step = INT2FIX(1);
+    if (args) {
+	step = check_step_domain(RARRAY_AREF(args, 0));
+    }
 
     if (rb_obj_is_kind_of(b, rb_cNumeric) && rb_obj_is_kind_of(e, rb_cNumeric)) {
 	return ruby_num_interval_step_size(b, e, step, EXCL(range));
@@ -405,15 +414,7 @@ range_step(int argc, VALUE *argv, VALUE range)
     }
     else {
 	rb_scan_args(argc, argv, "01", &step);
-	if (!rb_obj_is_kind_of(step, rb_cNumeric)) {
-	    step = rb_to_int(step);
-	}
-	if (rb_funcall(step, '<', 1, INT2FIX(0))) {
-	    rb_raise(rb_eArgError, "step can't be negative");
-	}
-	else if (!rb_funcall(step, '>', 1, INT2FIX(0))) {
-	    rb_raise(rb_eArgError, "step can't be 0");
-	}
+	step = check_step_domain(step);
     }
 
     if (FIXNUM_P(b) && FIXNUM_P(e) && FIXNUM_P(step)) { /* fixnums are special */
-- 
cgit v1.2.3