use more throw expression

Author: neverRare

dictionary/parser.ts

@@ -322,13 +322,10 @@ const definition = choiceOnlyOne<Definition>(
     adjective.skip(keyword("and")).skip(tag(keyword("c"))),
     adjective,
   )
-    .filter(([first, second]) => {
-      if (first.adverb.length === 0 && second.adverb.length === 0) {
-        return true;
-      } else {
-        throw new ArrayResultError("compound adjective cannot have adverb");
-      }
-    })
+    .filter(([first, second]) =>
+      (first.adverb.length === 0 && second.adverb.length === 0) ||
+      throwError(new ArrayResultError("compound adjective cannot have adverb"))
+    )
     .skip(semicolon)
     .map((adjective) => ({ type: "compound adjective", adjective })),
   noun

src/parser/filter.ts

@@ -193,17 +193,11 @@ export const PHRASE_RULE: ReadonlyArray<(phrase: Phrase) => boolean> = [
     !phraseHasTopLevelEmphasis(phrase.phrase),
 
   // Emphasis must not be nested
-  (phrase) => {
-    if (
-      phrase.emphasis == null ||
-      everyWordUnitInPhrase(phrase)
-        .every(({ emphasis }) => emphasis == null)
-    ) {
-      return true;
-    } else {
-      throw new UnrecognizedError("nested emphasis");
-    }
-  },
+  (phrase) =>
+    phrase.emphasis == null ||
+    everyWordUnitInPhrase(phrase)
+      .every(({ emphasis }) => emphasis == null) ||
+    throwError(new UnrecognizedError("nested emphasis")),
 ];
 export const PREPOSITION_RULE: ReadonlyArray<(phrase: Preposition) => boolean> =
   [

src/translator/nanpa.ts

@@ -1,3 +1,4 @@
+import { throwError } from "../../misc/misc.ts";
 import { ArrayResult } from "../array_result.ts";
 import * as TokiPona from "../parser/ast.ts";
 import * as English from "./ast.ts";
@@ -13,18 +14,19 @@ export function nanpa(
     includeGerund: true,
     includeVerb: false,
   })
-    .map((phrase) => {
-      if (phrase.type !== "noun") {
-        throw new FilteredError(
-          `${phrase.type} within "position X" phrase`,
-        );
-      } else if (
-        (phrase.noun as English.NounPhrase & { type: "simple" })
-          .preposition.length > 0
-      ) {
-        throw new FilteredError('preposition within "position X" phrase');
-      } else {
-        return {
+    .map((phrase) =>
+      phrase.type !== "noun"
+        ? throwError(
+          new FilteredError(
+            `${phrase.type} within "position X" phrase`,
+          ),
+        )
+        : (phrase.noun as English.NounPhrase & { type: "simple" })
+            .preposition.length > 0
+        ? throwError(
+          new FilteredError('preposition within "position X" phrase'),
+        )
+        : {
           type: "simple",
           determiner: [],
           adjective: [],
@@ -38,7 +40,6 @@ export function nanpa(
           postAdjective: null,
           preposition: [],
           emphasis: false,
-        };
-      }
-    });
+        }
+    );
 }