diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 02:20:11 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 02:20:11 +0000 |
commit | 220d07d2fcf5b8d66327e2c78770448c43c33db5 (patch) | |
tree | d21b128523cc6d923c9d8ba3ccd54d96d98881eb /string.c | |
parent | 38b482be8c3b53809fa44e35cb0eded148b132c8 (diff) | |
download | ruby-220d07d2fcf5b8d66327e2c78770448c43c33db5.tar.gz |
* string.c (rb_str_inspect): treat UTF-16 and UTF-32 as BE or LE.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29896 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -4202,7 +4202,10 @@ rb_str_inspect(VALUE str) rb_encoding *resenc = rb_default_internal_encoding(); int unicode_p = rb_enc_unicode_p(enc); int asciicompat = rb_enc_asciicompat(enc); + static rb_encoding *utf16, *utf32; + if (!utf16) utf16 = rb_enc_find("UTF-16"); + if (!utf32) utf32 = rb_enc_find("UTF-32"); if (resenc == NULL) resenc = rb_default_external_encoding(); if (!rb_enc_asciicompat(resenc)) resenc = rb_usascii_encoding(); rb_enc_associate(result, resenc); @@ -4210,6 +4213,12 @@ rb_str_inspect(VALUE str) p = RSTRING_PTR(str); pend = RSTRING_END(str); prev = p; + if (enc == utf16) { + enc = *p == (char)0xFF ? rb_enc_find("UTF-16LE") : rb_enc_find("UTF-16BE"); + } + else if (enc == utf32) { + enc = *p == (char)0xFF ? rb_enc_find("UTF-32LE") : rb_enc_find("UTF-32BE"); + } while (p < pend) { unsigned int c, cc; int n; |