diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | enc/utf_16be.c | 5 | ||||
| -rw-r--r-- | enc/utf_16le.c | 5 |
3 files changed, 8 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Thu Apr 1 14:30:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enc/utf_16{be,le}.c (utf16{be,le}_mbc_to_code): simplified. + Thu Apr 1 14:07:51 2010 NARUSE, Yui <naruse@ruby-lang.org> * util.c (BSD__hdtoa): don't use C99 macros. (FP_NORMAL etc) diff --git a/enc/utf_16be.c b/enc/utf_16be.c index d6e2c953b7..1e33c2ec7d 100644 --- a/enc/utf_16be.c +++ b/enc/utf_16be.c @@ -108,9 +108,8 @@ utf16be_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED, OnigCodePoint code; if (UTF16_IS_SURROGATE_FIRST(*p)) { - code = ((((p[0] - 0xd8) << 2) + ((p[1] & 0xc0) >> 6) + 1) << 16) - + ((((p[1] & 0x3f) << 2) + (p[2] - 0xdc)) << 8) - + p[3]; + code = ((((p[0] << 8) + p[1]) & 0x03ff) << 10) + + (((p[2] << 8) + p[3]) & 0x03ff) + 0x10000; } else { code = p[0] * 256 + p[1]; diff --git a/enc/utf_16le.c b/enc/utf_16le.c index 9547714e52..bec3d22388 100644 --- a/enc/utf_16le.c +++ b/enc/utf_16le.c @@ -102,9 +102,8 @@ utf16le_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED, UChar c1 = *(p+1); if (UTF16_IS_SURROGATE_FIRST(c1)) { - code = ((((c1 - 0xd8) << 2) + ((c0 & 0xc0) >> 6) + 1) << 16) - + ((((c0 & 0x3f) << 2) + (p[3] - 0xdc)) << 8) - + p[2]; + code = ((((c1 << 8) + c0) & 0x03ff) << 10) + + (((p[3] << 8) + p[2]) & 0x03ff) + 0x10000; } else { code = c1 * 256 + p[0]; |