kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r29674 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2010-12-08 08:09:11 +00:00
parent 11aa04e28f
commit 2f7d3b4653
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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

2
lib/irb/ruby-lex.rb
View file

@ -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

2
version.h
View file

@ -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