yugui	2011-08-11 09:38:02 +0900 (Thu, 11 Aug 2011)

  New Revision: 32913

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32913

  Log:
    merges r32257 from trunk into ruby_1_9_2.
    --
     * lib/irb/ruby-lex.rb: fix [Bug #4232].

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/irb/ruby-lex.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 32912)
+++ ruby_1_9_2/ChangeLog	(revision 32913)
@@ -1,3 +1,7 @@
+Tue Jun 28 01:19:52 2011  Keiju Ishitsuka  <keiju@i...>
+
+	* lib/irb/ruby-lex.rb: fix [Bug #4232].
+
 Tue Jun 28 00:14:13 2011  Masatoshi SEKI  <m_seki@m...>
 
 	* lib/drb/drb.rb: fix [Bug #4409]. add DRbServer#here?.
Index: ruby_1_9_2/lib/irb/ruby-lex.rb
===================================================================
--- ruby_1_9_2/lib/irb/ruby-lex.rb	(revision 32912)
+++ ruby_1_9_2/lib/irb/ruby-lex.rb	(revision 32913)
@@ -1046,7 +1046,7 @@
       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
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32912)
+++ ruby_1_9_2/version.h	(revision 32913)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/