separate nanpa

Author: neverRare

src/translator/clause.ts

@@ -3,7 +3,7 @@ import { ArrayResult } from "../array_result.ts";
 import * as TokiPona from "../parser/ast.ts";
 import * as English from "./ast.ts";
 import { FilteredError, TranslationTodoError } from "./error.ts";
-import { nanpa } from "./modifier.ts";
+import { nanpa } from "./nanpa.ts";
 import { perspective } from "./noun.ts";
 import { multiplePhrases, multiplePhrasesAsNoun } from "./phrase.ts";
 import { predicate } from "./predicate.ts";

src/translator/modifier.ts

@@ -5,11 +5,8 @@ import * as Composer from "../parser/composer.ts";
 import { adjective, compoundAdjective } from "./adjective.ts";
 import * as English from "./ast.ts";
 import { determiner } from "./determiner.ts";
-import {
-  ExhaustedError,
-  FilteredError,
-  TranslationTodoError,
-} from "./error.ts";
+import { ExhaustedError, TranslationTodoError } from "./error.ts";
+import { nanpa } from "./nanpa.ts";
 import { noun } from "./noun.ts";
 import { number } from "./number.ts";
 import { phrase } from "./phrase.ts";
@@ -163,44 +160,6 @@ export function pi(
       modifier.type !== "adjective" || modifier.inWayPhrase == null
     ) as ArrayResult<ModifierTranslation>;
 }
-export function nanpa(
-  nanpa: TokiPona.Modifier & { type: "nanpa" },
-): ArrayResult<English.NounPhrase> {
-  return phrase({
-    phrase: nanpa.phrase,
-    place: "object",
-    includeGerund: true,
-    includeVerb: false,
-  })
-    .map((phrase) => {
-      if (phrase.type !== "noun") {
-        throw new FilteredError(
-          `${phrase.type} within "in position" phrase`,
-        );
-      } else if (
-        (phrase.noun as English.NounPhrase & { type: "simple" })
-          .preposition.length > 0
-      ) {
-        throw new FilteredError('preposition within "in position" phrase');
-      } else {
-        return {
-          type: "simple",
-          determiner: [],
-          adjective: [],
-          noun: {
-            word: "position",
-            emphasis: nanpa.nanpa.emphasis != null,
-          },
-          quantity: "singular",
-          perspective: "third",
-          postCompound: phrase.noun,
-          postAdjective: null,
-          preposition: [],
-          emphasis: false,
-        };
-      }
-    });
-}
 function modifier(
   modifier: TokiPona.Modifier,
 ): ArrayResult<ModifierTranslation> {

src/translator/nanpa.ts

@@ -0,0 +1,44 @@
+import { ArrayResult } from "../array_result.ts";
+import * as TokiPona from "../parser/ast.ts";
+import * as English from "./ast.ts";
+import { FilteredError } from "./error.ts";
+import { phrase } from "./phrase.ts";
+
+export function nanpa(
+  nanpa: TokiPona.Modifier & { type: "nanpa" },
+): ArrayResult<English.NounPhrase> {
+  return phrase({
+    phrase: nanpa.phrase,
+    place: "object",
+    includeGerund: true,
+    includeVerb: false,
+  })
+    .map((phrase) => {
+      if (phrase.type !== "noun") {
+        throw new FilteredError(
+          `${phrase.type} within "in position" phrase`,
+        );
+      } else if (
+        (phrase.noun as English.NounPhrase & { type: "simple" })
+          .preposition.length > 0
+      ) {
+        throw new FilteredError('preposition within "in position" phrase');
+      } else {
+        return {
+          type: "simple",
+          determiner: [],
+          adjective: [],
+          noun: {
+            word: "position",
+            emphasis: nanpa.nanpa.emphasis != null,
+          },
+          quantity: "singular",
+          perspective: "third",
+          postCompound: phrase.noun,
+          postAdjective: null,
+          preposition: [],
+          emphasis: false,
+        };
+      }
+    });
+}