tadf	2012-11-17 23:57:22 +0900 (Sat, 17 Nov 2012)

  New Revision: 37701

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

  Log:
    * complex.c (make_patterns): should not accept extra sign.

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

Index: complex.c
===================================================================
--- complex.c	(revision 37700)
+++ complex.c	(revision 37701)
@@ -1506,7 +1506,7 @@
 #define NUMBER "[-+]?" NUMERATOR "(?:\\/" DENOMINATOR ")?"
 #define NUMBERNOS NUMERATOR "(?:\\/" DENOMINATOR ")?"
 #define PATTERN0 "\\A" WS "(" NUMBER ")@(" NUMBER ")" WS
-#define PATTERN1 "\\A" WS "([-+])?(" NUMBER ")?[iIjJ]" WS
+#define PATTERN1 "\\A" WS "([-+])?(" NUMBERNOS ")?[iIjJ]" WS
 #define PATTERN2 "\\A" WS "(" NUMBER ")(([-+])(" NUMBERNOS ")?[iIjJ])?" WS
 
 static void
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37700)
+++ ChangeLog	(revision 37701)
@@ -1,3 +1,7 @@
+Sat Nov 17 23:53:05 2012  Tadayoshi Funaba  <tadf@d...>
+
+	* complex.c (make_patterns): should not accept extra sign.
+
 Sat Nov 17 21:45:12  Luis Lavena  <luislavena@g...>
 
 	* win32/file.c (replace_to_long_name): skip expansion for all wildcard
Index: test/ruby/test_complex.rb
===================================================================
--- test/ruby/test_complex.rb	(revision 37700)
+++ test/ruby/test_complex.rb	(revision 37701)
@@ -1154,6 +1154,7 @@
     assert_equal('-1.0-0.0i', Complex(-1.0, -0.0).to_s)
     assert_in_delta(Math::PI, Complex(-0.0).arg, 0.001)
     assert_equal(Complex(2e3, 2e4), '2e3+2e4i'.to_c)
+    assert_raise(ArgumentError){ Complex('--8i')}
   end
 
   def test_known_bug

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