summaryrefslogtreecommitdiff
path: root/enc/unicode/case-folding.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-30 23:56:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-30 23:56:00 +0000
commit88eae35862f3b228443f116234cbf09057c361c8 (patch)
tree8c41fd4f70788aa16945c5ccad5f6ffedbff03ee /enc/unicode/case-folding.rb
parent1d588b4fde447d38c978a11b8e89ae8b5436f2e8 (diff)
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
Diffstat (limited to 'enc/unicode/case-folding.rb')
-rwxr-xr-xenc/unicode/case-folding.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/enc/unicode/case-folding.rb b/enc/unicode/case-folding.rb
index 09fc719ba9..f1faaebf05 100755
--- a/enc/unicode/case-folding.rb
+++ b/enc/unicode/case-folding.rb
@@ -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"