From baac9b03518cf97384b913edcfd689243c830ed6 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 20 Jan 2009 03:23:46 +0000 Subject: merge revision(s) 18744: * 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_7@21682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/scanf.rb | 2 +- version.h | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 009550aa57..9bc76990fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 20 12:23:38 2009 Nobuyoshi Nakada + + * lib/scanf.rb (Scanf::FormatSpecifier#initialize): %i should accept + single digit decimal. [ruby-core:18355] + Mon Jan 19 18:25:28 2009 Tanaka Akira * configure.in (rb_cv_broken_glibc_ia64_erfc): renamed from diff --git a/lib/scanf.rb b/lib/scanf.rb index 2972bf9d60..a54485661d 100644 --- a/lib/scanf.rb +++ b/lib/scanf.rb @@ -357,7 +357,7 @@ module Scanf # %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 index 3135e87342..58efa11121 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-01-19" +#define RUBY_RELEASE_DATE "2009-01-20" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090119 -#define RUBY_PATCHLEVEL 89 +#define RUBY_RELEASE_CODE 20090120 +#define RUBY_PATCHLEVEL 90 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #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[]; -- cgit v1.2.3