various high-priority grammar fixing

Author: neverRare

src/translator/adjective.ts

@@ -66,7 +66,6 @@ export function compoundAdjective(
     emphasis: null | TokiPona.Emphasis;
   }>,
 ): IterableResult<English.AdjectivePhrase> {
-  // TODO: flattening of adjectives in AST fixer
   const { adjectives, reduplicationCount, emphasis } = options;
   if (reduplicationCount === 1) {
     return IterableResult.combine(

src/translator/fixer.ts

@@ -26,7 +26,12 @@ function fixNounPhrase(noun: English.NounPhrase): English.NounPhrase {
     case "compound":
       return {
         ...noun,
-        nouns: noun.nouns.map(fixNounPhrase),
+        nouns: noun.nouns.flatMap((item) =>
+          item.type === "compound" && item.conjunction === noun.conjunction
+            ? item.nouns
+            : [item]
+        )
+          .map(fixNounPhrase),
       };
   }
 }
@@ -120,7 +125,14 @@ function fixAdjectivePhrase(
     case "compound":
       return {
         ...adjective,
-        adjectives: adjective.adjectives.map(fixAdjectivePhrase),
+        adjectives: adjective.adjectives
+          .flatMap((item) =>
+            item.type === "compound" &&
+              item.conjunction === adjective.conjunction
+              ? item.adjectives
+              : [item]
+          )
+          .map(fixAdjectivePhrase),
       };
   }
 }
@@ -169,15 +181,42 @@ function fixMultipleAdverbs(adverbs: ReadonlyArray<English.Adverb>) {
     return adverbs;
   }
 }
+function filterGerundNoun(noun: English.NounPhrase): void {
+  switch (noun.type) {
+    case "simple":
+      if (noun.gerund) {
+        throw new FilteredError("continuous tense");
+      }
+      break;
+    case "compound":
+      noun.nouns.forEach(filterGerundNoun);
+      break;
+  }
+}
+function filterGerundLikeAdjective(adjective: English.AdjectivePhrase): void {
+  switch (adjective.type) {
+    case "simple":
+      if (adjective.gerundLike) {
+        throw new FilteredError("continuous tense");
+      }
+      break;
+    case "compound":
+      adjective.adjectives.forEach(filterGerundLikeAdjective);
+      break;
+  }
+}
 function fixComplement(complement: English.Complement): English.Complement {
   switch (complement.type) {
-    case "noun":
-      return { type: "noun", noun: fixNounPhrase(complement.noun) };
-    case "adjective":
-      return {
-        type: "adjective",
-        adjective: fixAdjectivePhrase(complement.adjective),
-      };
+    case "noun": {
+      const noun = fixNounPhrase(complement.noun);
+      filterGerundNoun(noun);
+      return { type: "noun", noun };
+    }
+    case "adjective": {
+      const adjective = fixAdjectivePhrase(complement.adjective);
+      filterGerundLikeAdjective(adjective);
+      return { type: "adjective", adjective };
+    }
   }
 }
 function fixAdverbVerb(adverbVerb: English.AdverbVerb): English.AdverbVerb {
@@ -189,7 +228,13 @@ function fixAdverbVerb(adverbVerb: English.AdverbVerb): English.AdverbVerb {
 function fixMultipleVerb(
   verb: ReadonlyArray<English.AdverbVerb>,
 ): ReadonlyArray<English.AdverbVerb> {
-  return verb.map(fixAdverbVerb);
+  const newVerb = verb.map(fixAdverbVerb);
+  for (const verb of newVerb.slice(1)) {
+    if (verb.verb.type === "modal") {
+      throw new FilteredError("modal verb after another verb");
+    }
+  }
+  return newVerb;
 }
 function fixVerbPhrase(verb: English.VerbPhrase): English.VerbPhrase {
   switch (verb.type) {

src/translator/phrase.ts

@@ -268,7 +268,6 @@ function preverb(
         const predicateAsVerb = phraseAsVerb(predicate);
         if (predicateAsVerb != null && predicateAsVerb.type === "simple") {
           const first = predicateAsVerb.verb[0];
-          // TODO: filter out modal verb when found in the middle
           const verbForPreverb: English.AdverbVerb = {
             preAdverbs: first.preAdverbs,
             verb: first.verb,
@@ -411,7 +410,6 @@ export function multiplePhrases(
             ) {
               return {
                 type: "noun",
-                // TODO: flatten compound nouns on the grammar fixer
                 noun: {
                   type: "compound",
                   conjunction,
@@ -426,7 +424,6 @@ export function multiplePhrases(
             // TODO: filter out "<adjective> and <adjective>" when used as a sole phrase
             return {
               type: "adjective",
-              // TODO: flatten compound adjective on the grammar fixer
               adjective: {
                 type: "compound",
                 conjunction,

src/translator/word_unit.ts

@@ -16,7 +16,6 @@ export type WordUnitTranslation =
   | Readonly<{ type: "adjective"; adjective: English.AdjectivePhrase }>
   | (Readonly<{ type: "verb" }> & English.SimpleVerbPhrase);
 
-// TODO: filter out gerund and gerund-like on fixer
 function defaultWordUnit(
   options: Readonly<{
     word: string;