naruse	2010-12-01 10:20:56 +0900 (Wed, 01 Dec 2010)

  New Revision: 29989

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

  Log:
    * string.c (rb_str_inspect): fix typo (not 0xFD but 0xFE).

  Modified files:
    trunk/ChangeLog
    trunk/string.c
    trunk/test/ruby/test_m17n.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29988)
+++ ChangeLog	(revision 29989)
@@ -1,3 +1,7 @@
+Wed Dec  1 10:16:41 2010  NARUSE, Yui  <naruse@r...>
+
+	* string.c (rb_str_inspect): fix typo (not 0xFD but 0xFE).
+
 Wed Dec  1 09:28:27 2010  NARUSE, Yui  <naruse@r...>
 
 	* addr2line.c: Follow .gnu_debuglink section.
Index: string.c
===================================================================
--- string.c	(revision 29988)
+++ string.c	(revision 29989)
@@ -4217,7 +4217,7 @@
 	const unsigned char *q = (const unsigned char *)p;
 	if (q[0] == 0xFE && q[1] == 0xFF)
 	    enc = rb_enc_find("UTF-16BE");
-	else if (q[0] == 0xFF && q[1] == 0xFD)
+	else if (q[0] == 0xFF && q[1] == 0xFE)
 	    enc = rb_enc_find("UTF-16LE");
 	else
 	    unicode_p = 0;
Index: test/ruby/test_m17n.rb
===================================================================
--- test/ruby/test_m17n.rb	(revision 29988)
+++ test/ruby/test_m17n.rb	(revision 29989)
@@ -243,6 +243,17 @@
                      s.dup.force_encoding(enc).inspect)
       end
     end
+
+    str = "\uFEFF\u3042"
+    %w/UTF-16 UTF-32/.each do |enc|
+      %w/BE LE/.each do |endian|
+        s = str.encode(enc + endian)
+        # When a UTF-16/32 string doesn't have a BOM,
+        # inspect as a dummy encoding string.
+        assert_equal(s.inspect,
+                     s.dup.force_encoding(enc).inspect)
+      end
+    end
   end
 
   def test_str_dump

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