archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 62892,62893: [Backport #14363]

Browse source 
fix each_grapheme_cluster's size [Bug #14363]

	From: Hugo Peixoto <hugo.peixoto@gmail.com>

	Factor out get_reg_grapheme_cluster

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62896 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-03-22 11:18:00 +00:00
parent 06e4298099
commit c40df5a769
3 changed files with 60 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

66
string.c
View file

@ -8309,20 +8309,12 @@ rb_str_codepoints(VALUE str)
return rb_str_enumerate_codepoints(str, ary);
}
static VALUE
rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
static regex_t *
get_reg_grapheme_cluster(rb_encoding *enc)
{
VALUE orig = str;
int encidx = rb_enc_to_index(enc);
regex_t *reg_grapheme_cluster = NULL;
static regex_t *reg_grapheme_cluster_utf8 = NULL;
int encidx = ENCODING_GET(str);
rb_encoding *enc = rb_enc_from_index(encidx);
int unicode_p = rb_enc_unicode_p(enc);
const char *ptr, *end;
if (!unicode_p || single_byte_optimizable(str)) {
return rb_str_enumerate_chars(str, ary);
}
/* synchronize */
if (encidx == rb_utf8_encindex() && reg_grapheme_cluster_utf8) {
@ -8339,8 +8331,22 @@ rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
reg_grapheme_cluster_utf8 = reg_grapheme_cluster;
}
}
return reg_grapheme_cluster;
}
if (!ary) str = rb_str_new_frozen(str);
static VALUE
rb_str_each_grapheme_cluster_size(VALUE str, VALUE args, VALUE eobj)
{
size_t grapheme_cluster_count = 0;
regex_t *reg_grapheme_cluster = NULL;
rb_encoding *enc = rb_enc_from_index(ENCODING_GET(str));
const char *ptr, *end;
if (!rb_enc_unicode_p(enc) || single_byte_optimizable(str)) {
return rb_str_length(str);
}
reg_grapheme_cluster = get_reg_grapheme_cluster(enc);
ptr = RSTRING_PTR(str);
end = RSTRING_END(str);
@ -8348,10 +8354,36 @@ rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
OnigPosition len = onig_match(reg_grapheme_cluster,
(const OnigUChar *)ptr, (const OnigUChar *)end,
(const OnigUChar *)ptr, NULL, 0);
if (len == 0) break;
if (len < 0) {
break;
}
if (len <= 0) break;
grapheme_cluster_count++;
ptr += len;
}
return SIZET2NUM(grapheme_cluster_count);
}
static VALUE
rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
{
VALUE orig = str;
regex_t *reg_grapheme_cluster = NULL;
rb_encoding *enc = rb_enc_from_index(ENCODING_GET(str));
const char *ptr, *end;
if (!rb_enc_unicode_p(enc) || single_byte_optimizable(str)) {
return rb_str_enumerate_chars(str, ary);
}
if (!ary) str = rb_str_new_frozen(str);
reg_grapheme_cluster = get_reg_grapheme_cluster(enc);
ptr = RSTRING_PTR(str);
end = RSTRING_END(str);
while (ptr < end) {
OnigPosition len = onig_match(reg_grapheme_cluster,
(const OnigUChar *)ptr, (const OnigUChar *)end,
(const OnigUChar *)ptr, NULL, 0);
if (len <= 0) break;
ENUM_ELEM(ary, rb_enc_str_new(ptr, len, enc));
ptr += len;
}
@ -8380,7 +8412,7 @@ rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
static VALUE
rb_str_each_grapheme_cluster(VALUE str)
{
RETURN_SIZED_ENUMERATOR(str, 0, 0, rb_str_each_char_size);
RETURN_SIZED_ENUMERATOR(str, 0, 0, rb_str_each_grapheme_cluster_size);
return rb_str_enumerate_grapheme_clusters(str, 0);
}