summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-02 10:07:42 (GMT)
committerduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-02 10:07:42 (GMT)
commita96a594f9978b28d2d374f4a0fc15f5a2224df9b (patch)
tree632d96c10fc85d54abc444cb177b07255cfccd61
parent1752d13827392df756389f65dfc82bc2a0416fc7 (diff)
solve the genie/zombie/wrestlers bug
enc/unicode.c: - Add U+1F93C (WRESTLERS), U+1F9DE (GENIE), and U+1F9DF to onigenc_unicode_GCB_ranges_E_Base. - Add comments with character names. test/ruby/enc/test_emoji_breaks.rb: Activate tests for genie/zombie/wrestlers. This closes issue #15343. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--enc/unicode.c18
-rw-r--r--test/ruby/enc/test_emoji_breaks.rb3
2 files changed, 10 insertions, 11 deletions
diff --git a/enc/unicode.c b/enc/unicode.c
index b08b145..9e46689 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -802,19 +802,21 @@ onigenc_unicode_GCB_ranges_GAZ[] = {
const OnigCodePoint
onigenc_unicode_GCB_ranges_E_Base[] = {
- 3,
- 0x1F3F3, 0x1F3F3,
- 0x1F441, 0x1F441,
- 0x1F46F, 0x1F46F,
+ 5,
+ 0x1F3F3, 0x1F3F3, /* WAVING WHITE FLAG */
+ 0x1F441, 0x1F441, /* EYE */
+ 0x1F46F, 0x1F46F, /* WOMAN WITH BUNNY EARS */
+ 0x1F93C, 0x1F93C, /* WRESTLERS */
+ 0x1F9DE, 0x1F9DF, /* GENIE, ZOMBIE */
};
const OnigCodePoint
onigenc_unicode_GCB_ranges_Emoji[] = {
4,
- 0x2640, 0x2640,
- 0x2642, 0x2642,
- 0x2695, 0x2696,
- 0x2708, 0x2708,
+ 0x2640, 0x2640, /* FEMALE SIGN */
+ 0x2642, 0x2642, /* MALE SIGN */
+ 0x2695, 0x2696, /* SCALES */
+ 0x2708, 0x2708, /* AIRPLANE */
};
#if 0
diff --git a/test/ruby/enc/test_emoji_breaks.rb b/test/ruby/enc/test_emoji_breaks.rb
index 78aa5db..932dda3 100644
--- a/test/ruby/enc/test_emoji_breaks.rb
+++ b/test/ruby/enc/test_emoji_breaks.rb
@@ -25,9 +25,6 @@ class BreakTest
# raise ArgumentError if 0xD800 <= c and c <= 0xDFFF
c.chr('UTF-8')
end.join
- raise ArgumentError if data.match? /genie/ or comment.match? /genie/
- raise ArgumentError if data.match? /zombie/ or comment.match? /zombie/
- raise ArgumentError if data.match? /wrestling/ or comment.match? /wrestling/
end
end