Skip to content

ICU-22284 dump Numeric_Value property in icuexportdata.cpp #3751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ICU-22284 dump Numeric_Value property in icuexportdata.cpp #3751

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions icu4c/source/tools/icuexportdata/icuexportdata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,48 @@ void dumpBidiMirroringGlyph(FILE* f) {
usrc_writeUCPTrie(f, shortPropName, utrie.getAlias(), UPRV_TARGET_SYNTAX_TOML);
}

/*
* Export Numeric_Value values in a similar way to how enumerated
* properties are dumped to file.
*/
void dumpNumericValue(FILE* f) {
IcuToolErrorCode status("icuexportdata: dumpNumericValue");
UProperty uproperty = UCHAR_NUMERIC_VALUE;
const char* fullPropName = u_getPropertyName(uproperty, U_LONG_PROPERTY_NAME);
const char* shortPropName = u_getPropertyName(uproperty, U_SHORT_PROPERTY_NAME);

UCPTrieValueWidth width = UCPTRIE_VALUE_BITS_32;
LocalUMutableCPTriePointer builder(umutablecptrie_open(0, 0, status));

for(UChar32 c = UCHAR_MIN_VALUE; c <= UCHAR_MAX_VALUE; c++) {
int32_t ntv = static_cast<int32_t>(GET_NUMERIC_TYPE_VALUE(u_getMainProperties(c)));

if (ntv != UPROPS_NTV_NONE) {
umutablecptrie_set(builder.getAlias(), c, ntv, status);
}
}

LocalUCPTriePointer utrie(umutablecptrie_buildImmutable(
builder.getAlias(),
trieType,
width,
status));
handleError(status, __LINE__, fullPropName);

fputs("[[enum_property]]\n", f);
fprintf(f, "long_name = \"%s\"\n", fullPropName);
if (shortPropName) fprintf(f, "short_name = \"%s\"\n", shortPropName);
fprintf(f, "upropert_discr = 0x%X\n", uproperty);
dumpPropertyAliases(uproperty, f);

const UCPMap* umap = reinterpret_cast<UCPMap *>(utrie.getAlias());
usrc_writeUCPMap(f, umap, nullptr, UPRV_TARGET_SYNTAX_TOML);
fputs("\n", f);

fputs("[enum_property.code_point_trie]\n", f);
usrc_writeUCPTrie(f, shortPropName, utrie.getAlias(), UPRV_TARGET_SYNTAX_TOML);
}

// After printing property value `v`, print `mask` if and only if `mask` comes immediately
// after the property in the listing
void maybeDumpMaskValue(UProperty uproperty, uint32_t v, uint32_t mask, FILE* f) {
Expand Down Expand Up @@ -1110,6 +1152,9 @@ int exportUprops(int argc, char* argv[]) {
i = UCHAR_SCRIPT_EXTENSIONS;
}
if (i == UCHAR_SCRIPT_EXTENSIONS + 1) {
i = UCHAR_NUMERIC_VALUE;
}
if (i == UCHAR_NUMERIC_VALUE + 1) {
break;
}
UProperty uprop = static_cast<UProperty>(i);
Expand Down Expand Up @@ -1196,6 +1241,8 @@ int exportUprops(int argc, char* argv[]) {
dumpBidiMirroringGlyph(f);
} else if (propEnum == UCHAR_SCRIPT_EXTENSIONS) {
dumpScriptExtensions(f);
} else if (propEnum == UCHAR_NUMERIC_VALUE) {
dumpNumericValue(f);
} else {
std::cerr << "Don't know how to write property: " << propEnum << std::endl;
return U_INTERNAL_PROGRAM_ERROR;
Expand Down