summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-10 04:52:35 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-10 04:52:35 +0000
commitd83a42aac2319b70a4e9a163dd619aca085ec1c4 (patch)
treed379f9d206970c8805303f26853bd3540062e1a8
parent7696697469d974ee602b4d61dbb9a0b6c936a736 (diff)
merge revision(s) 17842:
* include/ruby/ruby.h (POSFIXABLE): use FIXNUM_MAX+1 instead of FIXNUM_MAX to make it possible to convert to double accurately. It assumes FLT_RADIX is 2. fix RubyForge bug #14102. backported from 1.9. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--ruby.h2
-rw-r--r--test/ruby/test_float.rb34
-rw-r--r--version.h8
4 files changed, 47 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 217069d7d7..ed2d050585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul 10 13:51:03 2008 Tanaka Akira <akr@fsij.org>
+
+ * include/ruby/ruby.h (POSFIXABLE): use FIXNUM_MAX+1 instead of
+ FIXNUM_MAX to make it possible to convert to double accurately.
+ It assumes FLT_RADIX is 2.
+ fix RubyForge bug #14102.
+ backported from 1.9.
+
Mon Jul 7 16:14:05 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/net/smtp.rb (Net::SMTP::start): use 'localhost' instead of
diff --git a/ruby.h b/ruby.h
index 40c95f2050..2701f0dc77 100644
--- a/ruby.h
+++ b/ruby.h
@@ -166,7 +166,7 @@ VALUE rb_ull2inum _((unsigned LONG_LONG));
#define FIX2LONG(x) RSHIFT((long)x,1)
#define FIX2ULONG(x) (((unsigned long)(x))>>1)
#define FIXNUM_P(f) (((long)(f))&FIXNUM_FLAG)
-#define POSFIXABLE(f) ((f) <= FIXNUM_MAX)
+#define POSFIXABLE(f) ((f) < FIXNUM_MAX+1)
#define NEGFIXABLE(f) ((f) >= FIXNUM_MIN)
#define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))
diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb
index d559ce5cab..cbc6a7886b 100644
--- a/test/ruby/test_float.rb
+++ b/test/ruby/test_float.rb
@@ -110,4 +110,38 @@ class TestFloat < Test::Unit::TestCase
assert_equal(-3.5, (-11.5).remainder(4))
assert_equal(-3.5, (-11.5).remainder(-4))
end
+
+ def test_to_i
+ assert_operator(4611686018427387905.0.to_i, :>, 0)
+ assert_operator(4611686018427387904.0.to_i, :>, 0)
+ assert_operator(4611686018427387903.8.to_i, :>, 0)
+ assert_operator(4611686018427387903.5.to_i, :>, 0)
+ assert_operator(4611686018427387903.2.to_i, :>, 0)
+ assert_operator(4611686018427387903.0.to_i, :>, 0)
+ assert_operator(4611686018427387902.0.to_i, :>, 0)
+
+ assert_operator(1073741825.0.to_i, :>, 0)
+ assert_operator(1073741824.0.to_i, :>, 0)
+ assert_operator(1073741823.8.to_i, :>, 0)
+ assert_operator(1073741823.5.to_i, :>, 0)
+ assert_operator(1073741823.2.to_i, :>, 0)
+ assert_operator(1073741823.0.to_i, :>, 0)
+ assert_operator(1073741822.0.to_i, :>, 0)
+
+ assert_operator((-1073741823.0).to_i, :<, 0)
+ assert_operator((-1073741824.0).to_i, :<, 0)
+ assert_operator((-1073741824.2).to_i, :<, 0)
+ assert_operator((-1073741824.5).to_i, :<, 0)
+ assert_operator((-1073741824.8).to_i, :<, 0)
+ assert_operator((-1073741825.0).to_i, :<, 0)
+ assert_operator((-1073741826.0).to_i, :<, 0)
+
+ assert_operator((-4611686018427387903.0).to_i, :<, 0)
+ assert_operator((-4611686018427387904.0).to_i, :<, 0)
+ assert_operator((-4611686018427387904.2).to_i, :<, 0)
+ assert_operator((-4611686018427387904.5).to_i, :<, 0)
+ assert_operator((-4611686018427387904.8).to_i, :<, 0)
+ assert_operator((-4611686018427387905.0).to_i, :<, 0)
+ assert_operator((-4611686018427387906.0).to_i, :<, 0)
+ end
end
diff --git a/version.h b/version.h
index 08e8341fd5..d5897e63b0 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-07-07"
+#define RUBY_RELEASE_DATE "2008-07-10"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080707
-#define RUBY_PATCHLEVEL 269
+#define RUBY_RELEASE_CODE 20080710
+#define RUBY_PATCHLEVEL 270
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 10
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];