From 88eae35862f3b228443f116234cbf09057c361c8 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 30 May 2014 23:56:00 +0000 Subject: case-folding.rb: merge tables * enc/unicode/case-folding.rb (print_table): merge non-locale and locale tables, and reduce initializing loops. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enc/unicode/casefold.h | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'enc/unicode/casefold.h') diff --git a/enc/unicode/casefold.h b/enc/unicode/casefold.h index 4ea8050760..a433a22b5a 100644 --- a/enc/unicode/casefold.h +++ b/enc/unicode/casefold.h @@ -1,7 +1,8 @@ /* DO NOT EDIT THIS FILE. */ /* Generated by enc/unicode/case-folding.rb */ -static const CaseFold_11_Type CaseFold[] = { +static const CaseFold_11_Type CaseFold_11_Table[] = { +#define CaseFold (*(CaseFold_11_Type (*)[1129])(CaseFold_11_Table+0)) {0x0041, {1, {0x0061}}}, {0x0042, {1, {0x0062}}}, {0x0043, {1, {0x0063}}}, @@ -1131,14 +1132,13 @@ static const CaseFold_11_Type CaseFold[] = { {0x10425, {1, {0x1044d}}}, {0x10426, {1, {0x1044e}}}, {0x10427, {1, {0x1044f}}}, -}; - -static const CaseFold_11_Type CaseFold_Locale[] = { +#define CaseFold_Locale (*(CaseFold_11_Type (*)[2])(CaseFold_11_Table+1129)) {0x0049, {1, {0x0069}}}, {0x0130, {2, {0x0069, 0x0307}}}, }; -static const CaseUnfold_11_Type CaseUnfold_11[] = { +static const CaseUnfold_11_Type CaseUnfold_11_Table[] = { +#define CaseUnfold_11 (*(CaseUnfold_11_Type (*)[1005])(CaseUnfold_11_Table+0)) {0x0061, {1, {0x0041}}}, {0x0062, {1, {0x0042}}}, {0x0063, {1, {0x0043}}}, @@ -2144,13 +2144,12 @@ static const CaseUnfold_11_Type CaseUnfold_11[] = { {0x1044d, {1, {0x10425}}}, {0x1044e, {1, {0x10426}}}, {0x1044f, {1, {0x10427}}}, -}; - -static const CaseUnfold_11_Type CaseUnfold_11_Locale[] = { +#define CaseUnfold_11_Locale (*(CaseUnfold_11_Type (*)[1])(CaseUnfold_11_Table+1005)) {0x0069, {1, {0x0049}}}, }; -static const CaseUnfold_12_Type CaseUnfold_12[] = { +static const CaseUnfold_12_Type CaseUnfold_12_Table[] = { +#define CaseUnfold_12 (*(CaseUnfold_12_Type (*)[58])(CaseUnfold_12_Table+0)) {{0x0061, 0x02be}, {1, {0x1e9a}}}, {{0x0066, 0x0066}, {1, {0xfb00}}}, {{0x0066, 0x0069}, {1, {0xfb01}}}, @@ -2209,13 +2208,12 @@ static const CaseUnfold_12_Type CaseUnfold_12[] = { {{0x1f70, 0x03b9}, {1, {0x1fb2}}}, {{0x1f74, 0x03b9}, {1, {0x1fc2}}}, {{0x1f7c, 0x03b9}, {1, {0x1ff2}}}, -}; - -static const CaseUnfold_12_Type CaseUnfold_12_Locale[] = { +#define CaseUnfold_12_Locale (*(CaseUnfold_12_Type (*)[1])(CaseUnfold_12_Table+58)) {{0x0069, 0x0307}, {1, {0x0130}}}, }; -static const CaseUnfold_13_Type CaseUnfold_13[] = { +static const CaseUnfold_13_Type CaseUnfold_13_Table[] = { +#define CaseUnfold_13 (*(CaseUnfold_13_Type (*)[14])(CaseUnfold_13_Table+0)) {{0x0066, 0x0066, 0x0069}, {1, {0xfb03}}}, {{0x0066, 0x0066, 0x006c}, {1, {0xfb04}}}, {{0x03b1, 0x0342, 0x03b9}, {1, {0x1fb7}}}, -- cgit v1.2.3