ruby-changes:18109
From: yugui <ko1@a...>
Date: Wed, 8 Dec 2010 17:26:55 +0900 (JST)
Subject: [ruby-changes:18109] Ruby:r30131 (ruby_1_9_2): merges r29674 from trunk into ruby_1_9_2.
yugui 2010-12-08 17:09:11 +0900 (Wed, 08 Dec 2010) New Revision: 30131 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30131 Log: merges r29674 from trunk into ruby_1_9_2. -- * lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple regex options. a patch from Heesob Park in [ruby-core:32988]. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/lib/irb/ruby-lex.rb branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 30130) +++ ruby_1_9_2/ChangeLog (revision 30131) @@ -1,3 +1,8 @@ +Wed Nov 3 07:47:25 2010 Yukihiro Matsumoto <matz@r...> + + * lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple + regex options. a patch from Heesob Park in [ruby-core:32988]. + Sat Oct 30 06:32:52 2010 Tanaka Akira <akr@f...> * test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the Index: ruby_1_9_2/lib/irb/ruby-lex.rb =================================================================== --- ruby_1_9_2/lib/irb/ruby-lex.rb (revision 30130) +++ ruby_1_9_2/lib/irb/ruby-lex.rb (revision 30131) @@ -1068,7 +1068,7 @@ end end if @ltype == "/" - if peek(0) =~ /i|m|x|o|e|s|u|n/ + while peek(0) =~ /i|m|x|o|e|s|u|n/ getc end end Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 30130) +++ ruby_1_9_2/version.h (revision 30131) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 85 +#define RUBY_PATCHLEVEL 86 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/