jruby · Jan 3, 2016 · Jan 3, 2016 · Jan 3, 2016 · Jan 3, 2016
diff --git a/resources/tables/CR_Age_6_2.bin b/resources/tables/CR_Age_6_2.bin
diff --git a/resources/tables/CR_Age_6_3.bin b/resources/tables/CR_Age_6_3.bin
diff --git a/resources/tables/CR_Age_7_0.bin b/resources/tables/CR_Age_7_0.bin
diff --git a/resources/tables/CR_Age_8_0.bin b/resources/tables/CR_Age_8_0.bin
diff --git a/resources/tables/CR_Ahom.bin b/resources/tables/CR_Ahom.bin
diff --git a/resources/tables/CR_Alnum.bin b/resources/tables/CR_Alnum.bin
diff --git a/resources/tables/CR_Alpha.bin b/resources/tables/CR_Alpha.bin
diff --git a/resources/tables/CR_Anatolian_Hieroglyphs.bin b/resources/tables/CR_Anatolian_Hieroglyphs.bin
diff --git a/resources/tables/CR_Arabic.bin b/resources/tables/CR_Arabic.bin
diff --git a/resources/tables/CR_Armenian.bin b/resources/tables/CR_Armenian.bin
diff --git a/resources/tables/CR_Assigned.bin b/resources/tables/CR_Assigned.bin
diff --git a/resources/tables/CR_Bassa_Vah.bin b/resources/tables/CR_Bassa_Vah.bin
diff --git a/resources/tables/CR_Bengali.bin b/resources/tables/CR_Bengali.bin
diff --git a/resources/tables/CR_Bidi_Control.bin b/resources/tables/CR_Bidi_Control.bin
diff --git a/resources/tables/CR_Blank.bin b/resources/tables/CR_Blank.bin
diff --git a/resources/tables/CR_Brahmi.bin b/resources/tables/CR_Brahmi.bin
diff --git a/resources/tables/CR_C.bin b/resources/tables/CR_C.bin
diff --git a/resources/tables/CR_Case_Ignorable.bin b/resources/tables/CR_Case_Ignorable.bin
diff --git a/resources/tables/CR_Cased.bin b/resources/tables/CR_Cased.bin
diff --git a/resources/tables/CR_Caucasian_Albanian.bin b/resources/tables/CR_Caucasian_Albanian.bin
diff --git a/resources/tables/CR_Cf.bin b/resources/tables/CR_Cf.bin
diff --git a/resources/tables/CR_Changes_When_Casefolded.bin b/resources/tables/CR_Changes_When_Casefolded.bin
diff --git a/resources/tables/CR_Changes_When_Casemapped.bin b/resources/tables/CR_Changes_When_Casemapped.bin
diff --git a/resources/tables/CR_Changes_When_Lowercased.bin b/resources/tables/CR_Changes_When_Lowercased.bin
diff --git a/resources/tables/CR_Changes_When_Titlecased.bin b/resources/tables/CR_Changes_When_Titlecased.bin
diff --git a/resources/tables/CR_Changes_When_Uppercased.bin b/resources/tables/CR_Changes_When_Uppercased.bin
diff --git a/resources/tables/CR_Cherokee.bin b/resources/tables/CR_Cherokee.bin
diff --git a/resources/tables/CR_Cn.bin b/resources/tables/CR_Cn.bin
diff --git a/resources/tables/CR_Common.bin b/resources/tables/CR_Common.bin
diff --git a/resources/tables/CR_Cuneiform.bin b/resources/tables/CR_Cuneiform.bin
diff --git a/resources/tables/CR_Cyrillic.bin b/resources/tables/CR_Cyrillic.bin
diff --git a/resources/tables/CR_Dash.bin b/resources/tables/CR_Dash.bin
diff --git a/resources/tables/CR_Default_Ignorable_Code_Point.bin b/resources/tables/CR_Default_Ignorable_Code_Point.bin
diff --git a/resources/tables/CR_Deprecated.bin b/resources/tables/CR_Deprecated.bin
diff --git a/resources/tables/CR_Devanagari.bin b/resources/tables/CR_Devanagari.bin
diff --git a/resources/tables/CR_Diacritic.bin b/resources/tables/CR_Diacritic.bin
diff --git a/resources/tables/CR_Digit.bin b/resources/tables/CR_Digit.bin
diff --git a/resources/tables/CR_Duployan.bin b/resources/tables/CR_Duployan.bin
diff --git a/resources/tables/CR_Elbasan.bin b/resources/tables/CR_Elbasan.bin
diff --git a/resources/tables/CR_Extender.bin b/resources/tables/CR_Extender.bin
diff --git a/resources/tables/CR_Grantha.bin b/resources/tables/CR_Grantha.bin
diff --git a/resources/tables/CR_Graph.bin b/resources/tables/CR_Graph.bin
diff --git a/resources/tables/CR_Grapheme_Base.bin b/resources/tables/CR_Grapheme_Base.bin
diff --git a/resources/tables/CR_Grapheme_Extend.bin b/resources/tables/CR_Grapheme_Extend.bin
diff --git a/resources/tables/CR_Grapheme_Link.bin b/resources/tables/CR_Grapheme_Link.bin
diff --git a/resources/tables/CR_Greek.bin b/resources/tables/CR_Greek.bin
diff --git a/resources/tables/CR_Gujarati.bin b/resources/tables/CR_Gujarati.bin
diff --git a/resources/tables/CR_Han.bin b/resources/tables/CR_Han.bin
diff --git a/resources/tables/CR_Hatran.bin b/resources/tables/CR_Hatran.bin
diff --git a/resources/tables/CR_ID_Continue.bin b/resources/tables/CR_ID_Continue.bin
diff --git a/resources/tables/CR_ID_Start.bin b/resources/tables/CR_ID_Start.bin
diff --git a/resources/tables/CR_Ideographic.bin b/resources/tables/CR_Ideographic.bin
diff --git a/resources/tables/CR_In_Ahom.bin b/resources/tables/CR_In_Ahom.bin
diff --git a/resources/tables/CR_In_Anatolian_Hieroglyphs.bin b/resources/tables/CR_In_Anatolian_Hieroglyphs.bin
diff --git a/resources/tables/CR_In_Bassa_Vah.bin b/resources/tables/CR_In_Bassa_Vah.bin
diff --git a/resources/tables/CR_In_CJK_Unified_Ideographs_Extension_E.bin b/resources/tables/CR_In_CJK_Unified_Ideographs_Extension_E.bin
diff --git a/resources/tables/CR_In_Caucasian_Albanian.bin b/resources/tables/CR_In_Caucasian_Albanian.bin
diff --git a/resources/tables/CR_In_Cherokee_Supplement.bin b/resources/tables/CR_In_Cherokee_Supplement.bin
diff --git a/resources/tables/CR_In_Combining_Diacritical_Marks_Extended.bin b/resources/tables/CR_In_Combining_Diacritical_Marks_Extended.bin
diff --git a/resources/tables/CR_In_Coptic_Epact_Numbers.bin b/resources/tables/CR_In_Coptic_Epact_Numbers.bin
diff --git a/resources/tables/CR_In_Duployan.bin b/resources/tables/CR_In_Duployan.bin
diff --git a/resources/tables/CR_In_Early_Dynastic_Cuneiform.bin b/resources/tables/CR_In_Early_Dynastic_Cuneiform.bin
diff --git a/resources/tables/CR_In_Elbasan.bin b/resources/tables/CR_In_Elbasan.bin
diff --git a/resources/tables/CR_In_Geometric_Shapes_Extended.bin b/resources/tables/CR_In_Geometric_Shapes_Extended.bin
diff --git a/resources/tables/CR_In_Grantha.bin b/resources/tables/CR_In_Grantha.bin
diff --git a/resources/tables/CR_In_Hatran.bin b/resources/tables/CR_In_Hatran.bin
diff --git a/resources/tables/CR_In_Kayah_Li.bin b/resources/tables/CR_In_Kayah_Li.bin
diff --git a/resources/tables/CR_In_Khojki.bin b/resources/tables/CR_In_Khojki.bin
diff --git a/resources/tables/CR_In_Khudawadi.bin b/resources/tables/CR_In_Khudawadi.bin
diff --git a/resources/tables/CR_In_Latin_Extended_E.bin b/resources/tables/CR_In_Latin_Extended_E.bin
diff --git a/resources/tables/CR_In_Linear_A.bin b/resources/tables/CR_In_Linear_A.bin
diff --git a/resources/tables/CR_In_Mahajani.bin b/resources/tables/CR_In_Mahajani.bin
diff --git a/resources/tables/CR_In_Manichaean.bin b/resources/tables/CR_In_Manichaean.bin
diff --git a/resources/tables/CR_In_Mende_Kikakui.bin b/resources/tables/CR_In_Mende_Kikakui.bin
diff --git a/resources/tables/CR_In_Modi.bin b/resources/tables/CR_In_Modi.bin
diff --git a/resources/tables/CR_In_Mro.bin b/resources/tables/CR_In_Mro.bin
diff --git a/resources/tables/CR_In_Multani.bin b/resources/tables/CR_In_Multani.bin
diff --git a/resources/tables/CR_In_Myanmar_Extended_B.bin b/resources/tables/CR_In_Myanmar_Extended_B.bin
diff --git a/resources/tables/CR_In_Nabataean.bin b/resources/tables/CR_In_Nabataean.bin
diff --git a/resources/tables/CR_In_No_Block.bin b/resources/tables/CR_In_No_Block.bin
diff --git a/resources/tables/CR_In_Old_Hungarian.bin b/resources/tables/CR_In_Old_Hungarian.bin
diff --git a/resources/tables/CR_In_Old_Permic.bin b/resources/tables/CR_In_Old_Permic.bin
diff --git a/resources/tables/CR_In_Ornamental_Dingbats.bin b/resources/tables/CR_In_Ornamental_Dingbats.bin
diff --git a/resources/tables/CR_In_Pahawh_Hmong.bin b/resources/tables/CR_In_Pahawh_Hmong.bin
diff --git a/resources/tables/CR_In_Pau_Cin_Hau.bin b/resources/tables/CR_In_Pau_Cin_Hau.bin
diff --git a/resources/tables/CR_In_Psalter_Pahlavi.bin b/resources/tables/CR_In_Psalter_Pahlavi.bin
diff --git a/resources/tables/CR_In_Shorthand_Format_Controls.bin b/resources/tables/CR_In_Shorthand_Format_Controls.bin
diff --git a/resources/tables/CR_In_Siddham.bin b/resources/tables/CR_In_Siddham.bin
diff --git a/resources/tables/CR_In_Sinhala_Archaic_Numbers.bin b/resources/tables/CR_In_Sinhala_Archaic_Numbers.bin
diff --git a/resources/tables/CR_In_Supplemental_Arrows_C.bin b/resources/tables/CR_In_Supplemental_Arrows_C.bin
diff --git a/resources/tables/CR_In_Supplemental_Symbols_and_Pictographs.bin b/resources/tables/CR_In_Supplemental_Symbols_and_Pictographs.bin
diff --git a/resources/tables/CR_In_Sutton_SignWriting.bin b/resources/tables/CR_In_Sutton_SignWriting.bin
diff --git a/resources/tables/CR_In_Tirhuta.bin b/resources/tables/CR_In_Tirhuta.bin
diff --git a/resources/tables/CR_In_Warang_Citi.bin b/resources/tables/CR_In_Warang_Citi.bin
diff --git a/resources/tables/CR_Inherited.bin b/resources/tables/CR_Inherited.bin
diff --git a/resources/tables/CR_Javanese.bin b/resources/tables/CR_Javanese.bin
diff --git a/resources/tables/CR_Kannada.bin b/resources/tables/CR_Kannada.bin
diff --git a/resources/tables/CR_Kayah_Li.bin b/resources/tables/CR_Kayah_Li.bin
diff --git a/resources/tables/CR_Khojki.bin b/resources/tables/CR_Khojki.bin
diff --git a/resources/tables/CR_Khudawadi.bin b/resources/tables/CR_Khudawadi.bin
diff --git a/resources/tables/CR_L.bin b/resources/tables/CR_L.bin
diff --git a/resources/tables/CR_LC.bin b/resources/tables/CR_LC.bin
diff --git a/resources/tables/CR_Latin.bin b/resources/tables/CR_Latin.bin
diff --git a/resources/tables/CR_Limbu.bin b/resources/tables/CR_Limbu.bin
diff --git a/resources/tables/CR_Linear_A.bin b/resources/tables/CR_Linear_A.bin
diff --git a/resources/tables/CR_Ll.bin b/resources/tables/CR_Ll.bin
diff --git a/resources/tables/CR_Lm.bin b/resources/tables/CR_Lm.bin
diff --git a/resources/tables/CR_Lo.bin b/resources/tables/CR_Lo.bin
diff --git a/resources/tables/CR_Logical_Order_Exception.bin b/resources/tables/CR_Logical_Order_Exception.bin
diff --git a/resources/tables/CR_Lower.bin b/resources/tables/CR_Lower.bin
diff --git a/resources/tables/CR_Lu.bin b/resources/tables/CR_Lu.bin
diff --git a/resources/tables/CR_M.bin b/resources/tables/CR_M.bin
diff --git a/resources/tables/CR_Mahajani.bin b/resources/tables/CR_Mahajani.bin
diff --git a/resources/tables/CR_Malayalam.bin b/resources/tables/CR_Malayalam.bin
diff --git a/resources/tables/CR_Manichaean.bin b/resources/tables/CR_Manichaean.bin
diff --git a/resources/tables/CR_Mc.bin b/resources/tables/CR_Mc.bin
diff --git a/resources/tables/CR_Me.bin b/resources/tables/CR_Me.bin
diff --git a/resources/tables/CR_Mende_Kikakui.bin b/resources/tables/CR_Mende_Kikakui.bin
diff --git a/resources/tables/CR_Meroitic_Cursive.bin b/resources/tables/CR_Meroitic_Cursive.bin
diff --git a/resources/tables/CR_Mn.bin b/resources/tables/CR_Mn.bin
diff --git a/resources/tables/CR_Modi.bin b/resources/tables/CR_Modi.bin
diff --git a/resources/tables/CR_Mro.bin b/resources/tables/CR_Mro.bin
diff --git a/resources/tables/CR_Multani.bin b/resources/tables/CR_Multani.bin
diff --git a/resources/tables/CR_Myanmar.bin b/resources/tables/CR_Myanmar.bin
diff --git a/resources/tables/CR_N.bin b/resources/tables/CR_N.bin
diff --git a/resources/tables/CR_Nabataean.bin b/resources/tables/CR_Nabataean.bin
diff --git a/resources/tables/CR_Nl.bin b/resources/tables/CR_Nl.bin
diff --git a/resources/tables/CR_No.bin b/resources/tables/CR_No.bin
diff --git a/resources/tables/CR_Old_Hungarian.bin b/resources/tables/CR_Old_Hungarian.bin
diff --git a/resources/tables/CR_Old_Italic.bin b/resources/tables/CR_Old_Italic.bin
diff --git a/resources/tables/CR_Old_North_Arabian.bin b/resources/tables/CR_Old_North_Arabian.bin
diff --git a/resources/tables/CR_Old_Permic.bin b/resources/tables/CR_Old_Permic.bin
diff --git a/resources/tables/CR_Other_Alphabetic.bin b/resources/tables/CR_Other_Alphabetic.bin
diff --git a/resources/tables/CR_Other_Default_Ignorable_Code_Point.bin b/resources/tables/CR_Other_Default_Ignorable_Code_Point.bin
diff --git a/resources/tables/CR_Other_Grapheme_Extend.bin b/resources/tables/CR_Other_Grapheme_Extend.bin
diff --git a/resources/tables/CR_Other_Lowercase.bin b/resources/tables/CR_Other_Lowercase.bin
diff --git a/resources/tables/CR_Other_Math.bin b/resources/tables/CR_Other_Math.bin
diff --git a/resources/tables/CR_Other_Uppercase.bin b/resources/tables/CR_Other_Uppercase.bin
diff --git a/resources/tables/CR_Pahawh_Hmong.bin b/resources/tables/CR_Pahawh_Hmong.bin
diff --git a/resources/tables/CR_Palmyrene.bin b/resources/tables/CR_Palmyrene.bin
diff --git a/resources/tables/CR_Pau_Cin_Hau.bin b/resources/tables/CR_Pau_Cin_Hau.bin
diff --git a/resources/tables/CR_Pd.bin b/resources/tables/CR_Pd.bin
diff --git a/resources/tables/CR_Pe.bin b/resources/tables/CR_Pe.bin
diff --git a/resources/tables/CR_Po.bin b/resources/tables/CR_Po.bin
diff --git a/resources/tables/CR_Print.bin b/resources/tables/CR_Print.bin
diff --git a/resources/tables/CR_Ps.bin b/resources/tables/CR_Ps.bin
diff --git a/resources/tables/CR_Psalter_Pahlavi.bin b/resources/tables/CR_Psalter_Pahlavi.bin
diff --git a/resources/tables/CR_Punct.bin b/resources/tables/CR_Punct.bin
diff --git a/resources/tables/CR_Quotation_Mark.bin b/resources/tables/CR_Quotation_Mark.bin
diff --git a/resources/tables/CR_Runic.bin b/resources/tables/CR_Runic.bin
diff --git a/resources/tables/CR_S.bin b/resources/tables/CR_S.bin
diff --git a/resources/tables/CR_STerm.bin b/resources/tables/CR_STerm.bin
diff --git a/resources/tables/CR_Sc.bin b/resources/tables/CR_Sc.bin
diff --git a/resources/tables/CR_Sharada.bin b/resources/tables/CR_Sharada.bin
diff --git a/resources/tables/CR_Siddham.bin b/resources/tables/CR_Siddham.bin
diff --git a/resources/tables/CR_SignWriting.bin b/resources/tables/CR_SignWriting.bin
diff --git a/resources/tables/CR_Sinhala.bin b/resources/tables/CR_Sinhala.bin
diff --git a/resources/tables/CR_Sk.bin b/resources/tables/CR_Sk.bin
diff --git a/resources/tables/CR_Sm.bin b/resources/tables/CR_Sm.bin
diff --git a/resources/tables/CR_So.bin b/resources/tables/CR_So.bin
diff --git a/resources/tables/CR_Space.bin b/resources/tables/CR_Space.bin
diff --git a/resources/tables/CR_Telugu.bin b/resources/tables/CR_Telugu.bin
diff --git a/resources/tables/CR_Terminal_Punctuation.bin b/resources/tables/CR_Terminal_Punctuation.bin
diff --git a/resources/tables/CR_Tirhuta.bin b/resources/tables/CR_Tirhuta.bin
diff --git a/resources/tables/CR_Unified_Ideograph.bin b/resources/tables/CR_Unified_Ideograph.bin
diff --git a/resources/tables/CR_Unknown.bin b/resources/tables/CR_Unknown.bin
diff --git a/resources/tables/CR_Upper.bin b/resources/tables/CR_Upper.bin
diff --git a/resources/tables/CR_Warang_Citi.bin b/resources/tables/CR_Warang_Citi.bin
diff --git a/resources/tables/CR_Word.bin b/resources/tables/CR_Word.bin
diff --git a/resources/tables/CR_XID_Continue.bin b/resources/tables/CR_XID_Continue.bin
diff --git a/resources/tables/CR_XID_Start.bin b/resources/tables/CR_XID_Start.bin
diff --git a/resources/tables/CR_Z.bin b/resources/tables/CR_Z.bin
diff --git a/resources/tables/CR_Zs.bin b/resources/tables/CR_Zs.bin
diff --git a/scripts/ExtractTables.rb b/scripts/ExtractTables.rb
@@ -3,6 +3,7 @@
 
 enc_path = "#{repo_path}/enc"
 folds_src = open("#{enc_path}/unicode.c").read
