Sun Jan 20 20:00:20 2008 Martin Duerst <duerst@it.aoyama.ac.jp>

	* transcode.c, enc/trans/utf_16_32.c, test/ruby/test_transcode.rb:
	  added UTF-16LE conversions.

	* fixed changelog for last commit



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 50 insertions, 45 deletions

diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb
index cf5600926d..cbb942f45f 100644
--- a/test/ruby/test_transcode.rb
+++ b/test/ruby/test_transcode.rb
@@ -125,52 +125,57 @@ class TestTranscode < Test::Unit::TestCase
       assert_equal(test_start, test_start.encode('UTF-8',enc).encode(enc).force_encoding('ASCII-8BIT')) 
     end
   end
-  
-  def test_utf_16be
-    check_both_ways("abc".force_encoding('UTF-8'), "\x00a\x00b\x00c", 'utf-16be')
-    check_both_ways("\u00E9", "\x00\xE9", 'utf-16be');
-    check_both_ways("\u00E9\u0070\u00E9\u0065", "\x00\xE9\x00\x70\x00\xE9\x00\x65", 'utf-16be') # épée
-    check_both_ways("\u677E\u672C\u884C\u5F18", "\x67\x7E\x67\x2C\x88\x4C\x5F\x18", 'utf-16be') # 松本行弘
-    check_both_ways("\u9752\u5C71\u5B66\u9662\u5927\u5B66", "\x97\x52\x5C\x71\x5B\x66\x96\x62\x59\x27\x5B\x66",
-                    'utf-16be') # 青山学院大学
-    check_both_ways("Martin D\u00FCrst", "\x00M\x00a\x00r\x00t\x00i\x00n\x00 \x00D\x00\xFC\x00r\x00s\x00t",
-                    'utf-16be') # Martin Dürst
+
+  def check_utf_16_both_ways(utf8, raw)
+    copy = raw.dup
+    0.step(copy.length-1, 2) { |i| copy[i+1], copy[i] = copy[i], copy[i+1] }
+    check_both_ways(utf8, raw, 'utf-16be')
+    check_both_ways(utf8, copy, 'utf-16le')
+  end
+
+  def test_utf_16
+    check_utf_16_both_ways("abc", "\x00a\x00b\x00c")
+    check_utf_16_both_ways("\u00E9", "\x00\xE9");
+    check_utf_16_both_ways("\u00E9\u0070\u00E9\u0065", "\x00\xE9\x00\x70\x00\xE9\x00\x65") # épée
+    check_utf_16_both_ways("\u677E\u672C\u884C\u5F18", "\x67\x7E\x67\x2C\x88\x4C\x5F\x18") # 松本行弘
+    check_utf_16_both_ways("\u9752\u5C71\u5B66\u9662\u5927\u5B66", "\x97\x52\x5C\x71\x5B\x66\x96\x62\x59\x27\x5B\x66") # 青山学院大学
+    check_utf_16_both_ways("Martin D\u00FCrst", "\x00M\x00a\x00r\x00t\x00i\x00n\x00 \x00D\x00\xFC\x00r\x00s\x00t") # Martin Dürst
     # BMP
