yugui	2010-09-29 21:25:44 +0900 (Wed, 29 Sep 2010)

  New Revision: 29373

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

  Log:
    merges r29073 from trunk into ruby_1_9_2.
    --
    * util.c (ruby_strtod): make sure to have digit-sequence after 'p'
      for hexadecimal-floating-constant. [ruby-dev:42105]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/ruby/test_float.rb
    branches/ruby_1_9_2/util.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29372)
+++ ruby_1_9_2/ChangeLog	(revision 29373)
@@ -1,3 +1,8 @@
+Mon Aug 23 02:23:05 2010  NARUSE, Yui  <naruse@r...>
+
+	* util.c (ruby_strtod): make sure to have digit-sequence after 'p'
+	  for hexadecimal-floating-constant. [ruby-dev:42105]
+
 Sun Aug 22 09:08:02 2010  Tanaka Akira  <akr@f...>
 
 	* include/ruby/ruby.h (UINT2NUM): fix ifdef condition for LLP64.
Index: ruby_1_9_2/util.c
===================================================================
--- ruby_1_9_2/util.c	(revision 29372)
+++ ruby_1_9_2/util.c	(revision 29373)
@@ -2139,11 +2139,15 @@
 		if (abs(dsign) == 1) s++;
 		else dsign = 1;
 
-		for (nd = 0; (c = *s) >= '0' && c <= '9'; s++) {
+               nd = 0;
+               c = *s;
+               if (c < '0' || '9' < c) goto ret0;
+               do {
 		    nd *= 10;
 		    nd += c;
 		    nd -= '0';
-		}
+                   c = *++s;
+               } while ('0' <= c && c <= '9');
 		dval(rv) = ldexp(adj, nd * dsign);
 	    }
 	    else {
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29372)
+++ ruby_1_9_2/version.h	(revision 29373)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.2"
 #define RUBY_RELEASE_DATE "2010-09-29"
-#define RUBY_PATCHLEVEL 6
+#define RUBY_PATCHLEVEL 7
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
Index: ruby_1_9_2/test/ruby/test_float.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_float.rb	(revision 29372)
+++ ruby_1_9_2/test/ruby/test_float.rb	(revision 29373)
@@ -429,6 +429,8 @@
     assert_equal(1, Float(([1] * 10000).join).infinite?)
     assert(!Float(([1] * 10000).join("_")).infinite?) # is it really OK?
     assert_raise(ArgumentError) { Float("1.0\x001") }
+    assert_equal(15.9375, Float('0xf.fp0'))
+    assert_raise(ArgumentError) { Float('0xf.fp') }
     assert_equal(1, Float("1e10_00").infinite?)
     assert_raise(TypeError) { Float(nil) }
     o = Object.new

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