progress

FartLabs · Nov 25, 2021 · e43b212 · e43b212 · deno-deploy · Nov 25, 2021
1 parent 0ebac47
commit e43b212
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/tokenize/lexicon.ts b/lib/tokenize/lexicon.ts
@@ -19,7 +19,9 @@ export enum Lexicon {
   EOF,
 }
 
-export const LEXICON: ReadonlyMap<Lexicon, string | string[] | null> = new Map<
+export type LexiconType = ReadonlyMap<Lexicon, string | string[] | null>;
+
+export const LEXICON: LexiconType = new Map<
   Lexicon,
   string | string[] | null
 >([

diff --git a/lib/tokenize/tokenize.ts b/lib/tokenize/tokenize.ts
@@ -1,4 +1,4 @@
-import { LEXICON, Lexicon } from "./lexicon.ts";
+import { LEXICON, Lexicon, LexiconType } from "./lexicon.ts";
 import { Token } from "./token.ts";
 import { findInLexicon } from "./utils.ts";
 
@@ -40,7 +40,7 @@ const INITIAL_TOKENIZATION_STATE: Readonly<TokenizationState> = Object.freeze({
 
 export function* tokenize(
   input: string,
-  lex: ReadonlyMap<Lexicon, string | string[] | null> = LEXICON,
+  lex: LexiconType = LEXICON,
 ): FartTokenGenerator {
   const memo = { ...INITIAL_TOKENIZATION_STATE };
 

diff --git a/lib/tokenize/utils.ts b/lib/tokenize/utils.ts
@@ -1,8 +1,8 @@
-import { Lexicon } from "./lexicon.ts";
+import { Lexicon, LexiconType } from "./lexicon.ts";
 
 export const findInLexicon = (
   raw: string | null,
-  lex: ReadonlyMap<Lexicon, string | string[] | null>,
+  lex: LexiconType,
 ): Lexicon | null => {
   if (raw === null) return null;
   for (const [kind, value] of lex) {