reorganize

Author: neverRare

dictionary/parser.ts

@@ -27,11 +27,26 @@ import { Definition, Noun, PartialVerb } from "./type.ts";
 
 const RESERVED_SYMBOLS = "#()*+/:;<=>@[\\]^`{|}~";
 
-function lex<T>(parser: Parser<T>): Parser<T> {
-  return parser.skip(ignore);
-}
+const hashSign = matchString("#", "hash sign");
+const backtick = matchString("`", "backtick");
+const colon = matchString(":", "colon");
+
+const tokiPonaWord = lex(match(/[a-z][a-zA-Z]*/, "word"));
+const openParenthesis = lex(matchString("(", "open parenthesis"));
+const closeParenthesis = lex(matchString(")", "close parenthesis"));
+const openBracket = lex(matchString("[", "open bracket"));
+const closeBracket = lex(matchString("]", "close bracket"));
+const comma = lex(matchString(",", "comma"));
+const semicolon = lex(matchString(";", "semicolon"));
+const slash = lex(matchString("/", "slash"));
+
+const character = match(/./u, "character");
+const wordCharacter = match(
+  new RegExp(`[^${escapeRegex(RESERVED_SYMBOLS)}]`),
+  "word character",
+);
 const comment = checkedSequence(
-  matchString("#", "hash sign"),
+  hashSign,
   match(/[^\n]*?(?=\r?\n|$)/, "comment content"),
 );
 const spaces = checkedSequence(
@@ -40,26 +55,13 @@ const spaces = checkedSequence(
 );
 const ignore = allWithCheck(
   new CheckedParser(
-    choiceOnlyOne(comment.check, spaces.check),
+    choiceOnlyOne(hashSign, spaces.check),
     choiceWithCheck(spaces, comment),
   ),
 );
-const backtick = matchString("`", "backtick");
-const colon = matchString(":", "colon");
-const character = match(/./u, "character");
-const wordCharacter = match(
-  new RegExp(`[^${escapeRegex(RESERVED_SYMBOLS)}]`),
-  "word character",
-);
-const tokiPonaWord = lex(match(/[a-z][a-zA-Z]*/, "word"));
-const openParenthesis = lex(matchString("(", "open parenthesis"));
-const closeParenthesis = lex(matchString(")", "close parenthesis"));
-const openBracket = lex(matchString("[", "open bracket"));
-const closeBracket = lex(matchString("]", "close bracket"));
-const comma = lex(matchString(",", "comma"));
-const semicolon = lex(matchString(";", "semicolon"));
-const slash = lex(matchString("/", "slash"));
-
+function lex<T>(parser: Parser<T>): Parser<T> {
+  return parser.skip(ignore);
+}
 const keyword = memoize(<T extends string>(keyword: T) =>
   lex(withPosition(match(/[a-z\-]+/, `"${keyword}"`)))
     .map((positioned) =>
@@ -79,7 +81,7 @@ const unescapedWord = sequence(
   choiceWithCheck(checkedCharacter, escape),
   allWithCheck(
     new CheckedParser(
-      choiceOnlyOne(wordCharacter, backtick, comment.check),
+      choiceOnlyOne(wordCharacter, backtick, hashSign),
       choiceWithCheck(checkedCharacter, escape, comment.map(() => "")),
     ),
   ),