From d22db2048534bdf3d9615117291f9d86564ff10d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 19 Sep 2020 21:05:48 +0200 Subject: [PATCH] Separate addPropertyAliases in two methods The quantity of data used to generate addPropertyAliases creates a big method, that is too big for java and results in "error: code too large". This is most likely due to added data between the expected version of icu and the actual version of icu in Guix. --- .../org/antlr/v4/tool/templates/unicodedata.st | 17 ++++++++++++++--- .../unicode/UnicodeDataTemplateController.java | 18 ++++++++++-------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tool/resources/org/antlr/v4/tool/templates/unicodedata.st b/tool/resources/org/antlr/v4/tool/templates/unicodedata.st index 0f22c73..3573873 100644 --- a/tool/resources/org/antlr/v4/tool/templates/unicodedata.st +++ b/tool/resources/org/antlr/v4/tool/templates/unicodedata.st @@ -1,4 +1,4 @@ -unicodedata(propertyCodePointRanges, propertyAliases) ::= << +unicodedata(propertyCodePointRanges, propertyAliasesA, propertyAliasesB) ::= << package org.antlr.v4.unicode; import java.util.Arrays; @@ -15,7 +15,7 @@ import org.antlr.v4.runtime.misc.Interval; */ public abstract class UnicodeData { private static final Map\ propertyCodePointRanges = new HashMap\<\>(); - private static final Map\ propertyAliases = new HashMap\<\>(); + private static final Map\ propertyAliases = new HashMap\<\>( + ); // Work around Java 64k bytecode method limit by splitting up static // initialization into one method per Unicode property @@ -30,9 +30,20 @@ static private void addProperty() { propertyCodePointRanges.put("".toLowerCase(Locale.US), codePointRanges); \}}; separator="\n\n"> + // Property aliases + static private void addPropertyAliases1() { + ".toLowerCase(Locale.US), "".toLowerCase(Locale.US)); }; separator="\n"> + } + + // Property aliases + static private void addPropertyAliases2() { + ".toLowerCase(Locale.US), "".toLowerCase(Locale.US)); }; separator="\n"> + } + // Property aliases static private void addPropertyAliases() { - ".toLowerCase(Locale.US), "".toLowerCase(Locale.US)); }; separator="\n"> + addPropertyAliases1(); + addPropertyAliases2(); } // Put it all together diff --git a/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java b/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java index da244a3..dc591cb 100644 --- a/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java +++ b/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java @@ -78,17 +78,19 @@ public abstract class UnicodeDataTemplateController { addTR35ExtendedPictographicPropertyCodesToCodePointRanges(propertyCodePointRanges); addEmojiPresentationPropertyCodesToCodePointRanges(propertyCodePointRanges); - Map propertyAliases = new LinkedHashMap<>(); - addUnicodeCategoryCodesToNames(propertyAliases); - addUnicodeBinaryPropertyCodesToNames(propertyAliases); - addUnicodeScriptCodesToNames(propertyAliases); - addUnicodeBlocksToNames(propertyAliases); - addUnicodeIntPropertyCodesToNames(propertyAliases); - propertyAliases.put("EP", "Extended_Pictographic"); + Map propertyAliases1 = new LinkedHashMap<>(); + Map propertyAliases2 = new LinkedHashMap<>(); + addUnicodeCategoryCodesToNames(propertyAliases1); + addUnicodeBinaryPropertyCodesToNames(propertyAliases1); + addUnicodeScriptCodesToNames(propertyAliases1); + addUnicodeBlocksToNames(propertyAliases2); + addUnicodeIntPropertyCodesToNames(propertyAliases2); + propertyAliases2.put("EP", "Extended_Pictographic"); Map properties = new LinkedHashMap<>(); properties.put("propertyCodePointRanges", propertyCodePointRanges); - properties.put("propertyAliases", propertyAliases); + properties.put("propertyAliasesA", propertyAliases1); + properties.put("propertyAliasesB", propertyAliases2); return properties; } -- 2.28.0 ef='/guix/commit/gnu/packages/hardware.scm?id=ec756fa58cc9b8379b84bc048fcc143798971a57'>gnu: ddcutil: Update to 0.9.4....* gnu/packages/hardware.scm (ddcutil): Update to 0.9.4. Tobias Geerinckx-Rice 2018-10-24gnu: Add wavemon....* gnu/packages/hardware.scm (wavemon): New public variable. Tobias Geerinckx-Rice 2018-10-04gnu: ddcutil: Update to 0.9.2....* gnu/packages/hardware.scm (ddcutil): Update to 0.9.2. Tobias Geerinckx-Rice 2018-10-04gnu: Add memtester....* gnu/packages/hardware.scm (memtester): New public variable. Tobias Geerinckx-Rice 2018-10-04gnu: Add memtest86+....* gnu/packages/hardware.scm (memtest86+): New public variable. Tobias Geerinckx-Rice