summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-11 00:38:02 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-11 00:38:02 +0000
commitd4bd0a50618b39ad9eb99187a1e7c6910886b9bc (patch)
tree84eb9d0d53a6fcdba36be30188269cca7e068dd5
parent78a7866ee11a62a77250bd60113df757c609825a (diff)
merges r32257 from trunk into ruby_1_9_2.
-- * 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
-rw-r--r--ChangeLog4
-rw-r--r--lib/irb/ruby-lex.rb2
-rw-r--r--version.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fbe15150ad..2a2d78880c 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 d677e42eef..73c5bff4c5 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
diff --git a/version.h b/version.h
index f89a295b93..afc47e064b 100644
--- a/version.h
+++ b/version.h
@@ -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