separate out quantity detection

Author: neverRare

src/translator/ast.ts

@@ -24,7 +24,6 @@ export type NounPhrase =
     type: "compound";
     conjunction: string;
     nouns: ReadonlyArray<NounPhrase>;
-    quantity: Quantity;
   }>;
 export type Determiner = Readonly<{
   kind: Dictionary.DeterminerType;

src/translator/clause.ts

@@ -4,7 +4,7 @@ import * as TokiPona from "../parser/ast.ts";
 import * as English from "./ast.ts";
 import { FilteredError, TranslationTodoError } from "./error.ts";
 import { nanpa } from "./nanpa.ts";
-import { perspective } from "./noun.ts";
+import { perspective, quantity } from "./noun.ts";
 import { multiplePhrases, multiplePhrasesAsNoun } from "./phrase.ts";
 import { predicate } from "./predicate.ts";
 import { nounAsPreposition, preposition } from "./preposition.ts";
@@ -81,7 +81,7 @@ function liClause(clause: TokiPona.Clause & { type: "li clause" }) {
     predicate(clause.predicates, "li"),
   )
     .flatMap(([subject, predicate]) =>
-      verb(predicate, perspective(subject), subject.quantity)
+      verb(predicate, perspective(subject), quantity(subject))
         .map((verb) => ({
           type: "simple",
           subject,
@@ -149,15 +149,16 @@ function oClause(clause: TokiPona.Clause & { type: "o clause" }) {
   return IterableResult.combine(subject, predicate(clause.predicates, "o"))
     .flatMap(([subject, predicate]) => {
       const subjectPerspective = perspective(subject);
+      const subjectQuantity = quantity(subject);
       return IterableResult.concat(
-        verb(predicate, subjectPerspective, subject.quantity)
+        verb(predicate, subjectPerspective, subjectQuantity)
           .map((verb) => iWish(subject, verb)),
         IterableResult.from(() => {
           const takeNegative = true;
           return verb(
             addModalToAll("should", predicate, takeNegative),
             subjectPerspective,
-            subject.quantity,
+            subjectQuantity,
           );
         })
           .map((verb) => ({

src/translator/noun.ts

@@ -134,6 +134,19 @@ export function perspective(noun: English.NounPhrase): Dictionary.Perspective {
       return "third";
   }
 }
+export function quantity(noun: English.NounPhrase): English.Quantity {
+  switch (noun.type) {
+    case "simple":
+      return noun.quantity;
+    case "compound":
+      switch (noun.conjunction as "and" | "or") {
+        case "and":
+          return "plural";
+        case "or":
+          return quantity(noun.nouns[noun.nouns.length - 1]);
+      }
+  }
+}
 export function extractNegativeFromNoun(
   noun: English.NounPhrase,
 ): null | English.NounPhrase {

src/translator/phrase.ts

@@ -307,20 +307,10 @@ function compoundNoun(
         return [noun];
       }
     });
-  let quantity: English.Quantity;
-  switch (conjunction) {
-    case "and":
-      quantity = "plural";
-      break;
-    case "or":
-      quantity = nouns[nouns.length - 1].quantity;
-      break;
-  }
   return {
     type: "compound",
     conjunction,
     nouns,
-    quantity,
   } as const;
 }
 function compoundAdjective(