зеркало из https://github.com/github/ruby.git
string.c: grapheme clusters on frozen string
* string.c (rb_str_enumerate_grapheme_clusters): enumerate on shared frozen string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
805d6f6f3c
Коммит
e568455826
5
string.c
5
string.c
|
@ -8019,6 +8019,7 @@ rb_str_codepoints(VALUE str)
|
|||
static VALUE
|
||||
rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
|
||||
{
|
||||
VALUE orig = str;
|
||||
regex_t *reg_grapheme_cluster = NULL;
|
||||
static regex_t *reg_grapheme_cluster_utf8 = NULL;
|
||||
int encidx = ENCODING_GET(str);
|
||||
|
@ -8046,6 +8047,7 @@ rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
|
|||
}
|
||||
}
|
||||
|
||||
if (!ary) str = rb_str_new_frozen(str);
|
||||
ptr = RSTRING_PTR(str);
|
||||
end = RSTRING_END(str);
|
||||
|
||||
|
@ -8060,10 +8062,11 @@ rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
|
|||
ENUM_ELEM(ary, rb_enc_str_new(ptr, len, enc));
|
||||
ptr += len;
|
||||
}
|
||||
RB_GC_GUARD(str);
|
||||
if (ary)
|
||||
return ary;
|
||||
else
|
||||
return str;
|
||||
return orig;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -919,6 +919,8 @@ CODE
|
|||
assert_equal ["\u000A", "\u0308"], "\u{a 308}".each_grapheme_cluster.to_a
|
||||
assert_equal ["\u000D", "\u0308"], "\u{d 308}".each_grapheme_cluster.to_a
|
||||
assert_equal ["a", "b", "c"], "abc".b.each_grapheme_cluster.to_a
|
||||
s = ("x"+"\u{10ABCD}"*250000)
|
||||
assert_empty(s.each_grapheme_cluster {s.clear})
|
||||
end
|
||||
|
||||
def test_grapheme_clusters
|
||||
|
|
Загрузка…
Ссылка в новой задаче