Apply suggestions from code review

- TODOs around 13.1 irregularities (unicode-org#100) - explaining why there is a CheckEmojiProps2.java - improving tool output
macchiati · Jul 17, 2021 · 16b972c · 16b972c
1 parent f23eb0d
commit 16b972c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/unicodetools/org/unicode/props/ExtraPropertyValueAliases.txt b/unicodetools/org/unicode/props/ExtraPropertyValueAliases.txt
@@ -146,4 +146,5 @@ sc ; Zsye                             ; Emoji_Symbols
 sc ; Zsym                             ; Other_Symbols
 sc ; Zxxx                             ; Unwritten
 
+# TODO: there is no Unicode 13.1, see https://github.com/unicode-org/unicodetools/issues/100
 age; 13.1                             ; V13_1
diff --git a/unicodetools/org/unicode/props/UcdPropertyValues.java b/unicodetools/org/unicode/props/UcdPropertyValues.java
@@ -55,7 +55,7 @@ public enum Age_Values implements Named {
         V12_0("12.0"),
         V12_1("12.1"),
         V13_0("13.0"),
-        V13_1("13.1"),
+        V13_1("13.1"), // TODO: there is no Unicode 13.1, see https://github.com/unicode-org/unicodetools/issues/100
         V14_0("14.0"),
         Unassigned("NA");
         private final PropertyNames<Age_Values> names;

diff --git a/unicodetools/org/unicode/propstest/CheckEmojiProps2.java b/unicodetools/org/unicode/propstest/CheckEmojiProps2.java
@@ -7,9 +7,11 @@
 import com.google.common.collect.Sets;
 import com.ibm.icu.text.UnicodeSet;
 
-/**
- * PR #44 added this class, but it was obviously added under the same name with
- * different code at another time. Re-adding under a different name.
+/*
+Note:
+- in Feb 2021  org.unicode.propstest.CheckEmojiProps was added in 968c94c (PR#44) but not merged.  To reduce confusion, this class has been renamed to CheckEmojiProps2.
+- in June 2021 added org.unicode.propstest.CheckEmojiProps was added in 163def1 in CLDR 14.0 keyword fixes (PR#65) with different content.
+- Both of these are not to be confused with org.unicode.tools.CheckEmojiProps 
  */
 public class CheckEmojiProps2 {
     static IndexUnicodeProperties IUP = IndexUnicodeProperties.make();

diff --git a/unicodetools/org/unicode/propstest/ListProps.java b/unicodetools/org/unicode/propstest/ListProps.java
@@ -41,7 +41,7 @@ public class ListProps {
 
     public static void main(String[] args) {
         IndexUnicodeProperties latest = IndexUnicodeProperties.make();
-        System.out.println("UCD: " + latest.getUcdVersion());
+        System.out.println(ListProps.class.getName() + ": UCD: " + latest.getUcdVersion());
 //        if (true) {
 //             Set<Script_Values> sc = EnumSet.copyOf(latest.loadEnum(UcdProperty.Script, Script_Values.class).values());
 //             sc.remove(Script_Values.Inherited);

diff --git a/unicodetools/org/unicode/text/utility/Settings.java b/unicodetools/org/unicode/text/utility/Settings.java
@@ -18,6 +18,7 @@ public class Settings {
      */
     public static final String latestVersion = "14.0.0";
     public static final String lastVersion = "13.1.0"; // last released version
+    // TODO: there is no Unicode 13.1, see https://github.com/unicode-org/unicodetools/issues/100
 
     public static final boolean BUILD_FOR_COMPARE =
             CldrUtility.getProperty("BUILD_FOR_COMPARE", "false").startsWith("t");

diff --git a/unicodetools/org/unicode/text/utility/Utility.java b/unicodetools/org/unicode/text/utility/Utility.java
@@ -827,7 +827,7 @@ public static String join(long[] array, String divider) {
     public static final String[] searchPath = {
 	    // "EXTRAS" + (FIX_FOR_NEW_VERSION == 0 ? "" : ""),
 	    "14.0.0",
-	    "13.1.0",
+	    "13.1.0", // TODO: there is no Unicode 13.1, see https://github.com/unicode-org/unicodetools/issues/100
 	    "13.0.0",
 	    "12.1.0",
 	    "12.0.0",