diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-08 08:09:11 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-08 08:09:11 +0000 |
commit | 2f7d3b465325021f24460fefe3505b374653a018 (patch) | |
tree | 3fffd95ebab1a1f79dc5a9285196e0f70d81afcf | |
parent | 11aa04e28fc9b6e6e0d82ccca69359eb9fa276af (diff) |
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].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/irb/ruby-lex.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Nov 3 07:47:25 2010 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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@fsij.org> * test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index 76e3ebac44..d677e42eef 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -1068,7 +1068,7 @@ class RubyLex 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 @@ -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 |