Add Deinflector.rulesMatch helper function

themoeway · Jan 15, 2024 · 3fcf663 · 3fcf663
1 parent 48f1d01
commit 3fcf663
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/ext/js/language/deinflector.js b/ext/js/language/deinflector.js
@@ -59,7 +59,7 @@ export class Deinflector {
             for (const [reason, variants] of this.reasons) {
                 for (const [kanaIn, kanaOut, rulesIn, rulesOut] of variants) {
                     if (
-                        (rules !== 0 && (rules & rulesIn) === 0) ||
+                        !Deinflector.rulesMatch(rules, rulesIn) ||
                         !term.endsWith(kanaIn) ||
                         (term.length - kanaIn.length + kanaOut.length) <= 0
                     ) {
@@ -124,4 +124,15 @@ export class Deinflector {
         }
         return value;
     }
+
+    /**
+     * If `currentRules` is `0`, then `nextRules` is ignored and `true` is returned.
+     * Otherwise, there must be at least one shared rule between `currentRules` and `nextRules`.
+     * @param {number} currentRules
+     * @param {number} nextRules
+     * @returns {boolean}
+     */
+    static rulesMatch(currentRules, nextRules) {
+        return currentRules === 0 || (currentRules & nextRules) !== 0;
+    }
 }
diff --git a/ext/js/language/translator.js b/ext/js/language/translator.js
@@ -250,8 +250,11 @@ export class Translator {
         );
         if (deinflections.length === 0) { return []; }
 
+        /** @type {string[]} */
         const uniqueDeinflectionTerms = [];
+        /** @type {import('translation-internal').DatabaseDeinflection[][]} */
         const uniqueDeinflectionArrays = [];
+        /** @type {Map<string, import('translation-internal').DatabaseDeinflection[]>} */
         const uniqueDeinflectionsMap = new Map();
         for (const deinflection of deinflections) {
             const term = deinflection.deinflectedText;
@@ -275,7 +278,7 @@ export class Translator {
             const definitionRules = Deinflector.rulesToRuleFlags(databaseEntry.rules);
             for (const deinflection of uniqueDeinflectionArrays[databaseEntry.index]) {
                 const deinflectionRules = deinflection.rules;
-                if (!partsOfSpeechFilter || deinflectionRules === 0 || (definitionRules & deinflectionRules) !== 0) {
+                if (!partsOfSpeechFilter || Deinflector.rulesMatch(deinflectionRules, definitionRules)) {
                     deinflection.databaseEntries.push(databaseEntry);
                 }
             }