Skip to content

Commit

Permalink
Minor
Browse files Browse the repository at this point in the history
  • Loading branch information
rampaa committed Feb 11, 2025
1 parent e590965 commit 3d4a3b0
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions JL.Core/Lookup/LookupUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ private static List<IDictRecord> GetValidDeconjugatedResults(Dict dict, Form dec
}
}
}
else if (WordClassDictionaryContainsTag(dictResult, lastTag))
else if (WordClassDictionaryContainsTag(dictResult.PrimarySpelling, dictResult.Reading, lastTag))
{
resultsList.Add(dictResult);
}
Expand All @@ -641,7 +641,7 @@ private static List<IDictRecord> GetValidDeconjugatedResults(Dict dict, Form dec
for (int i = 0; i < dictResultCount; i++)
{
EpwingNazekaRecord dictResult = (EpwingNazekaRecord)dictResults[i];
if (WordClassDictionaryContainsTag(dictResult, lastTag))
if (WordClassDictionaryContainsTag(dictResult.PrimarySpelling, dictResult.Reading, lastTag))
{
resultsList.Add(dictResult);
}
Expand Down Expand Up @@ -1042,16 +1042,16 @@ private static List<LookupResult> BuildEpwingNazekaResult(
}


private static bool WordClassDictionaryContainsTag<T>(T record, string tag) where T : IDictRecordWithSingleReading
private static bool WordClassDictionaryContainsTag(string primarySpelling, string? reading, string tag)
{
if (DictUtils.WordClassDictionary.TryGetValue(record.PrimarySpelling, out IList<JmdictWordClass>? jmdictWcResults))
if (DictUtils.WordClassDictionary.TryGetValue(primarySpelling, out IList<JmdictWordClass>? jmdictWcResults))
{
for (int i = 0; i < jmdictWcResults.Count; i++)
{
JmdictWordClass result = jmdictWcResults[i];
if (record.PrimarySpelling == result.Spelling
&& ((record.Reading is not null && result.Readings is not null && result.Readings.Contains(record.Reading))
|| (record.Reading is null && result.Readings is null))
if (primarySpelling == result.Spelling
&& ((reading is not null && result.Readings is not null && result.Readings.Contains(reading))
|| (reading is null && result.Readings is null))
&& result.WordClasses.Contains(tag))
{
return true;
Expand Down

0 comments on commit 3d4a3b0

Please sign in to comment.