@@ -626,7 +626,7 @@ private static List<IDictRecord> GetValidDeconjugatedResults(Dict dict, Form dec
626
626
}
627
627
}
628
628
}
629
- else if ( WordClassDictionaryContainsTag ( dictResult , lastTag ) )
629
+ else if ( WordClassDictionaryContainsTag ( dictResult . PrimarySpelling , dictResult . Reading , lastTag ) )
630
630
{
631
631
resultsList . Add ( dictResult ) ;
632
632
}
@@ -641,7 +641,7 @@ private static List<IDictRecord> GetValidDeconjugatedResults(Dict dict, Form dec
641
641
for ( int i = 0 ; i < dictResultCount ; i ++ )
642
642
{
643
643
EpwingNazekaRecord dictResult = ( EpwingNazekaRecord ) dictResults [ i ] ;
644
- if ( WordClassDictionaryContainsTag ( dictResult , lastTag ) )
644
+ if ( WordClassDictionaryContainsTag ( dictResult . PrimarySpelling , dictResult . Reading , lastTag ) )
645
645
{
646
646
resultsList . Add ( dictResult ) ;
647
647
}
@@ -1042,16 +1042,16 @@ private static List<LookupResult> BuildEpwingNazekaResult(
1042
1042
}
1043
1043
1044
1044
1045
- private static bool WordClassDictionaryContainsTag < T > ( T record , string tag ) where T : IDictRecordWithSingleReading
1045
+ private static bool WordClassDictionaryContainsTag ( string primarySpelling , string ? reading , string tag )
1046
1046
{
1047
- if ( DictUtils . WordClassDictionary . TryGetValue ( record . PrimarySpelling , out IList < JmdictWordClass > ? jmdictWcResults ) )
1047
+ if ( DictUtils . WordClassDictionary . TryGetValue ( primarySpelling , out IList < JmdictWordClass > ? jmdictWcResults ) )
1048
1048
{
1049
1049
for ( int i = 0 ; i < jmdictWcResults . Count ; i ++ )
1050
1050
{
1051
1051
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 ) )
1055
1055
&& result . WordClasses . Contains ( tag ) )
1056
1056
{
1057
1057
return true ;
0 commit comments