summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-27 16:20:56 +0000
committerkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-27 16:20:56 +0000
commit576b44165a8f0d61f16fcc42dde4901fb0421257 (patch)
tree09cc00e704b66e404e16483892122e394d5fab30
parentbad9f40714202b8dd4d5c7f5485a550f00768eb4 (diff)
* lib/irb/ruby-lex.rb: fix [Bug #4232].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/irb/ruby-lex.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d5b5744051..7860917616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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?.
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 2414e5cffd..7aec45c429 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -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