nobu	2008-08-21 06:12:58 +0900 (Thu, 21 Aug 2008)

  New Revision: 18744

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

  Log:
    * lib/scanf.rb (Scanf::FormatSpecifier#initialize): %i should accept
      single digit decimal.  [ruby-core:18355]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/scanf.rb
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/lib/scanf.rb
    trunk/test/scanf/test_scanf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18743)
+++ ChangeLog	(revision 18744)
@@ -1,3 +1,8 @@
+Thu Aug 21 06:12:56 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/scanf.rb (Scanf::FormatSpecifier#initialize): %i should accept
+	  single digit decimal.  [ruby-core:18355]
+
 Thu Aug 21 06:02:52 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* range.c (range_initialize_copy): Range is now a Struct.
Index: lib/scanf.rb
===================================================================
--- lib/scanf.rb	(revision 18743)
+++ lib/scanf.rb	(revision 18744)
@@ -357,7 +357,7 @@
 
           # %i
         when /%\*?i/
-          [ "([-+]?(?:(?:0[0-7]+)|(?:0[Xx]#{h}+)|(?:[1-9]\\d+)))", :extract_integer ]
+          [ "([-+]?(?:(?:0[0-7]+)|(?:0[Xx]#{h}+)|(?:[1-9]\\d*)))", :extract_integer ]
 
           # %5i
         when /%\*?(\d+)i/
Index: test/scanf/test_scanf.rb
===================================================================
--- test/scanf/test_scanf.rb	(revision 18743)
+++ test/scanf/test_scanf.rb	(revision 18744)
@@ -179,8 +179,8 @@
       [ "%3d%3x", "12abc", [12, "abc".hex] ],
       [ "%s%i%d", "hello +0xdef 123", [ "hello", "def".hex, 123] ],
       [ "%s%i%d", "hello -0xdef 123", [ "hello", -"def".hex, 123] ],
-      [ "%s%i%i%i", "hello 012 -012 100", [ "hello", 10, -10, 100 ] ],
-      [ "%s%i%i%i", "hello 012 0x12 100", [ "hello", 10, 18, 100 ] ],
+      [ "%s%i%i%i%i", "hello 012 -012 100 1", [ "hello", 10, -10, 100, 1 ] ],
+      [ "%s%i%i%i%i", "hello 012 0x12 100 1", [ "hello", 10, 18, 100, 1 ] ],
       [ "%s%5i%3i%4i", "hello 0x123 123 0123", [ "hello", "0x123".hex, 123,"0123".oct] ],
       [ "%s%3i%4i", "hello 1230123", [ "hello", 123,"0123".oct] ],
       [ "%s%3i", "hello 1230", [ "hello", 123] ],
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18743)
+++ ruby_1_8/ChangeLog	(revision 18744)
@@ -1,3 +1,8 @@
+Thu Aug 21 06:12:56 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/scanf.rb (Scanf::FormatSpecifier#initialize): %i should accept
+	  single digit decimal.  [ruby-core:18355]
+
 Tue Aug 19 20:32:48 2008  Akinori MUSHA  <knu@i...>
 
 	* enumerator.c (Init_Enumerator): Rename Enumerable::Enumerator to
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 18743)
+++ ruby_1_8/version.h	(revision 18744)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-08-19"
+#define RUBY_RELEASE_DATE "2008-08-21"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080819
+#define RUBY_RELEASE_CODE 20080821
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 21
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/lib/scanf.rb
===================================================================
--- ruby_1_8/lib/scanf.rb	(revision 18743)
+++ ruby_1_8/lib/scanf.rb	(revision 18744)
@@ -357,7 +357,7 @@
 
           # %i
         when /%\*?i/
-          [ "([-+]?(?:(?:0[0-7]+)|(?:0[Xx]#{h}+)|(?:[1-9]\\d+)))", :extract_integer ]
+          [ "([-+]?(?:(?:0[0-7]+)|(?:0[Xx]#{h}+)|(?:[1-9]\\d*)))", :extract_integer ]
 
           # %5i
         when /%\*?(\d+)i/

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