naruse	2010-05-19 18:22:59 +0900 (Wed, 19 May 2010)

  New Revision: 27890

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27890

  Log:
    * numeric.c (rb_num2ulong): use rb_big2ulong for data from
      Bignum. Without this 32bit integer on 32bit environment
      can't converted into long.
      This fixes 1) and 2) of [ruby-dev:41289]

  Modified files:
    trunk/ChangeLog
    trunk/numeric.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27889)
+++ ChangeLog	(revision 27890)
@@ -1,3 +1,10 @@
+Wed May 19 16:55:09 2010  NARUSE, Yui  <naruse@r...>
+
+	* numeric.c (rb_num2ulong): use rb_big2ulong for data from
+	  Bignum. Without this 32bit integer on 32bit environment
+	  can't converted into long.
+	  This fixes 1) and 2) of [ruby-dev:41289]
+
 Mon May 17 22:19:16 2010  Yusuke Endoh  <mame@t...>
 
 	* process.c: suppress warning for signed and unsigned type
Index: numeric.c
===================================================================
--- numeric.c	(revision 27889)
+++ numeric.c	(revision 27890)
@@ -1722,10 +1722,35 @@
 VALUE
 rb_num2ulong(VALUE val)
 {
-    if (TYPE(val) == T_BIGNUM) {
+  again:
+    if (NIL_P(val)) {
+       rb_raise(rb_eTypeError, "no implicit conversion from nil to integer");
+    }
+
+    if (FIXNUM_P(val)) return FIX2LONG(val); /* this is FIX2LONG, inteneded */
+
+    switch (TYPE(val)) {
+      case T_FLOAT:
+       if (RFLOAT_VALUE(val) <= (double)LONG_MAX
+           && RFLOAT_VALUE(val) >= (double)LONG_MIN) {
+           return (RFLOAT_VALUE(val));
+       }
+       else {
+           char buf[24];
+           char *s;
+
+           snprintf(buf, sizeof(buf), "%-.10g", RFLOAT_VALUE(val));
+           if ((s = strchr(buf, ' ')) != 0) *s = '\0';
+           rb_raise(rb_eRangeError, "float %s out of range of integer", buf);
+       }
+
+      case T_BIGNUM:
 	return rb_big2ulong(val);
+
+      default:
+       val = rb_to_int(val);
+       goto again;
     }
-    return (VALUE)rb_num2long(val);
 }
 
 #if SIZEOF_INT < SIZEOF_VALUE

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/