-    check_both_ways("\u0000", "\x00\x00", 'utf-16be')
-    check_both_ways("\u007F", "\x00\x7F", 'utf-16be')
-    check_both_ways("\u0080", "\x00\x80", 'utf-16be')
-    check_both_ways("\u0555", "\x05\x55", 'utf-16be')
-    check_both_ways("\u04AA", "\x04\xAA", 'utf-16be')
-    check_both_ways("\u0333", "\x03\x33", 'utf-16be')
-    check_both_ways("\u04CC", "\x04\xCC", 'utf-16be')
-    check_both_ways("\u00F0", "\x00\xF0", 'utf-16be')
-    check_both_ways("\u070F", "\x07\x0F", 'utf-16be')
-    check_both_ways("\u07FF", "\x07\xFF", 'utf-16be')
-    check_both_ways("\u0800", "\x08\x00", 'utf-16be')
-    check_both_ways("\uD7FF", "\xD7\xFF", 'utf-16be')
-    check_both_ways("\uE000", "\xE0\x00", 'utf-16be')
-    check_both_ways("\uFFFF", "\xFF\xFF", 'utf-16be')
-    check_both_ways("\u5555", "\x55\x55", 'utf-16be')
-    check_both_ways("\uAAAA", "\xAA\xAA", 'utf-16be')
-    check_both_ways("\u3333", "\x33\x33", 'utf-16be')
-    check_both_ways("\uCCCC", "\xCC\xCC", 'utf-16be')
-    check_both_ways("\uF0F0", "\xF0\xF0", 'utf-16be')
-    check_both_ways("\u0F0F", "\x0F\x0F", 'utf-16be')
-    check_both_ways("\uFF00", "\xFF\x00", 'utf-16be')
-    check_both_ways("\u00FF", "\x00\xFF", 'utf-16be')
+    check_utf_16_both_ways("\u0000", "\x00\x00")
+    check_utf_16_both_ways("\u007F", "\x00\x7F")
+    check_utf_16_both_ways("\u0080", "\x00\x80")
+    check_utf_16_both_ways("\u0555", "\x05\x55")
+    check_utf_16_both_ways("\u04AA", "\x04\xAA")
+    check_utf_16_both_ways("\u0333", "\x03\x33")
+    check_utf_16_both_ways("\u04CC", "\x04\xCC")
+    check_utf_16_both_ways("\u00F0", "\x00\xF0")
+    check_utf_16_both_ways("\u070F", "\x07\x0F")
+    check_utf_16_both_ways("\u07FF", "\x07\xFF")
+    check_utf_16_both_ways("\u0800", "\x08\x00")
+    check_utf_16_both_ways("\uD7FF", "\xD7\xFF")
+    check_utf_16_both_ways("\uE000", "\xE0\x00")
+    check_utf_16_both_ways("\uFFFF", "\xFF\xFF")
+    check_utf_16_both_ways("\u5555", "\x55\x55")
+    check_utf_16_both_ways("\uAAAA", "\xAA\xAA")
+    check_utf_16_both_ways("\u3333", "\x33\x33")
+    check_utf_16_both_ways("\uCCCC", "\xCC\xCC")
+    check_utf_16_both_ways("\uF0F0", "\xF0\xF0")
+    check_utf_16_both_ways("\u0F0F", "\x0F\x0F")
+    check_utf_16_both_ways("\uFF00", "\xFF\x00")
+    check_utf_16_both_ways("\u00FF", "\x00\xFF")
     # outer planes
-    check_both_ways("\u{10000}", "\xD8\x00\xDC\x00", 'utf-16be')
-    check_both_ways("\u{FFFFF}", "\xDB\xBF\xDF\xFF", 'utf-16be')
-    check_both_ways("\u{100000}", "\xDB\xC0\xDC\x00", 'utf-16be')
-    check_both_ways("\u{10FFFF}", "\xDB\xFF\xDF\xFF", 'utf-16be')
-    check_both_ways("\u{105555}", "\xDB\xD5\xDD\x55", 'utf-16be')
-    check_both_ways("\u{55555}", "\xD9\x15\xDD\x55", 'utf-16be')
-    check_both_ways("\u{AAAAA}", "\xDA\x6A\xDE\xAA", 'utf-16be')
-    check_both_ways("\u{33333}", "\xD8\x8C\xDF\x33", 'utf-16be')
-    check_both_ways("\u{CCCCC}", "\xDA\xF3\xDC\xCC", 'utf-16be')
-    check_both_ways("\u{8F0F0}", "\xD9\xFC\xDC\xF0", 'utf-16be')
-    check_both_ways("\u{F0F0F}", "\xDB\x83\xDF\x0F", 'utf-16be')
-    check_both_ways("\u{8FF00}", "\xD9\xFF\xDF\x00", 'utf-16be')
-    check_both_ways("\u{F00FF}", "\xDB\x80\xDC\xFF", 'utf-16be')
+    check_utf_16_both_ways("\u{10000}", "\xD8\x00\xDC\x00")
+    check_utf_16_both_ways("\u{FFFFF}", "\xDB\xBF\xDF\xFF")
+    check_utf_16_both_ways("\u{100000}", "\xDB\xC0\xDC\x00")
+    check_utf_16_both_ways("\u{10FFFF}", "\xDB\xFF\xDF\xFF")
+    check_utf_16_both_ways("\u{105555}", "\xDB\xD5\xDD\x55")
+    check_utf_16_both_ways("\u{55555}", "\xD9\x15\xDD\x55")
+    check_utf_16_both_ways("\u{AAAAA}", "\xDA\x6A\xDE\xAA")
+    check_utf_16_both_ways("\u{33333}", "\xD8\x8C\xDF\x33")
+    check_utf_16_both_ways("\u{CCCCC}", "\xDA\xF3\xDC\xCC")
+    check_utf_16_both_ways("\u{8F0F0}", "\xD9\xFC\xDC\xF0")
+    check_utf_16_both_ways("\u{F0F0F}", "\xDB\x83\xDF\x0F")
+    check_utf_16_both_ways("\u{8FF00}", "\xD9\xFF\xDF\x00")
+    check_utf_16_both_ways("\u{F00FF}", "\xDB\x80\xDC\xFF")
   end
 end