diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:22:47 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:22:47 +0000 |
commit | dd463a9fe3ffed3a9e92c059de61d3b69bc71a5b (patch) | |
tree | c93ee93a343414378884a6ce63130983d75ecf2f | |
parent | 029392bc879f70e3820bf47ceceb7bf0c9082e69 (diff) |
merges r20348 from trunk into ruby_1_9_1.
* numeric.c (num_step): treat infinite step specially.
[ruby-dev:37157] fix: #781.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | numeric.c | 13 |
2 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Nov 25 03:26:04 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * numeric.c (num_step): treat infinite step specially. + [ruby-dev:37157] fix: #781. + Tue Nov 25 01:23:25 2008 Tadayoshi Funaba <tadf@dotrb.org> * lib/date/format.rb (strftime): ignores '_' flag for %[LN]. @@ -1503,10 +1503,15 @@ num_step(int argc, VALUE *argv, VALUE from) double err = (fabs(beg) + fabs(end) + fabs(end-beg)) / fabs(unit) * epsilon; long i; - if (err>0.5) err=0.5; - n = floor(n + err) + 1; - for (i=0; i<n; i++) { - rb_yield(DBL2NUM(i*unit+beg)); + if (isinf(unit)) { + if (unit > 0) rb_yield(DBL2NUM(beg)); + } + else { + if (err>0.5) err=0.5; + n = floor(n + err) + 1; + for (i=0; i<n; i++) { + rb_yield(DBL2NUM(i*unit+beg)); + } } } else { |