Implementing group 3 noun rules for Serbian. #173
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
grhoten
reviewed
Aug 15, 2025
inflection/src/inflection/grammar/synthesis/SrGrammarSynthesizer_SrDisplayFunction.cpp
Outdated
Show resolved
Hide resolved
Comment on lines
+224
to
+230
| static constexpr auto suffix_sg = ::std::to_array<::std::u16string_view>({u"а", u"е", u"и", u"у", u"а", u"ом", u"и"}); | ||
| static constexpr auto suffix_pl = ::std::to_array<::std::u16string_view>({u"е", u"а", u"ама", u"е", u"е", u"ама", u"ама"}); | ||
|
|
||
| ::std::u16string base = lemma; | ||
| // Remove trailing a and apply suffix. | ||
| base.pop_back(); | ||
| base = applySuffix(base, suffix_sg, suffix_pl, number, targetCase); |
There was a problem hiding this comment.
For this kind of mapping, you may be inspired by Arabic, German or Italian. They convert a string to a numeric key (makeLookupKey) containing multiple grammemes, and they map the key to a string. This mapping is initialized in the constructor instead of at runtime.
There was a problem hiding this comment.
Is the concern the runtime size increase (static constexpr)? If yes, I can remove the static (creating these arrays is cheap).
Otherwise the current approach looks simpler. I will look into refactoring this code as I add more cases, potentially implementing Arabic like approach.
WDYT?
inflection/src/inflection/grammar/synthesis/SrGrammarSynthesizer_SrDisplayFunction.cpp
Outdated
Show resolved
Hide resolved
inflection/src/inflection/grammar/synthesis/SrGrammarSynthesizer_SrDisplayFunction.cpp
Outdated
Show resolved
Hide resolved
Comment on lines
164
to
200
| enum class Syllables { | ||
| ONE_SYLLABLE, | ||
| TWO_SYLLABLES, | ||
| MULTI_SYLLABLES, | ||
| }; | ||
| Syllables countSyllables(const ::std::u16string& lemma) { | ||
| static constexpr ::std::u16string_view vowels = u"аеиоуАЕИОУ"; | ||
| static constexpr ::std::u16string_view consonants = u"бвгдђжзјклљмнњпстћфхцчџшБВГДЂЖЗЈКЛЉМНЊПСТЋФХЦЧЏШ"; | ||
|
|
||
| uint16_t total = 0; | ||
| size_t index = 0; | ||
| const size_t length = lemma.length(); | ||
| for (const char16_t ch: lemma) { | ||
| if (vowels.find(ch) != ::std::string::npos) { | ||
| ++total; | ||
| } | ||
| // Check case where R is at the begining followed by a consonant. | ||
| if ((ch == u'р' || ch == u'Р') && (index == 0 && index + 1 < length)) { | ||
| if (consonants.find(lemma[index + 1]) != ::std::string::npos) { | ||
| ++total; | ||
| } | ||
| } else if ((ch == u'р' || ch == u'Р') && (index != 0 && index + 1 < length)) { | ||
| if (consonants.find(lemma[index - 1]) != ::std::string::npos && consonants.find(lemma[index + 1]) != ::std::string::npos) { | ||
| ++total; | ||
| } | ||
| } | ||
| ++index; | ||
| } | ||
|
|
||
| if (total == 1) { | ||
| return Syllables::ONE_SYLLABLE; | ||
| } else if (total == 2) { | ||
| return Syllables::TWO_SYLLABLES; | ||
| } else { | ||
| return Syllables::MULTI_SYLLABLES; | ||
| } | ||
| } |
There was a problem hiding this comment.
What do you think of this?
static bool isConsonant(char16_t ch) {
return morphun::lang::StringFilterUtil::CYRILLIC_SCRIPT().contains(ch) && !morphun::dictionary::PhraseProperties::DEFAULT_VOWELS_START().contains(ch);
}
enum class Syllables {
ONE_SYLLABLE,
TWO_SYLLABLES,
MULTI_SYLLABLES,
};
Syllables countSyllables(const ::std::u16string& word) {
int32_t total = 0;
if (word.length() > 2) {
std::u16string lowercase;
morphun::util::StringUtils::lowercase(&lowercase, word, ::morphun::util::LocaleUtils::SERBIAN());
size_t startIndex = 0;
size_t nextR;
const auto stringLengthWithVowelSuffix = lowercase.length() - 1; // Always enough room for a suffix letter
while ((nextR = lowercase.find(u'р', startIndex)) != std::string::npos && nextR < stringLengthWithVowelSuffix) {
++total; // +1 for r
if (isConsonant(lowercase[nextR + 1]) && (nextR == 0 || isConsonant(lowercase[nextR - 1]))) {
++total;
}
startIndex = nextR + 1;
}
}
if (total == 1) {
return Syllables::ONE_SYLLABLE;
} else if (total == 2) {
return Syllables::TWO_SYLLABLES;
} else {
return Syllables::MULTI_SYLLABLES;
}
}
There was a problem hiding this comment.
Your code skips vowels (only counts Rs). I like the isConsonant, and I added isVowel function and used it in the code.
It looks simpler now.
PTAL
inflection/src/inflection/grammar/synthesis/SrGrammarSynthesizer_SrDisplayFunction.cpp
Outdated
Show resolved
Hide resolved
inflection/src/inflection/grammar/synthesis/SrGrammarSynthesizer_SrDisplayFunction.cpp
Outdated
Show resolved
Hide resolved
inflection/src/inflection/grammar/synthesis/SrGrammarSynthesizer_SrDisplayFunction.cpp
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fully implements group 3 (all nouns ending with -a).
This removes a need for a large number of nouns to be added to Wikidata.
Resolves part of #172 .