CLDR-16372 Code to replace lateral inheritance markers in trunk

tools/cldr-code/src/main/java/org/unicode/cldr/tool/CLDRModify.java

@@ -79,6 +79,7 @@
 // import org.unicode.cldr.util.Log;
 import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo;
 import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo.Count;
+import org.unicode.cldr.util.VoteResolver;
 import org.unicode.cldr.util.XMLSource;
 import org.unicode.cldr.util.XPathParts;
 import org.unicode.cldr.util.XPathParts.Comments;
@@ -2876,11 +2877,11 @@ public void handleEnd() {
 
                     @Override
                     public void handleStart() {
-                        // skip if the locale id's parent isn't root. That is, it must be at level-1
-                        // locale.
+                        // skip if the locale is root.
                         skip = getLocaleID().equals(XMLSource.ROOT_ID);
                         if (!skip) {
                             parentId = LocaleIDParser.getParent(getLocaleID());
+                            // This locale is "L1" (level one) if its parent is root.
                             isL1 = parentId.equals(XMLSource.ROOT_ID);
                             parentFile = null; // lazy evaluate
                         }
@@ -2931,14 +2932,19 @@ public void handlePath(String xpath) {
                                     parentFile = factory.make(parentId, true);
                                 }
                                 String parentValue = parentFile.getStringValueWithBailey(xpath);
-                                if (!parentValue.equals(baileyValue)) {
-                                    harden = true;
+                                if (!baileyValue.equals(parentValue)) {
+                                    harden = true; // true if parentValue == null, see comment below
                                 }
                                 message2 = "; L2+";
 
                                 // Problem case: the parent value is null (not inheritance marker)
                                 // but the child value is ^^^.
                                 // See if we need to fix that.
+                                // Currently harden is true if parentValue is null, which, as of
+                                // 2023-09-20, happens here for only two paths, both in locale
+                                // en_AU:
+                                // //ldml/dates/calendars/calendar[@type="islamic"]/dateTimeFormats/availableFormats/dateFormatItem[@id="yMEd"]
+                                // //ldml/dates/calendars/calendar[@type="islamic"]/dateTimeFormats/availableFormats/dateFormatItem[@id="yMd"]
                             }
                             if (harden) {
                                 String fullPath = cldrFileToFilter.getFullXPath(xpath);
@@ -3052,6 +3058,26 @@ public void handlePath(String xpath) {
                         replace(fullPath, newPath, value, "Upgrade to " + TARGET_STATUS.name());
                     }
                 });
+
+        fixList.add(
+                'Z',
+                "Zero lateral: convert inheritance marker to specific value if inheritance would be lateral/problematic",
+                new CLDRFilter() {
+                    @Override
+                    public void handlePath(String xpath) {
+                        String value = cldrFileToFilter.getStringValue(xpath);
+                        if (!CldrUtility.INHERITANCE_MARKER.equals(value)) {
+                            return;
+                        }
+                        String newValue =
+                                VoteResolver.reviseInheritanceAsNeeded(xpath, value, getResolved());
+                        if (value.equals(newValue)) {
+                            return;
+                        }
+                        String fullXPath = cldrFileToFilter.getFullXPath(xpath);
+                        replace(fullXPath, fullXPath, newValue);
+                    }
+                });
     }
 
     public static String getLast2Dirs(File sourceDir1) {

tools/cldr-code/src/main/java/org/unicode/cldr/util/VoteResolver.java

@@ -2261,8 +2261,18 @@ public static String reviseInheritanceAsNeeded(String path, String value, CLDRFi
         String baileyValue = cldrFile.getBaileyValue(path, pathWhereFound, localeWhereFound);
         if (baileyValue != null
                 && (CldrUtility.INHERITANCE_MARKER.equals(value) || baileyValue.equals(value))) {
+            // TODO: decide whether to continue treating GlossonymConstructor.PSEUDO_PATH
+            // (constructed values) as lateral inheritance. This method originally did not
+            // take constructed values into account, so it implicitly treated constructed
+            // values as inherited, given that pathWhereFound doesn't equal path.
+            // This original behavior corresponds to CONSTRUCTED_PSEUDO_PATH_NOT_LATERAL = false.
+            // Reference: https://unicode-org.atlassian.net/browse/CLDR-16372
+            final boolean CONSTRUCTED_PSEUDO_PATH_NOT_LATERAL = false;
             value =
-                    pathWhereFound.value.equals(path)
+                    (pathWhereFound.value.equals(path)
+                                    || (CONSTRUCTED_PSEUDO_PATH_NOT_LATERAL
+                                            && GlossonymConstructor.PSEUDO_PATH.equals(
+                                                    pathWhereFound.value)))
                             ? CldrUtility.INHERITANCE_MARKER
                             : baileyValue;
         }