mrkn	2011-05-09 13:52:57 +0900 (Mon, 09 May 2011)

  New Revision: 31492

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

  Log:
    * complex.c (string_to_c_internal): support scientific notation.
      patched by Tinco Andringa. https://github.com/ruby/ruby/pull/16
      [ruby-core:36046][Bug #4655]

  Modified files:
    trunk/ChangeLog
    trunk/complex.c
    trunk/test/ruby/test_complex.rb

Index: complex.c
===================================================================
--- complex.c	(revision 31491)
+++ complex.c	(revision 31492)
@@ -1498,6 +1498,7 @@
 	    m = f_match(comp_pat2, s);
 	    if (NIL_P(m))
 		return rb_assoc_new(Qnil, self);
+	    /* string is of form "x+yi" */
 	    sr = f_aref(m, INT2FIX(1));
 	    if (NIL_P(f_aref(m, INT2FIX(2))))
 		si = Qnil;
@@ -1518,7 +1519,7 @@
 	if (!NIL_P(sr)) {
 	    if (strchr(RSTRING_PTR(sr), '/'))
 		r = f_to_r(sr);
-	    else if (strchr(RSTRING_PTR(sr), '.'))
+	    else if (strchr(RSTRING_PTR(sr), '.') || strchr(RSTRING_PTR(sr), 'e') || strchr(RSTRING_PTR(sr), 'E'))
 		r = f_to_f(sr);
 	    else
 		r = f_to_i(sr);
@@ -1526,7 +1527,7 @@
 	if (!NIL_P(si)) {
 	    if (strchr(RSTRING_PTR(si), '/'))
 		i = f_to_r(si);
-	    else if (strchr(RSTRING_PTR(si), '.'))
+	    else if (strchr(RSTRING_PTR(si), '.') || strchr(RSTRING_PTR(si), 'e') || strchr(RSTRING_PTR(si), 'E'))
 		i = f_to_f(si);
 	    else
 		i = f_to_i(si);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31491)
+++ ChangeLog	(revision 31492)
@@ -1,3 +1,9 @@
+Mon May  9 13:49:00 2011  Kenta Murata  <mrkn@m...>
+
+	* complex.c (string_to_c_internal): support scientific notation.
+	  patched by Tinco Andringa. https://github.com/ruby/ruby/pull/16
+	  [ruby-core:36046][Bug #4655]
+
 Mon May  9 11:52:48 2011  NARUSE, Yui  <naruse@r...>
 
 	* numeric.c (int_ord): remove K&R style.
Index: test/ruby/test_complex.rb
===================================================================
--- test/ruby/test_complex.rb	(revision 31491)
+++ test/ruby/test_complex.rb	(revision 31492)
@@ -704,6 +704,10 @@
     assert_equal(Complex(-0.33), '-0.33'.to_c)
     assert_equal(Complex(-0.33), '-0.3_3'.to_c)
 
+    assert_equal(Complex(2, 2e4), '2+2e4i'.to_c)
+    assert_equal(Complex(2e3, 2), '2e3+2i'.to_c)
+    assert_equal(Complex(2e3, 2e4), '2e3+2e4i'.to_c)
+
     assert_equal(Complex.polar(10,10), '10@10'.to_c)
     assert_equal(Complex.polar(-10,-10), '-10@-10'.to_c)
     assert_equal(Complex.polar(10.5,10.5), '10.5@1...'.to_c)

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