archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 43775:

Browse source 
* util.c (ruby_strtod): ignore too long fraction part, which does not
	  affect the result.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-11-22 04:00:39 +00:00
parent 7db42e86b2
commit 46cd2f463c
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Nov 22 12:46:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (ruby_strtod): ignore too long fraction part, which does not
affect the result.
Wed Nov 20 15:20:00 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> Wed Nov 20 15:20:00 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* test/ruby/test_thread.rb (test_mutex_unlock_on_trap): extend waiting * test/ruby/test_thread.rb (test_mutex_unlock_on_trap): extend waiting

6
test/ruby/test_float.rb
View file

@ -613,4 +613,10 @@ class TestFloat < Test::Unit::TestCase
# always not flonum # always not flonum
assert_raise(TypeError) { a = Float::INFINITY; def a.foo; end } assert_raise(TypeError) { a = Float::INFINITY; def a.foo; end }
end end
def test_long_string
assert_separately([], <<-'end;')
assert_in_epsilon(10.0, ("1."+"1"*300000).to_f*9)
end;
end
end end

14
util.c
View file

@ -715,6 +715,11 @@ extern void *MALLOC(size_t);
#else #else
#define MALLOC malloc #define MALLOC malloc
#endif #endif
#ifdef FREE
extern void FREE(void*);
#else
#define FREE free
#endif
#ifndef Omit_Private_Memory #ifndef Omit_Private_Memory
#ifndef PRIVATE_MEM #ifndef PRIVATE_MEM
@ -1005,7 +1010,7 @@ Balloc(int k)
#endif #endif
ACQUIRE_DTOA_LOCK(0); ACQUIRE_DTOA_LOCK(0);
if ((rv = freelist[k]) != 0) { if (k <= Kmax && (rv = freelist[k]) != 0) {
freelist[k] = rv->next; freelist[k] = rv->next;
} }
else { else {
@ -1015,7 +1020,7 @@ Balloc(int k)
#else #else
len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1) len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
/sizeof(double); /sizeof(double);
if (pmem_next - private_mem + len <= PRIVATE_mem) { if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) {
rv = (Bigint*)pmem_next; rv = (Bigint*)pmem_next;
pmem_next += len; pmem_next += len;
} }
@ -1034,6 +1039,10 @@ static void
Bfree(Bigint *v) Bfree(Bigint *v)
{ {
if (v) { if (v) {
if (v->k > Kmax) {
FREE(v);
return;
}
ACQUIRE_DTOA_LOCK(0); ACQUIRE_DTOA_LOCK(0);
v->next = freelist[v->k]; v->next = freelist[v->k];
freelist[v->k] = v; freelist[v->k] = v;
@ -2097,6 +2106,7 @@ break2:
for (; c >= '0' && c <= '9'; c = *++s) { for (; c >= '0' && c <= '9'; c = *++s) {
have_dig: have_dig:
nz++; nz++;
if (nf > DBL_DIG * 2) continue;
if (c -= '0') { if (c -= '0') {
nf += nz; nf += nz;
for (i = 1; i < nz; i++) for (i = 1; i < nz; i++)

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-11-21" #define RUBY_RELEASE_DATE "2013-11-22"
#define RUBY_PATCHLEVEL 351 #define RUBY_PATCHLEVEL 352
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 11 #define RUBY_RELEASE_MONTH 11
#define RUBY_RELEASE_DAY 21 #define RUBY_RELEASE_DAY 22
#include "ruby/version.h" #include "ruby/version.h"