+unicode_h = open("#{enc_path}/unicode/name2ctype.h").read
 unicode_src = open("#{enc_path}/unicode/name2ctype.src").read
 
 dst_dir = "../src/org/jcodings"
@@ -115,7 +116,7 @@ def extract_to to, file
   end
 end
 
-unicode_src.scan(/static\s+const\s+(\w+)\s+(\w+)\[\]\s+=\s+\{(.*?)\}\;/m).each do |(type, name, tab)|
+unicode_h.scan(/static\s+const\s+(\w+)\s+(\w+)\[\]\s+=\s+\{(.*?)\}\;/m).each do |(type, name, tab)|
   tab = tab.split(",").map { |e| e.strip }
   assert_eq(tab.last, "")
   tab.pop
@@ -169,6 +170,8 @@ def extract_to to, file
   end
 end
 
+raise 'can\'t find encdb.h - you need to configure and build MRI' unless File.exist? "#{repo_path}/encdb.h"
+
 defines, other = open("#{repo_path}/encdb.h").read.tr('()', '').scan(/ENC_([A-Z_]+)(.*?);/m).partition { |a, b| a =~ /DEFINE/ }
 
 open("#{dst_dir}/EncodingList.java", "wb") { |f| f << open("EncodingListTemplate.java", "rb").read.