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

encoding.h: ENC_CODERANGE_CLEAN_P

Browse Source 
* include/ruby/encoding.h (ENC_CODERANGE_CLEAN_P): predicate that
  tells if the coderange is clean, that is 7bit or valid, and no
  needs to scrub.
* re.c (rb_reg_expr_str): use ENC_CODERANGE_CLEAN_P.
* string.c (enc_strlen, rb_enc_cr_str_buf_cat, rb_str_scrub):
  ditto.
* string.c (rb_str_enumerate_chars): ditto, and suppress a warning
  by gcc6.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-07-17 06:39:29 +00:00
parent 13b3abb227
commit 137d08de4b
4 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
Fri Jul 17 15:39:19 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/encoding.h (ENC_CODERANGE_CLEAN_P): predicate that
tells if the coderange is clean, that is 7bit or valid, and no
needs to scrub.
* re.c (rb_reg_expr_str): use ENC_CODERANGE_CLEAN_P.
* string.c (enc_strlen, rb_enc_cr_str_buf_cat, rb_str_scrub):
ditto.
* string.c (rb_str_enumerate_chars): ditto, and suppress a warning
by gcc6.
Fri Jul 17 15:36:52 2015 yui-knk <spiketeika@gmail.com> Fri Jul 17 15:36:52 2015 yui-knk <spiketeika@gmail.com>
* test/ruby/test_range.rb (test_first_last): Add test for * test/ruby/test_range.rb (test_first_last): Add test for

6
include/ruby/encoding.h
View File

@ -49,6 +49,12 @@ RUBY_SYMBOL_EXPORT_BEGIN
#define ENC_CODERANGE_7BIT ((int)FL_USER8) #define ENC_CODERANGE_7BIT ((int)FL_USER8)
#define ENC_CODERANGE_VALID ((int)FL_USER9) #define ENC_CODERANGE_VALID ((int)FL_USER9)
#define ENC_CODERANGE_BROKEN ((int)(FL_USER8|FL_USER9)) #define ENC_CODERANGE_BROKEN ((int)(FL_USER8|FL_USER9))
static inline int
rb_enc_coderange_clean_p(int cr)
{
return (cr ^ (cr >> 1)) & ENC_CODERANGE_7BIT;
}
#define ENC_CODERANGE_CLEAN_P(cr) rb_enc_coderange_clean_p(cr)
#define ENC_CODERANGE(obj) ((int)RBASIC(obj)->flags & ENC_CODERANGE_MASK) #define ENC_CODERANGE(obj) ((int)RBASIC(obj)->flags & ENC_CODERANGE_MASK)
#define ENC_CODERANGE_ASCIIONLY(obj) (ENC_CODERANGE(obj) == ENC_CODERANGE_7BIT) #define ENC_CODERANGE_ASCIIONLY(obj) (ENC_CODERANGE(obj) == ENC_CODERANGE_7BIT)
#define ENC_CODERANGE_SET(obj,cr) (RBASIC(obj)->flags = \ #define ENC_CODERANGE_SET(obj,cr) (RBASIC(obj)->flags = \

3
re.c
View File

@ -340,8 +340,7 @@ rb_reg_expr_str(VALUE str, const char *s, long len,
p = s; pend = p + len; p = s; pend = p + len;
rb_str_coderange_scan_restartable(p, pend, enc, &cr); rb_str_coderange_scan_restartable(p, pend, enc, &cr);
if (rb_enc_asciicompat(enc) && if (rb_enc_asciicompat(enc) && ENC_CODERANGE_CLEAN_P(cr)) {
(cr == ENC_CODERANGE_VALID || cr == ENC_CODERANGE_7BIT)) {
while (p < pend) { while (p < pend) {
c = rb_enc_ascget(p, pend, &clen, enc); c = rb_enc_ascget(p, pend, &clen, enc);
if (c == -1) { if (c == -1) {

14
string.c
View File

@ -1300,7 +1300,7 @@ enc_strlen(const char *p, const char *e, rb_encoding *enc, int cr)
#endif #endif
else if (rb_enc_asciicompat(enc)) { else if (rb_enc_asciicompat(enc)) {
c = 0; c = 0;
if (cr == ENC_CODERANGE_7BIT || cr == ENC_CODERANGE_VALID) { if (ENC_CODERANGE_CLEAN_P(cr)) {
while (p < e) { while (p < e) {
if (ISASCII(*p)) { if (ISASCII(*p)) {
q = search_nonascii(p, e); q = search_nonascii(p, e);
@ -2335,7 +2335,7 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len,
} }
else if (str_cr == ENC_CODERANGE_VALID) { else if (str_cr == ENC_CODERANGE_VALID) {
res_encindex = str_encindex; res_encindex = str_encindex;
if (ptr_cr == ENC_CODERANGE_7BIT || ptr_cr == ENC_CODERANGE_VALID) if (ENC_CODERANGE_CLEAN_P(ptr_cr))
res_cr = str_cr; res_cr = str_cr;
else else
res_cr = ptr_cr; res_cr = ptr_cr;
@ -6970,9 +6970,7 @@ rb_str_enumerate_chars(VALUE str, int wantarray)
return SIZED_ENUMERATOR(str, 0, 0, rb_str_each_char_size); return SIZED_ENUMERATOR(str, 0, 0, rb_str_each_char_size);
} }
switch (ENC_CODERANGE(str)) { if (ENC_CODERANGE_CLEAN_P(ENC_CODERANGE(str))) {
case ENC_CODERANGE_VALID:
case ENC_CODERANGE_7BIT:
for (i = 0; i < len; i += n) { for (i = 0; i < len; i += n) {
n = rb_enc_fast_mbclen(ptr + i, ptr + len, enc); n = rb_enc_fast_mbclen(ptr + i, ptr + len, enc);
substr = rb_str_subseq(str, i, n); substr = rb_str_subseq(str, i, n);
@ -6981,8 +6979,8 @@ rb_str_enumerate_chars(VALUE str, int wantarray)
else else
rb_yield(substr); rb_yield(substr);
} }
break; }
default: else {
for (i = 0; i < len; i += n) { for (i = 0; i < len; i += n) {
n = rb_enc_mbclen(ptr + i, ptr + len, enc); n = rb_enc_mbclen(ptr + i, ptr + len, enc);
substr = rb_str_subseq(str, i, n); substr = rb_str_subseq(str, i, n);
@ -8377,7 +8375,7 @@ rb_str_scrub(VALUE str, VALUE repl)
rb_encoding *enc; rb_encoding *enc;
int encidx; int encidx;
if (cr == ENC_CODERANGE_7BIT || cr == ENC_CODERANGE_VALID) if (ENC_CODERANGE_CLEAN_P(cr))
return Qnil; return Qnil;
enc = STR_ENC_GET(str); enc = STR_ENC_GET(str);