From e824e21beb4135f76a6e0f1e51ad578b53d53847 Mon Sep 17 00:00:00 2001 From: duerst Date: Thu, 6 Dec 2018 00:05:08 +0000 Subject: [PATCH] remove obsolete data from unicode.c * unicode.c: Remove the arrays onigenc_unicode_GCB_ranges_GAZ, onigenc_unicode_GCB_ranges_E_Base, and onigenc_unicode_GCB_ranges_Emoji, because they are not needed anymore for Unicode 11.0.0. * regparse.c: Remove external declarations for above arrays. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enc/unicode.c | 26 -------------------------- regparse.c | 4 ---- 2 files changed, 30 deletions(-) diff --git a/enc/unicode.c b/enc/unicode.c index 9e46689655..b3dbd55d32 100644 --- a/enc/unicode.c +++ b/enc/unicode.c @@ -793,32 +793,6 @@ SpecialsCopy: return (int )(to - to_start); } -/* These GAZ/E_Base/Emoji tables are for extended grapheme cluster */ -/* TODO: generate these 3 tables from Unicode data */ -const OnigCodePoint -onigenc_unicode_GCB_ranges_GAZ[] = { - 0, -}; - -const OnigCodePoint -onigenc_unicode_GCB_ranges_E_Base[] = { - 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, /* FEMALE SIGN */ - 0x2642, 0x2642, /* MALE SIGN */ - 0x2695, 0x2696, /* SCALES */ - 0x2708, 0x2708, /* AIRPLANE */ -}; - #if 0 const char onigenc_unicode_version_string[] = #ifdef ONIG_UNICODE_VERSION_STRING diff --git a/regparse.c b/regparse.c index 477e854904..9f739d82dc 100644 --- a/regparse.c +++ b/regparse.c @@ -5718,10 +5718,6 @@ add_property_to_cc(CClassNode* cc, const char* propname, int not, ScanEnv* env) return add_ctype_to_cc(cc, ctype, not, 0, env); } -extern const OnigCodePoint onigenc_unicode_GCB_ranges_GAZ[]; -extern const OnigCodePoint onigenc_unicode_GCB_ranges_E_Base[]; -extern const OnigCodePoint onigenc_unicode_GCB_ranges_Emoji[]; - /* * helper methods for node_extended_grapheme_cluster (/\X/) */