nobu	2012-03-26 09:57:14 +0900 (Mon, 26 Mar 2012)

  New Revision: 35128

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

  Log:
    merge revision(s) 33542,33543: [Backport #6200]
    
    * parse.y (parser_nextc): set encoding for the buffer of ripper.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/parse.y
    branches/ruby_1_9_3/test/ripper/test_scanner_events.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35127)
+++ ruby_1_9_3/ChangeLog	(revision 35128)
@@ -1,3 +1,7 @@
+Mon Mar 26 09:57:12 2012  NARUSE, Yui  <naruse@r...>
+
+	* parse.y (parser_nextc): set encoding for the buffer of ripper.
+
 Sun Mar 18 13:23:28 2012  NARUSE, Yui  <naruse@r...>
 
 	* encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string
Index: ruby_1_9_3/parse.y
===================================================================
--- ruby_1_9_3/parse.y	(revision 35127)
+++ ruby_1_9_3/parse.y	(revision 35128)
@@ -5440,6 +5440,7 @@
 	    if (parser->tokp < lex_pend) {
 		if (NIL_P(parser->delayed)) {
 		    parser->delayed = rb_str_buf_new(1024);
+		    rb_enc_associate(parser->delayed, parser->enc);
 		    rb_str_buf_cat(parser->delayed,
 				   parser->tokp, lex_pend - parser->tokp);
 		    parser->delayed_line = ruby_sourceline;
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35127)
+++ ruby_1_9_3/version.h	(revision 35128)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 165
+#define RUBY_PATCHLEVEL 166
 
-#define RUBY_RELEASE_DATE "2012-03-18"
+#define RUBY_RELEASE_DATE "2012-03-26"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/ripper/test_scanner_events.rb
===================================================================
--- ruby_1_9_3/test/ripper/test_scanner_events.rb	(revision 35127)
+++ ruby_1_9_3/test/ripper/test_scanner_events.rb	(revision 35128)
@@ -83,6 +83,10 @@
                   [[1, 1], :on_tstring_content, "foo\n\xe3\x80\xa0"],
                   [[2, 3], :on_tstring_end, "'"]],
                  Ripper.lex("'foo\n\xe3\x80\xa0'")
+    assert_equal [[[1, 0], :on_tstring_beg, "'"],
+                  [[1, 1], :on_tstring_content, "\u3042\n\u3044"],
+                  [[2, 3], :on_tstring_end, "'"]],
+                 Ripper.lex("'\u3042\n\u3044'")
   end
 
   def test_location

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