Sep 20, 2023 · Sep 19, 2023 · Sep 19, 2023 · Sep 19, 2023 · Sep 19, 2023 · Sep 19, 2023
diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py
                table[i].east_asian_width = widths[i]
        self.widths = widths

        for char, (p,) in UcdFile(DERIVED_CORE_PROPERTIES, version).expanded():
        for char, (propname, *propinfo) in UcdFile(DERIVED_CORE_PROPERTIES, version).expanded():
            if propinfo:
                # this is not a binary property, ignore it
                continue

            if table[char]:
                # Some properties (e.g. Default_Ignorable_Code_Point)
                # apply to unassigned code points; ignore them
                table[char].binary_properties.add(p)
                table[char].binary_properties.add(propname)

        for char_range, value in UcdFile(LINE_BREAK, version):
            if value not in MANDATORY_LINE_BREAKS:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1106,11 +1106,15 @@ def __init__(self, version, cjk_check=True):
		table[i].east_asian_width = widths[i]
		self.widths = widths

		for char, (p,) in UcdFile(DERIVED_CORE_PROPERTIES, version).expanded():
		for char, (propname, *propinfo) in UcdFile(DERIVED_CORE_PROPERTIES, version).expanded():
		if propinfo:
		# this is not a binary property, ignore it
		continue
Comment on lines +1109 to +1112 Copy link ContributorAuthor SnoopJSep 19, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. All the properties defined in`DerivedCoreProperties.txt` happened to be binary until the latest update, so this tool was getting away with the assumption that they arealways binary. As of Unicode 15.1, this file also includes definitions that use the`Indict_Conjunct_Break` (`InCB`) property, which is an enumeration. With this change, the loop skips over any non-binary properties, since we have nothing to do with them. Copy link Contributor benjaminpSep 19, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. It seems like it would be safer to explicitly ignore`Indict_Conjunct_Break` rather than throw out everything with a second column. Copy link ContributorAuthor SnoopJSep 19, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Is there a particular failure mode you have in mind? My rationale here was that the current internalized DB only cares about binary properties in this file, but in practice any of theproperty types enumerated by UAX#44 could appear in a future revision. I'm not strongly opposed to ignoring the specific property that breaks the tool against the current revision, but my rationale was that it seems safer to prevent this class of failure in the future if/when additional non-binary properties are added.

		if table[char]:
		# Some properties (e.g. Default_Ignorable_Code_Point)
		# apply to unassigned code points; ignore them
		table[char].binary_properties.add(p)
		table[char].binary_properties.add(propname)

		for char_range, value in UcdFile(LINE_BREAK, version):
		if value not in MANDATORY_LINE_BREAKS:
Expand Down