Skip to content

Commit 3d4a3b0

Browse files
committed
Minor
1 parent e590965 commit 3d4a3b0

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

JL.Core/Lookup/LookupUtils.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ private static List<IDictRecord> GetValidDeconjugatedResults(Dict dict, Form dec
626626
}
627627
}
628628
}
629-
else if (WordClassDictionaryContainsTag(dictResult, lastTag))
629+
else if (WordClassDictionaryContainsTag(dictResult.PrimarySpelling, dictResult.Reading, lastTag))
630630
{
631631
resultsList.Add(dictResult);
632632
}
@@ -641,7 +641,7 @@ private static List<IDictRecord> GetValidDeconjugatedResults(Dict dict, Form dec
641641
for (int i = 0; i < dictResultCount; i++)
642642
{
643643
EpwingNazekaRecord dictResult = (EpwingNazekaRecord)dictResults[i];
644-
if (WordClassDictionaryContainsTag(dictResult, lastTag))
644+
if (WordClassDictionaryContainsTag(dictResult.PrimarySpelling, dictResult.Reading, lastTag))
645645
{
646646
resultsList.Add(dictResult);
647647
}
@@ -1042,16 +1042,16 @@ private static List<LookupResult> BuildEpwingNazekaResult(
10421042
}
10431043

10441044

1045-
private static bool WordClassDictionaryContainsTag<T>(T record, string tag) where T : IDictRecordWithSingleReading
1045+
private static bool WordClassDictionaryContainsTag(string primarySpelling, string? reading, string tag)
10461046
{
1047-
if (DictUtils.WordClassDictionary.TryGetValue(record.PrimarySpelling, out IList<JmdictWordClass>? jmdictWcResults))
1047+
if (DictUtils.WordClassDictionary.TryGetValue(primarySpelling, out IList<JmdictWordClass>? jmdictWcResults))
10481048
{
10491049
for (int i = 0; i < jmdictWcResults.Count; i++)
10501050
{
10511051
JmdictWordClass result = jmdictWcResults[i];
1052-
if (record.PrimarySpelling == result.Spelling
1053-
&& ((record.Reading is not null && result.Readings is not null && result.Readings.Contains(record.Reading))
1054-
|| (record.Reading is null && result.Readings is null))
1052+
if (primarySpelling == result.Spelling
1053+
&& ((reading is not null && result.Readings is not null && result.Readings.Contains(reading))
1054+
|| (reading is null && result.Readings is null))
10551055
&& result.WordClasses.Contains(tag))
10561056
{
10571057
return true;

0 commit comments

Comments
 (0)