simplify nanpa handling

Author: neverRare

src/translator/modifier.ts

@@ -24,8 +24,7 @@ export type ModifierTranslation =
   | Readonly<{ type: "adjective"; adjective: English.AdjectivePhrase }>
   | Readonly<{ type: "determiner"; determiner: English.Determiner }>
   | Readonly<{ type: "adverb"; adverb: English.Adverb }>
-  | Readonly<{ type: "name"; name: string }>
-  | Readonly<{ type: "position phrase"; noun: English.NounPhrase }>;
+  | Readonly<{ type: "name"; name: string }>;
 export type AdjectivalModifier = Readonly<{
   nounPreposition:
     | null
@@ -34,7 +33,6 @@ export type AdjectivalModifier = Readonly<{
   adjectives: ReadonlyArray<English.AdjectivePhrase>;
   name: null | string;
   ofPhrase: null | English.NounPhrase;
-  inPositionPhrase: null | English.NounPhrase;
 }>;
 export type AdverbialModifier = Readonly<{
   adverbs: ReadonlyArray<English.Adverb>;
@@ -180,7 +178,7 @@ function modifier(modifier: TokiPona.Modifier) {
     case "nanpa":
       return nanpa(modifier)
         .map((noun): ModifierTranslation => ({
-          type: "position phrase",
+          type: "noun",
           noun,
         }));
   }
@@ -213,18 +211,12 @@ export function multipleModifiers(
       const names = modifiers
         .flatMap((modifier) => modifier.type === "name" ? [modifier.name] : []);
 
-      const inPositionPhrases = modifiers.flatMap((modifier) =>
-        modifier.type === "position phrase" ? [modifier.noun] : []
-      );
-
       let adjectival: IterableResult<MultipleModifierTranslation>;
       if (
         nouns.length <= 1 &&
         nounPrepositions.length <= 1 &&
         adverbs.length === 0 &&
-        names.length <= 1 &&
-        inPositionPhrases.length <= 1 &&
-        (nouns.length === 0 || inPositionPhrases.length === 0)
+        names.length <= 1
       ) {
         adjectival = IterableResult.single<MultipleModifierTranslation>({
           type: "adjectival",
@@ -233,7 +225,6 @@ export function multipleModifiers(
           adjectives,
           name: names[0] ?? null,
           ofPhrase: nouns[0] ?? null,
-          inPositionPhrase: inPositionPhrases[0] ?? null,
         });
       } else {
         adjectival = IterableResult.empty();
@@ -244,8 +235,7 @@ export function multipleModifiers(
         nounPrepositions.length === 0 &&
         determiners.length === 0 &&
         adjectives.length <= 1 &&
-        names.length === 0 &&
-        inPositionPhrases.length === 0
+        names.length === 0
       ) {
         const inWayPhrase: null | English.NounPhrase = adjectives.length > 0
           ? {

src/translator/nanpa.ts

@@ -6,7 +6,7 @@ import { FilteredError } from "./error.ts";
 import { phrase } from "./phrase.ts";
 
 export function nanpa(
-  nanpa: TokiPona.Modifier & { type: "nanpa" },
+  nanpa: TokiPona.Nanpa,
 ): IterableResult<English.NounPhrase> {
   return phrase({
     phrase: nanpa.phrase,

src/translator/phrase.ts

@@ -63,15 +63,8 @@ function nounPhrase(
         modifier.name,
         (name): English.PostAdjective => ({ adjective: "named", name }),
       );
-    const prepositions = [
-      ...nullableAsArray(modifier.inPositionPhrase)
-        .map((object) => nounAsPreposition(object, "in")),
-      ...nullableAsArray(modifier.ofPhrase)
-        .map((object) => nounAsPreposition(object, "of")),
-    ];
-    if (prepositions.length > 1) {
-      throw new FilteredError("multiple preposition within noun phrase");
-    }
+    const prepositions = nullableAsArray(modifier.ofPhrase)
+      .map((object) => nounAsPreposition(object, "of"));
     // TODO: do this on `fixer.ts` instead
     if (prepositions.length > 0 && postAdjective != null) {
       throw new FilteredError("named noun with preposition");
@@ -96,9 +89,7 @@ function nounPhrase(
       }));
     if (modifier.nounPreposition == null) {
       return headNoun;
-    } else if (
-      modifier.ofPhrase == null && modifier.inPositionPhrase == null
-    ) {
+    } else if (modifier.ofPhrase == null) {
       return headNoun.map((noun): English.NounPhrase => ({
         ...modifier.nounPreposition!.noun as English.NounPhrase & {
           type: "simple";