nobu	2009-09-22 04:47:39 +0900 (Tue, 22 Sep 2009)

  New Revision: 25025

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

  Log:
    * ext/bigdecimal/bigdecimal.c (GetVpValue): support conversion from
      Rational.  [ruby-core:25697]

  Modified files:
    trunk/ChangeLog
    trunk/ext/bigdecimal/bigdecimal.c
    trunk/test/bigdecimal/test_bigdecimal.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25024)
+++ ChangeLog	(revision 25025)
@@ -1,3 +1,8 @@
+Tue Sep 22 04:47:37 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/bigdecimal/bigdecimal.c (GetVpValue): support conversion from
+	  Rational.  [ruby-core:25697]
+
 Tue Sep 22 04:43:42 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* Makefile.in, win32/Makefile.sub (INSNS): depend on tools.
Index: ext/bigdecimal/bigdecimal.c
===================================================================
--- ext/bigdecimal/bigdecimal.c	(revision 25024)
+++ ext/bigdecimal/bigdecimal.c	(revision 25025)
@@ -239,9 +239,24 @@
     Real *pv;
     VALUE bg;
     char szD[128];
+    VALUE orig = Qundef;
+    int util_loaded = 0;
 
+again:
     switch(TYPE(v))
     {
+    case T_RATIONAL:
+        if(orig == Qundef ? (orig = v, 1) : orig != v) {
+            if(!util_loaded) {
+                rb_require("bigdecimal/util");
+                util_loaded = 1;
+            }
+            v = rb_funcall2(v, rb_intern("to_d"), 0, 0);
+            goto again;
+        }
+        v = orig;
+        goto SomeOneMayDoIt;
+
     case T_DATA:
         if(rb_typeddata_is_kind_of(v, &BigDecimal_data_type)) {
             pv = DATA_PTR(v);
Index: test/bigdecimal/test_bigdecimal.rb
===================================================================
--- test/bigdecimal/test_bigdecimal.rb	(revision 25024)
+++ test/bigdecimal/test_bigdecimal.rb	(revision 25025)
@@ -691,4 +691,8 @@
     assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, BigDecimal.new("1E-1" + "0" * 10000).sign)
     assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, BigDecimal.new("-1E-1" + "0" * 10000).sign)
   end
+
+  def test_coerce
+    assert_equal(2, 1 + BigDecimal.new("1"), '[ruby-core:25697]')
+  end
 end

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