kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

case-folding.rb: merge tables

Browse source 
* 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
This commit is contained in:
nobu 2014-05-30 23:56:00 +00:00
parent 1d588b4fde
commit 88eae35862
4 changed files with 30 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Sat May 31 08:54:58 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sat May 31 08:55:58 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enc/unicode/case-folding.rb (print_table): merge non-locale and
locale tables, and reduce initializing loops.
* enc/unicode/case-folding.rb (CaseFolding): modularize, and add
--output-file option.

30
enc/unicode.c
View file

@ -236,46 +236,30 @@ static int CaseFoldInited = 0;
static int init_case_fold_table(void)
{
const CaseFold_11_Type *p;
const CaseUnfold_11_Type *p1;
const CaseUnfold_12_Type *p2;
const CaseUnfold_13_Type *p3;
int i;
THREAD_ATOMIC_START;
FoldTable = st_init_numtable_with_size(FOLD_TABLE_SIZE);
if (ONIG_IS_NULL(FoldTable)) return ONIGERR_MEMORY;
for (i = 0; i < numberof(CaseFold); i++) {
p = &CaseFold[i];
st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
}
for (i = 0; i < numberof(CaseFold_Locale); i++) {
p = &CaseFold_Locale[i];
for (i = 0; i < numberof(CaseFold_11_Table); i++) {
const CaseFold_11_Type *p = &CaseFold_11_Table[i];
st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
}
Unfold1Table = st_init_numtable_with_size(UNFOLD1_TABLE_SIZE);
if (ONIG_IS_NULL(Unfold1Table)) return ONIGERR_MEMORY;
for (i = 0; i < numberof(CaseUnfold_11); i++) {
p1 = &CaseUnfold_11[i];
st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
}
for (i = 0; i < numberof(CaseUnfold_11_Locale); i++) {
p1 = &CaseUnfold_11_Locale[i];
for (i = 0; i < numberof(CaseUnfold_11_Table); i++) {
const CaseUnfold_11_Type *p1 = &CaseUnfold_11_Table[i];
st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
}
Unfold2Table = st_init_table_with_size(&type_code2_hash, UNFOLD2_TABLE_SIZE);
if (ONIG_IS_NULL(Unfold2Table)) return ONIGERR_MEMORY;
for (i = 0; i < numberof(CaseUnfold_12); i++) {
p2 = &CaseUnfold_12[i];
st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
}
for (i = 0; i < numberof(CaseUnfold_12_Locale); i++) {
p2 = &CaseUnfold_12_Locale[i];
for (i = 0; i < numberof(CaseUnfold_12_Table); i++) {
const CaseUnfold_12_Type *p2 = &CaseUnfold_12_Table[i];
st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
}
@ -283,7 +267,7 @@ static int init_case_fold_table(void)
if (ONIG_IS_NULL(Unfold3Table)) return ONIGERR_MEMORY;
for (i = 0; i < numberof(CaseUnfold_13); i++) {
p3 = &CaseUnfold_13[i];
const CaseUnfold_13_Type *p3 = &CaseUnfold_13[i];
st_add_direct(Unfold3Table, (st_data_t )p3->from, (st_data_t )(&p3->to));
}

16
enc/unicode/case-folding.rb
View file

@ -20,11 +20,14 @@ class CaseFolding
end
def print_table(dest, type, data)
dest.print("static const #{type}_Type #{type}_Table[] = {\n")
i = 0
data.each do |n, d|
dest.print("static const #{type}_Type #{n}[] = {\n")
dest.print("#define #{n} (*(#{type}_Type (*)[#{d.size}])(#{type}_Table+#{i}))\n")
i += d.size
print_table_1(dest, d)
dest.print("};\n\n")
end
dest.print("};\n\n")
end
end
@ -82,20 +85,17 @@ class CaseFolding
# CaseFold + CaseFold_Locale
name = "CaseFold_11"
print_table(dest, name, "CaseFold"=>fold)
print_table(dest, name, "CaseFold_Locale"=>fold_locale)
print_table(dest, name, "CaseFold"=>fold, "CaseFold_Locale"=>fold_locale)
# print unfolding data
# CaseUnfold_11 + CaseUnfold_11_Locale
name = "CaseUnfold_11"
print_table(dest, name, name=>unfold[0])
print_table(dest, name, "#{name}_Locale"=>unfold_locale[0])
print_table(dest, name, name=>unfold[0], "#{name}_Locale"=>unfold_locale[0])
# CaseUnfold_12 + CaseUnfold_12_Locale
name = "CaseUnfold_12"
print_table(dest, name, name=>unfold[1])
print_table(dest, name, "#{name}_Locale"=>unfold_locale[1])
print_table(dest, name, name=>unfold[1], "#{name}_Locale"=>unfold_locale[1])
# CaseUnfold_13
name = "CaseUnfold_13"

24
enc/unicode/casefold.h
View file

@ -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}}},