shyouhei	2008-06-08 05:02:05 +0900 (Sun, 08 Jun 2008)

  New Revision: 16972

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/bignum.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 14095:
    * bignum.c (rb_cstr_to_inum): trailing spaces may exist at sqeezing
      preceeding 0s.  [ruby-core:13873]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16972&r2=16971&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/bignum.c?r1=16972&r2=16971&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16972&r2=16971&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16971)
+++ ruby_1_8_5/ChangeLog	(revision 16972)
@@ -1,3 +1,8 @@
+Sun Jun  8 05:00:44 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* bignum.c (rb_cstr_to_inum): trailing spaces may exist at sqeezing
+	  preceeding 0s.  [ruby-core:13873]
+
 Sun Jun  8 04:56:55 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (error_print): put newline unless multiple line message ends
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16971)
+++ ruby_1_8_5/version.h	(revision 16972)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 155
+#define RUBY_PATCHLEVEL 156
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/bignum.c
===================================================================
--- ruby_1_8_5/bignum.c	(revision 16971)
+++ ruby_1_8_5/bignum.c	(revision 16972)
@@ -431,7 +431,7 @@
     }
     if (*str == '0') {		/* squeeze preceeding 0s */
 	while (*++str == '0');
-	if (!*str) --str;
+	if (!(c = *str) || ISSPACE(c)) --str;
     }
     c = *str;
     c = conv_digit(c);

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