update fixer

Author: neverRare

src/translator/fixer.ts

@@ -15,6 +15,15 @@ function rankNoun(noun: English.NounPhrase): number {
 function fixNounPhrase(noun: English.NounPhrase): English.NounPhrase {
   switch (noun.type) {
     case "simple":
+      // if (noun.postAdjective != null && noun.prepositions.length > 0) {
+      //   throw new FilteredError("named noun with preposition");
+      // }
+      if (
+        noun.postCompound != null && noun.postCompound.type === "simple" &&
+        noun.postCompound.prepositions.length > 0
+      ) {
+        new FilteredError(`preposition within "${noun.noun.word} X" phrase`);
+      }
       return {
         ...noun,
         determiners: fixMultipleDeterminers(noun.determiners),

src/translator/nanpa.ts

@@ -21,12 +21,6 @@ export function nanpa(
             `${phrase.type} within "position X" phrase`,
           ),
         )
-        // TODO: do this on `fixer.ts` instead
-        : (phrase.noun as English.NounPhrase & { type: "simple" })
-            .prepositions.length > 0
-        ? throwError(
-          new FilteredError('preposition within "position X" phrase'),
-        )
         : {
           type: "simple",
           determiners: [],

src/translator/phrase.ts

@@ -65,10 +65,6 @@ function nounPhrase(
       );
     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");
-    }
     const { nounPreposition } = modifier;
     const headNoun = fromNounForms(noun, quantity)
       .map(({ noun: useWord, quantity }): English.NounPhrase => ({