calculate max property length at generation time

jruby · Apr 18, 2018 · 2ea6140 · 2ea6140
1 parent 82ff7a0
commit 2ea6140
Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/scripts/UnicodePropertiesTemplate.java b/scripts/UnicodePropertiesTemplate.java
@@ -25,4 +25,6 @@ public class UnicodeProperties {
     static final CodeRangeEntry[]CodeRangeTable = new CodeRangeEntry[] {
 %{extcrs}
     };
+
+    static final int MAX_WORD_LENGTH = %{max_length};
 }
diff --git a/scripts/generate.rb b/scripts/generate.rb
@@ -180,9 +180,10 @@ def generate_coderange_list
         name = "#{$1}=#{$2}" if name =~ /(graphemeclusterbreak)(.*)/i
         ([name] + aliases[name].to_a).map{|n|[n, range]}
     end.flatten(1)
+    max_length = out.max_by{|name, table|name.length}.first.length.to_s
 
     open("#{SRC_DIR}/unicode/UnicodeProperties.java", "wb") do |f| f <<
-        open("UnicodePropertiesTemplate.java", "rb").read.sub(/%\{extcrs\}/, out.map{|name, table| "#{INDENT * 2}" + "new CodeRangeEntry(\"#{name}\", \"CR_#{table}\")"}.join(",\n"))
+        open("UnicodePropertiesTemplate.java", "rb").read.sub(/%\{max_length\}/, max_length).sub(/%\{extcrs\}/, out.map{|name, table| "#{INDENT * 2}" + "new CodeRangeEntry(\"#{name}\", \"CR_#{table}\")"}.join(",\n"))
     end
 end
 

diff --git a/src/org/jcodings/unicode/UnicodeEncoding.java b/src/org/jcodings/unicode/UnicodeEncoding.java
@@ -38,11 +38,8 @@
 import org.jcodings.util.IntArrayHash;
 import org.jcodings.util.IntHash;
 
-
 public abstract class UnicodeEncoding extends MultiByteEncoding {
-
-    private static final int MAX_WORD_LENGTH = Config.USE_UNICODE_PROPERTIES ? 44 : 6;
-    private static final int PROPERTY_NAME_MAX_SIZE = MAX_WORD_LENGTH + 1;
+    private static final int PROPERTY_NAME_MAX_SIZE = UnicodeProperties.MAX_WORD_LENGTH + 1;
     static final int I_WITH_DOT_ABOVE = 0x0130;
     static final int DOTLESS_i = 0x0131;
     static final int DOT_ABOVE = 0x0307;

diff --git a/src/org/jcodings/unicode/UnicodeProperties.java b/src/org/jcodings/unicode/UnicodeProperties.java
@@ -819,4 +819,6 @@ public class UnicodeProperties {
         new CodeRangeEntry("insupplementaryprivateuseareab", "CR_In_Supplementary_Private_Use_Area_B"),
         new CodeRangeEntry("innoblock", "CR_In_No_Block")
     };
+
+    static final int MAX_WORD_LENGTH = 44;
 }