merge revision(s) 18744:

shyouhei · shyouhei · commit 3bb58fdb988c · 2009-01-20T03:22:56.000Z
* lib/scanf.rb (Scanf::FormatSpecifier#initialize): %i should accept
	  single digit decimal.  [ruby-core:18355]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@21680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 20 12:22:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/scanf.rb (Scanf::FormatSpecifier#initialize): %i should accept
+	  single digit decimal.  [ruby-core:18355]
+
 Mon Jan 19 18:24:13 2009  Tanaka Akira  <akr@fsij.org>
 
 	* configure.in (rb_cv_broken_glibc_ia64_erfc): renamed from
diff --git a/lib/scanf.rb b/lib/scanf.rb
@@ -357,7 +357,7 @@ def initialize(str)
 
           # %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/
diff --git a/version.h b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-19"
+#define RUBY_RELEASE_DATE "2009-01-20"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090119
-#define RUBY_PATCHLEVEL 303
+#define RUBY_RELEASE_CODE 20090120
+#define RUBY_PATCHLEVEL 304
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 20
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
