refactor

terrario-js · Aug 14, 2023 · a580e68 · a580e68
1 parent 4e21ee4
commit a580e68
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/src/string-parser.ts b/src/string-parser.ts
@@ -25,10 +25,11 @@ export class StringParser<U> {
     this.tag = opts.tag ?? '';
     if (opts.handler != null) {
       this.ctx = {
+        kind: 'strict',
         handler: wrapByTraceHandler(opts.handler, this.tag),
       };
     } else {
-      this.ctx = opts.lazy;
+      this.ctx = { kind: 'lazy', handler: opts.lazy };
     }
   }
 
@@ -38,10 +39,11 @@ export class StringParser<U> {
    * @internal
   */
   _evalContext(): ParserContext<U> {
-    if (typeof this.ctx === 'function') {
-      const parser = this.ctx();
+    if (this.ctx.kind === 'lazy') {
+      const parser = this.ctx.handler();
       const ctx = parser._evalContext();
       this.ctx = {
+        kind: 'strict',
         handler: wrapByTraceHandler(ctx.handler, this.tag),
       };
     }
@@ -202,7 +204,7 @@ export type StrictParserOpts<U> = {
  * @internal
 */
 export type LazyParserOpts<U> = {
-  lazy: LazyContext<U>,
+  lazy: () => StringParser<U>,
   tag?: string,
   handler?: undefined,
 };
@@ -218,14 +220,17 @@ export type ParserHandler<U> = (input: string, index: number, state: any) => Res
  * @internal
 */
 export type ParserContext<U> = {
-  handler: ParserHandler<U>;
+  kind: 'strict',
+  handler: ParserHandler<U>,
 };
 
 /**
  * @internal
 */
-export type LazyContext<U> =
-  () => StringParser<U>;
+export type LazyContext<U> = {
+  kind: 'lazy',
+  handler: () => StringParser<U>,
+};
 
 /**
  * Get result type of Parser.

diff --git a/src/token-parser.ts b/src/token-parser.ts
@@ -25,10 +25,11 @@ export class TokenParser<U> {
     this.tag = opts.tag ?? '';
     if (opts.handler != null) {
       this.ctx = {
+        kind: 'strict',
         handler: wrapByTraceHandler(opts.handler, this.tag),
       };
     } else {
-      this.ctx = opts.lazy;
+      this.ctx = { kind: 'lazy', handler: opts.lazy };
     }
   }
 
@@ -38,10 +39,11 @@ export class TokenParser<U> {
    * @internal
   */
   _evalContext(): ParserContext<U> {
-    if (typeof this.ctx === 'function') {
-      const parser = this.ctx();
+    if (this.ctx.kind === 'lazy') {
+      const parser = this.ctx.handler();
       const ctx = parser._evalContext();
       this.ctx = {
+        kind: 'strict',
         handler: wrapByTraceHandler(ctx.handler, this.tag),
       };
     }
@@ -185,7 +187,7 @@ export type StrictParserOpts<U> = {
  * @internal
 */
 export type LazyParserOpts<U> = {
-  lazy: LazyContext<U>,
+  lazy: () => TokenParser<U>,
   tag?: string,
   handler?: undefined,
 };
@@ -201,14 +203,17 @@ export type ParserHandler<U> = (input: string[], index: number, state: any) => R
  * @internal
 */
 export type ParserContext<U> = {
-  handler: ParserHandler<U>;
+  kind: 'strict',
+  handler: ParserHandler<U>,
 };
 
 /**
  * @internal
 */
-export type LazyContext<U> =
-  () => TokenParser<U>;
+export type LazyContext<U> = {
+  kind: 'lazy',
+  handler: () => TokenParser<U>,
+};
 
 /**
  * Get result type of Parser.