diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 00:38:02 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 00:38:02 +0000 |
| commit | d4bd0a50618b39ad9eb99187a1e7c6910886b9bc (patch) | |
| tree | 84eb9d0d53a6fcdba36be30188269cca7e068dd5 /lib | |
| parent | 78a7866ee11a62a77250bd60113df757c609825a (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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/irb/ruby-lex.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |