diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_float.rb | 2 | ||||
| -rw-r--r-- | util.c | 8 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Aug 23 02:23:05 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * util.c (ruby_strtod): make sure to have digit-sequence after 'p' + for hexadecimal-floating-constant. [ruby-dev:42105] + Mon Aug 23 00:23:07 2010 Tadayoshi Funaba <tadf@dotrb.org> * lib/date.rb, lib/date/format.rb: [ruby-core:31695] diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index a8ce76edbc..e534ab294f 100644 --- a/test/ruby/test_float.rb +++ b/test/ruby/test_float.rb @@ -446,6 +446,8 @@ class TestFloat < Test::Unit::TestCase assert_equal(1, suppress_warning {Float(([1] * 10000).join)}.infinite?) assert(!Float(([1] * 10000).join("_")).infinite?) # is it really OK? assert_raise(ArgumentError) { Float("1.0\x001") } + assert_equal(15.9375, Float('0xf.fp0')) + assert_raise(ArgumentError) { Float('0xf.fp') } assert_equal(1, suppress_warning {Float("1e10_00")}.infinite?) assert_raise(TypeError) { Float(nil) } o = Object.new @@ -2141,11 +2141,15 @@ break2: if (abs(dsign) == 1) s++; else dsign = 1; - for (nd = 0; (c = *s) >= '0' && c <= '9'; s++) { + nd = 0; + c = *s; + if (c < '0' || '9' < c) goto ret0; + do { nd *= 10; nd += c; nd -= '0'; - } + c = *++s; + } while ('0' <= c && c <= '9'); dval(rv) = ldexp(adj, nd * dsign); } else { |