nobu	2013-09-23 22:16:11 +0900 (Mon, 23 Sep 2013)

  New Revision: 43023

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

  Log:
    encdb.c, utf_16_32.h: Unicode with BOM
    
    * enc/encdb.c, enc/utf_16_32.h (ENC_DUMMY_UNICODE): Unicode with BOM
      must be based on big endian variants, so that actual encodings would
      work.  [ruby-core:57318] [Bug #8940]

  Modified files:
    trunk/ChangeLog
    trunk/enc/encdb.c
    trunk/enc/utf_16_32.h
    trunk/test/ruby/test_transcode.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43022)
+++ ChangeLog	(revision 43023)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Sep 23 22:16:09 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* enc/encdb.c, enc/utf_16_32.h (ENC_DUMMY_UNICODE): Unicode with BOM
+	  must be based on big endian variants, so that actual encodings would
+	  work.  [ruby-core:57318] [Bug #8940]
+
 Mon Sep 23 12:11:26 2013  Masaki Matsushita  <glass.saga@g...>
 
 	* hash.c (env_each_pair): do not call rb_assoc_new() if
Index: enc/encdb.c
===================================================================
--- enc/encdb.c	(revision 43022)
+++ enc/encdb.c	(revision 43023)
@@ -20,7 +20,7 @@ void rb_encdb_set_unicode(int index); https://github.com/ruby/ruby/blob/trunk/enc/encdb.c#L20
 #define ENC_DUMMY(name) rb_encdb_dummy(name)
 #define ENC_DEFINE(name) rb_encdb_declare(name)
 #define ENC_SET_BASE(name, orig) rb_enc_set_base((name), (orig))
-#define ENC_DUMMY_UNICODE(name) rb_encdb_set_unicode(ENC_DUMMY(name))
+#define ENC_DUMMY_UNICODE(name) rb_encdb_set_unicode(ENC_REPLICATE((name), name "BE"))
 
 void
 Init_encdb(void)
Index: enc/utf_16_32.h
===================================================================
--- enc/utf_16_32.h	(revision 43022)
+++ enc/utf_16_32.h	(revision 43023)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/enc/utf_16_32.h#L1
 #include "regenc.h"
 /* dummy for unsupported, statefull encoding */
-#define ENC_DUMMY_UNICODE(name) ENC_DUMMY(name)
+#define ENC_DUMMY_UNICODE(name) ENC_REPLICATE(name, name "BE")
 ENC_DUMMY_UNICODE("UTF-16");
 ENC_DUMMY_UNICODE("UTF-32");
Index: test/ruby/test_transcode.rb
===================================================================
--- test/ruby/test_transcode.rb	(revision 43022)
+++ test/ruby/test_transcode.rb	(revision 43023)
@@ -2063,4 +2063,11 @@ class TestTranscode < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/test/ruby/test_transcode.rb#L2063
     end
     assert_equal("U+3042", "\u{3042}".encode("US-ASCII", fallback: fallback.method(:escape)))
   end
+
+  bug8940 = '[ruby-core:57318] [Bug #8940]'
+  %w[UTF-32 UTF-16].each do |enc|
+    define_method("test_pseudo_encoding_inspect(#{enc})") do
+      assert_normal_exit("'aaa'.encode('#{enc}').inspect", bug8940)
+    end
+  end
 end

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