summaryrefslogtreecommitdiff
path: root/range.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-01 14:35:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-01 14:35:13 +0000
commitc5b02391246bd9ed16b781252a3f8df17191181f (patch)
tree970319a6c50bb07effa0690d5957e651df3d6261 /range.c
parent0fc23bda529a9c8072eaee7db103f679aafa37b8 (diff)
* range.c (range_step): allow float step bigger than zero but less
than one. [ruby-dev:34557] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'range.c')
-rw-r--r--range.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/range.c b/range.c
index e94ee13599..2584e61720 100644
--- a/range.c
+++ b/range.c
@@ -314,16 +314,19 @@ range_step(argc, argv, range)
b = rb_ivar_get(range, id_beg);
e = rb_ivar_get(range, id_end);
- if (rb_scan_args(argc, argv, "01", &step) == 0) {
+ if (argc == 0) {
step = INT2FIX(1);
unit = 1;
}
- else if (FIXNUM_P(step)) {
- unit = NUM2LONG(step);
- }
else {
- VALUE tmp = rb_to_int(step);
- unit = rb_cmpint(tmp, step, INT2FIX(0));
+ rb_scan_args(argc, argv, "01", &step);
+ if (FIXNUM_P(step)) {
+ unit = NUM2LONG(step);
+ }
+ else {
+ VALUE tmp = rb_funcall(rb_funcall(b, '+', 1, step), '-', 1, b);
+ unit = rb_cmpint(tmp, step, INT2FIX(0));
+ }
}
if (unit < 0) {
rb_raise(rb_eArgError, "step can't be negative");