hunspell: allow ignoring exceptions on duplicate ICONV/OCONV mappings (#13155)

hunspell: allow ignoring exceptions on duplicate ICONV/OCONV mappings
This commit is contained in:
Peter Gromov 2024-03-05 09:54:20 +01:00 committed by GitHub
parent 193cc62c73
commit 44d48df4b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 21 additions and 2 deletions

View File

@ -202,6 +202,8 @@ Improvements
* GITHUB#13087: Changed `static final Set` constants to be immutable. Among others it affected
ScandinavianNormalizer.ALL_FOLDINGS set with public access. (Dmitry Cherniachenko)
* GITHUB#13155: Hunspell: allow ignoring exceptions on duplicate ICONV/OCONV mappings (Peter Gromov)
Optimizations
---------------------

View File

@ -815,7 +815,7 @@ public class Dictionary {
for (int i = 0; i < num; i++) {
String[] parts = splitBySpace(reader, reader.readLine(), 3);
if (mappings.put(parts[1], parts[2]) != null) {
if (mappings.put(parts[1], parts[2]) != null && !tolerateDuplicateConversionMappings()) {
throw new IllegalStateException("duplicate mapping specified for: " + parts[1]);
}
}
@ -1167,6 +1167,14 @@ public class Dictionary {
return false;
}
/**
* Whether duplicate ICONV/OCONV lines should be silently ignored. False by default: an {@link
* IllegalStateException} will happen.
*/
protected boolean tolerateDuplicateConversionMappings() {
return false;
}
char[] allNonSuggestibleFlags() {
return Dictionary.toSortedCharArray(
Stream.of(HIDDEN_FLAG, noSuggest, forbiddenword, onlyincompound, subStandard)

View File

@ -206,6 +206,11 @@ public class TestDictionary extends LuceneTestCase {
protected boolean tolerateAffixRuleCountMismatches() {
return true;
}
@Override
protected boolean tolerateDuplicateConversionMappings() {
return true;
}
};
}
}

View File

@ -12,4 +12,8 @@ MAP a b
SFX A Y 1
SFX A nout l [aeiouyáéíóúýůěr][^aeiouyáéíóúýůěrl][^aeiouy
SFX A b c d
SFX A b c d
ICONV 2
ICONV x y
ICONV x y