[前][次][番号順一覧][スレッド一覧]

ruby-changes:50719

From: naruse <ko1@a...>
Date: Thu, 22 Mar 2018 16:58:43 +0900 (JST)
Subject: [ruby-changes:50719] naruse:r62891 (trunk): Revert "each_grapheme_cluster shouldn't return size [Bug #14363]"

naruse	2018-03-22 16:58:37 +0900 (Thu, 22 Mar 2018)

  New Revision: 62891

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62891

  Log:
    Revert "each_grapheme_cluster shouldn't return size [Bug #14363]"
    
    This reverts commit r62887.

  Modified files:
    trunk/string.c
    trunk/test/ruby/test_string.rb
Index: test/ruby/test_string.rb
===================================================================
--- test/ruby/test_string.rb	(revision 62890)
+++ test/ruby/test_string.rb	(revision 62891)
@@ -989,9 +989,6 @@ CODE https://github.com/ruby/ruby/blob/trunk/test/ruby/test_string.rb#L989
     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})
-
-    assert_nil "\u{20 200d}".each_grapheme_cluster.size
-    assert_nil "\u{a 308}".each_grapheme_cluster.size
   end
 
   def test_grapheme_clusters
Index: string.c
===================================================================
--- string.c	(revision 62890)
+++ string.c	(revision 62891)
@@ -8426,7 +8426,7 @@ rb_str_enumerate_grapheme_clusters(VALUE https://github.com/ruby/ruby/blob/trunk/string.c#L8426
 static VALUE
 rb_str_each_grapheme_cluster(VALUE str)
 {
-    RETURN_ENUMERATOR(str, 0, 0);
+    RETURN_SIZED_ENUMERATOR(str, 0, 0, rb_str_each_char_size);
     return rb_str_enumerate_grapheme_clusters(str, 0);
 }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]