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 r32257 from trunk into ruby_1_9_2.

Browse source 
--
 * lib/irb/ruby-lex.rb: fix [Bug #4232].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-08-11 00:38:02 +00:00
parent 78a7866ee1
commit d4bd0a5061
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Jun 28 01:19:52 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
* lib/irb/ruby-lex.rb: fix [Bug #4232].
Tue Jun 28 00:14:13 2011 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb: fix [Bug #4409]. add DRbServer#here?.

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

@ -1046,7 +1046,7 @@ class RubyLex
while ch = getc
if @quoted == ch and nest == 0
break
elsif ch == "#" and peek(0) == "{"
elsif @ltype != "'" && ch == "#" && peek(0) == "{"
identify_string_dvar
elsif @ltype != "'" && @ltype != "]" && @ltype != ":" and ch == "#"
subtype = true

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 298
#define RUBY_PATCHLEVEL 299
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1