diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-21 10:15:20 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-21 10:15:20 +0000 |
commit | 9f2ddef22724be52bacd9f788f342893c78cb0f2 (patch) | |
tree | 16dae2c0f77f948d314ad74fe1f6a0fbe0d0bfe6 /string.c | |
parent | c71019f8887f3f524f5ef3c0a7491ff14bef0b16 (diff) | |
download | ruby-9f2ddef22724be52bacd9f788f342893c78cb0f2.tar.gz |
* string.c (coderange_scan): remove useless condtion `p < e` after
search_nonascii.
* string.c (rb_str_coderange_scan_restartable): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 50 |
1 files changed, 17 insertions, 33 deletions
@@ -312,32 +312,22 @@ coderange_scan(const char *p, long len, rb_encoding *enc) if (rb_enc_asciicompat(enc)) { p = search_nonascii(p, e); - if (!p) { - return ENC_CODERANGE_7BIT; - } - while (p < e) { + if (!p) return ENC_CODERANGE_7BIT; + for (;;) { int ret = rb_enc_precise_mbclen(p, e, enc); - if (!MBCLEN_CHARFOUND_P(ret)) { - return ENC_CODERANGE_BROKEN; - } + if (!MBCLEN_CHARFOUND_P(ret)) return ENC_CODERANGE_BROKEN; p += MBCLEN_CHARFOUND_LEN(ret); - if (p < e) { - p = search_nonascii(p, e); - if (!p) { - return ENC_CODERANGE_VALID; - } - } + if (p == e) break; + p = search_nonascii(p, e); + if (!p) break; } - return ENC_CODERANGE_VALID; } - - while (p < e) { - int ret = rb_enc_precise_mbclen(p, e, enc); - - if (!MBCLEN_CHARFOUND_P(ret)) { - return ENC_CODERANGE_BROKEN; + else { + while (p < e) { + int ret = rb_enc_precise_mbclen(p, e, enc); + if (!MBCLEN_CHARFOUND_P(ret)) return ENC_CODERANGE_BROKEN; + p += MBCLEN_CHARFOUND_LEN(ret); } - p += MBCLEN_CHARFOUND_LEN(ret); } return ENC_CODERANGE_VALID; } @@ -362,23 +352,17 @@ rb_str_coderange_scan_restartable(const char *s, const char *e, rb_encoding *enc if (*cr != ENC_CODERANGE_VALID) *cr = ENC_CODERANGE_7BIT; return e - s; } - while (p < e) { + for (;;) { int ret = rb_enc_precise_mbclen(p, e, enc); if (!MBCLEN_CHARFOUND_P(ret)) { *cr = MBCLEN_INVALID_P(ret) ? ENC_CODERANGE_BROKEN: ENC_CODERANGE_UNKNOWN; return p - s; } p += MBCLEN_CHARFOUND_LEN(ret); - if (p < e) { - p = search_nonascii(p, e); - if (!p) { - *cr = ENC_CODERANGE_VALID; - return e - s; - } - } + if (p == e) break; + p = search_nonascii(p, e); + if (!p) break; } - *cr = ENC_CODERANGE_VALID; - return p - s; } else { while (p < e) { @@ -389,9 +373,9 @@ rb_str_coderange_scan_restartable(const char *s, const char *e, rb_encoding *enc } p += MBCLEN_CHARFOUND_LEN(ret); } - *cr = ENC_CODERANGE_VALID; - return p - s; } + *cr = ENC_CODERANGE_VALID; + return e - s; } static inline void |