Bug #19875 » revert-4001.patch
string.c | ||
---|---|---|
char *s, *send;
|
||
int i;
|
||
int ascompat;
|
||
size_t n = 0;
|
||
rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
|
||
... | ... | |
(ptstr = RSTRING_PTR(tstr),
|
||
ONIGENC_IS_ALLOWED_REVERSE_MATCH(enc, (const unsigned char *)ptstr, (const unsigned char *)ptstr+1)) &&
|
||
!is_broken_string(str)) {
|
||
int n = 0;
|
||
int clen;
|
||
unsigned char c = rb_enc_codepoint_len(ptstr, ptstr+1, &clen, enc);
|
||
... | ... | |
while (s < send) {
|
||
if (*(unsigned char*)s++ == c) n++;
|
||
}
|
||
return SIZET2NUM(n);
|
||
return INT2NUM(n);
|
||
}
|
||
}
|
||
... | ... | |
if (!s || RSTRING_LEN(str) == 0) return INT2FIX(0);
|
||
send = RSTRING_END(str);
|
||
ascompat = rb_enc_asciicompat(enc);
|
||
i = 0;
|
||
while (s < send) {
|
||
unsigned int c;
|
||
if (ascompat && (c = *(unsigned char*)s) < 0x80) {
|
||
if (table[c]) {
|
||
n++;
|
||
i++;
|
||
}
|
||
s++;
|
||
}
|
||
... | ... | |
int clen;
|
||
c = rb_enc_codepoint_len(s, send, &clen, enc);
|
||
if (tr_find(c, table, del, nodel)) {
|
||
n++;
|
||
i++;
|
||
}
|
||
s += clen;
|
||
}
|
||
}
|
||
return SIZET2NUM(n);
|
||
return INT2NUM(i);
|
||
}
|
||
static VALUE
|