1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (coderange_scan): remove useless condtion p < e after

Browse Source 
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
This commit is contained in:
naruse 2014-04-21 10:15:20 +00:00
parent c71019f888
commit 9f2ddef227
2 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Apr 21 19:02:44 2014 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (coderange_scan): remove useless condtion `p < e` after
search_nonascii.
* string.c (rb_str_coderange_scan_restartable): ditto.
Mon Apr 21 18:55:21 2014 NARUSE, Yui <naruse@ruby-lang.org> Mon Apr 21 18:55:21 2014 NARUSE, Yui <naruse@ruby-lang.org>
* ext/-test-/string/coderange.c: add Bug::String.new#coderange_scan * ext/-test-/string/coderange.c: add Bug::String.new#coderange_scan

50
string.c
View File

@ -312,32 +312,22 @@ coderange_scan(const char *p, long len, rb_encoding *enc)
if (rb_enc_asciicompat(enc)) { if (rb_enc_asciicompat(enc)) {
p = search_nonascii(p, e); p = search_nonascii(p, e);
if (!p) { if (!p) return ENC_CODERANGE_7BIT;
return ENC_CODERANGE_7BIT; for (;;) {
int ret = rb_enc_precise_mbclen(p, e, enc);
if (!MBCLEN_CHARFOUND_P(ret)) return ENC_CODERANGE_BROKEN;
p += MBCLEN_CHARFOUND_LEN(ret);
if (p == e) break;
p = search_nonascii(p, e);
if (!p) break;
} }
}
else {
while (p < e) { while (p < e) {
int ret = rb_enc_precise_mbclen(p, e, enc); int ret = rb_enc_precise_mbclen(p, e, enc);
if (!MBCLEN_CHARFOUND_P(ret)) { if (!MBCLEN_CHARFOUND_P(ret)) return ENC_CODERANGE_BROKEN;
return ENC_CODERANGE_BROKEN;
}
p += MBCLEN_CHARFOUND_LEN(ret); p += MBCLEN_CHARFOUND_LEN(ret);
if (p < e) {
p = search_nonascii(p, e);
if (!p) {
return ENC_CODERANGE_VALID;
}
}
} }
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;
}
p += MBCLEN_CHARFOUND_LEN(ret);
} }
return ENC_CODERANGE_VALID; 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; if (*cr != ENC_CODERANGE_VALID) *cr = ENC_CODERANGE_7BIT;
return e - s; return e - s;
} }
while (p < e) { for (;;) {
int ret = rb_enc_precise_mbclen(p, e, enc); int ret = rb_enc_precise_mbclen(p, e, enc);
if (!MBCLEN_CHARFOUND_P(ret)) { if (!MBCLEN_CHARFOUND_P(ret)) {
*cr = MBCLEN_INVALID_P(ret) ? ENC_CODERANGE_BROKEN: ENC_CODERANGE_UNKNOWN; *cr = MBCLEN_INVALID_P(ret) ? ENC_CODERANGE_BROKEN: ENC_CODERANGE_UNKNOWN;
return p - s; return p - s;
} }
p += MBCLEN_CHARFOUND_LEN(ret); p += MBCLEN_CHARFOUND_LEN(ret);
if (p < e) { if (p == e) break;
p = search_nonascii(p, e); p = search_nonascii(p, e);
if (!p) { if (!p) break;
*cr = ENC_CODERANGE_VALID;
return e - s;
}
}
} }
*cr = ENC_CODERANGE_VALID;
return p - s;
} }
else { else {
while (p < e) { 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); p += MBCLEN_CHARFOUND_LEN(ret);
} }
*cr = ENC_CODERANGE_VALID;
return p - s;
} }
*cr = ENC_CODERANGE_VALID;
return e - s;
} }
static inline void static inline void