Permalink
Browse files

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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@17989 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 6af1068 commit 205150bbdf4f1ed1e63fb1d0ec93b59eba3b814e @shyouhei shyouhei committed Jul 10, 2008
Showing with 47 additions and 5 deletions.
  1. +8 −0 ChangeLog
  2. +1 −1 ruby.h
  3. +34 −0 test/ruby/test_float.rb
  4. +4 −4 version.h
View
@@ -1,3 +1,11 @@
+Thu Jul 10 13:53:08 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:21:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/net/smtp.rb (Net::SMTP::start): use 'localhost' instead of
View
2 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))
View
@@ -110,4 +110,38 @@ def test_remainder
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
View
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-07-07"
+#define RUBY_RELEASE_DATE "2008-07-10"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080707
-#define RUBY_PATCHLEVEL 50
+#define RUBY_RELEASE_CODE 20080710
+#define RUBY_PATCHLEVEL 51
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#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[];

0 comments on commit 205150b

Please sign in to comment.