make sure ascii character type has low index and maches CharacterType…

… constants
jruby · Dec 28, 2017 · 0235bc4 · 0235bc4
1 parent 048511b
commit 0235bc4
Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/scripts/generate.rb b/scripts/generate.rb
@@ -169,8 +169,9 @@ def generate_coderange_list
 
     ranges = unicode_src[/CodeRanges\[\]\s+=\s+\{(.*?)\}\;/m, 1].scan(/CR_(\w+)/).flatten
 
-    out = ranges.take(14).map{|range|[range.tr('_', '').downcase, range]} +
-    ranges.drop(14).map do |range|
+    standard_char_type_range = 15
+    out = ranges.take(standard_char_type_range).map{|range|[range.tr('_', '').downcase, range]} +
+    ranges.drop(standard_char_type_range).map do |range|
         name = range =~ /Age_(\d)_(\d)/ ? "age=#{$1}.#{$2}" : range.tr('_', '').downcase
         name = cr_map.delete(range) || name
         name = "#{$1}=#{$2}" if name =~ /(graphemeclusterbreak)(.*)/i

diff --git a/src/org/jcodings/unicode/UnicodeProperties.java b/src/org/jcodings/unicode/UnicodeProperties.java
@@ -37,7 +37,7 @@ public class UnicodeProperties {
         new CodeRangeEntry("xdigit", "CR_XDigit"),
         new CodeRangeEntry("word", "CR_Word"),
         new CodeRangeEntry("alnum", "CR_Alnum"),
-        new CodeRangeEntry("inbasiclatin", "CR_ASCII"),
+        new CodeRangeEntry("ascii", "CR_ASCII"),
         new CodeRangeEntry("any", "CR_Any"),
         new CodeRangeEntry("assigned", "CR_Assigned"),
         new CodeRangeEntry("c", "CR_C"),
@@ -512,7 +512,7 @@ public class UnicodeProperties {
         new CodeRangeEntry("graphemeclusterbreak=zwj", "CR_Grapheme_Cluster_Break_ZWJ"),
         new CodeRangeEntry("graphemeclusterbreak=glueafterzwj", "CR_Grapheme_Cluster_Break_Glue_After_Zwj"),
         new CodeRangeEntry("graphemeclusterbreak=ebasegaz", "CR_Grapheme_Cluster_Break_E_Base_GAZ"),
-        new CodeRangeEntry("ascii", "CR_ASCII"),
+        new CodeRangeEntry("inbasiclatin", "CR_ASCII"),
         new CodeRangeEntry("inlatin1supplement", "CR_In_Latin_1_Supplement"),
         new CodeRangeEntry("inlatinextendeda", "CR_In_Latin_Extended_A"),
         new CodeRangeEntry("inlatinextendedb", "CR_In_Latin_Extended_B"),