Skip to content

Conversation

@grhoten
Copy link
Member

@grhoten grhoten commented Dec 15, 2025

Fixes #179

TEST_CASE("NumberConceptTest#testSwiss")
{
REQUIRE(u"1000" == ::inflection::dialog::NumberConcept((int64_t)1000, ::inflection::util::LocaleUtils::SWITZERLAND_GERMAN(), ::inflection::util::LocaleUtils::SWITZERLAND_GERMAN()).getAsDigits().getPrint());
REQUIRE(u"1'000" == ::inflection::dialog::NumberConcept((int64_t)1000, ::inflection::util::LocaleUtils::SWITZERLAND_GERMAN(), ::inflection::util::LocaleUtils::SWITZERLAND_GERMAN()).getAsDigits().getPrint());
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required by ICU 78.1 used by macOS GitHub action.

auto numID = npc(inflectionDictionary)->getId(value);
if (numID == -1) {
throw inflection::exception::IllegalStateException(std::u16string(value) + u" inflection name not found.");
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Safety check in case things get out of sync.

TYPEMAP.put("Q3734650", EnumSet.of(Ignorable.IGNORABLE_LEMMA)); // adverbial phrase, a phrase the head of which is an adverb
TYPEMAP.put("Q357760", EnumSet.of(Ignorable.IGNORABLE_LEMMA)); // adjectival phrase
TYPEMAP.put("Q56042915", EnumSet.of(Ignorable.IGNORABLE_LEMMA)); // prepositional phrase
TYPEMAP.put("Q3397768", EnumSet.of(Ignorable.IGNORABLE_LEMMA)); // prepositional phrase/prepositional syntagma
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This got renamed in Wikidata.

#
CATCH2_VERSION := 3.9.0
ICU_VERSION_MINIMUM := 77.1
ICU_VERSION_MINIMUM := 78.1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get Linux and macOS to use the same version.

@BHK4321
Copy link
Contributor

BHK4321 commented Dec 16, 2025

The github workflow is installing ICU of 77.1 release that is why this is occurring, please consider updating ICU_MAJOR to 78.
And the import target for xml2 issue has been resolved in the PR: #174 by using find_package(). So merging these two PRs will resolve all issues.

@grhoten grhoten force-pushed the main branch 2 times, most recently from b09ec7d to c931a6c Compare December 22, 2025 06:17
@grhoten
Copy link
Member Author

grhoten commented Dec 22, 2025

@BHK4321 I included part of your libxml2 change into this pull request. I also updated the ICU dependency so that the pull request checks pass again.

These changes still have the following linker warning, but it's fewer than before.

/usr/bin/ld: warning: libicuuc.so.74, needed by /usr/lib/x86_64-linux-gnu/libxml2.so, may conflict with libicuuc.so.78

@grhoten grhoten merged commit 643b085 into unicode-org:main Dec 22, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update ICU dependency and Wikidata processing

3 participants