refactor (#168)

ota-meshi · Nov 8, 2023 · 9a84691 · 9a84691
1 parent 45d909e
commit 9a84691
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/tokenizer/code-point-iterator.ts b/src/tokenizer/code-point-iterator.ts
@@ -63,6 +63,13 @@ export class CodePointIterator {
     return (this.lastCodePoint = cp);
   }
 
+  public currChar(): string {
+    const cp = this.lastCodePoint;
+    if (cp === CodePoint.LINE_FEED) return "\n";
+    if (cp < 0x10000) return this.text[this.start.offset];
+    return this.text.slice(this.start.offset, this.end.offset);
+  }
+
   public *iterateSubCodePoints(): IterableIterator<number> {
     let index = this.end.offset;
     while (true) {

diff --git a/src/tokenizer/tokenizer.ts b/src/tokenizer/tokenizer.ts
@@ -543,7 +543,7 @@ export class Tokenizer {
         }
         return this.reportParseError("invalid-char-in-escape-sequence");
       }
-      out += this.currChar(cp);
+      out += this.currChar();
       cp = this.nextCode();
     }
     if (cp !== CodePoint.QUOTATION_MARK) {
@@ -640,7 +640,7 @@ export class Tokenizer {
         }
         return this.reportParseError("invalid-char-in-escape-sequence");
       }
-      out += this.currChar(cp);
+      out += this.currChar();
       cp = this.nextCode();
     }
 
@@ -665,7 +665,7 @@ export class Tokenizer {
       if (isControlOtherThanTab(cp)) {
         return this.reportParseErrorControlChar();
       }
-      out += this.currChar(cp);
+      out += this.currChar();
       cp = this.nextCode();
     }
     if (cp !== CodePoint.SINGLE_QUOTE) {
@@ -706,7 +706,7 @@ export class Tokenizer {
           return "DATA";
         }
       }
-      out += this.currChar(cp);
+      out += this.currChar();
       cp = this.nextCode();
     }
     return this.reportParseError("unterminated-string");
@@ -1208,7 +1208,7 @@ export class Tokenizer {
           return this.reportParseError("invalid-underscore");
         }
       } else {
-        out += this.currChar(cp);
+        out += this.currChar();
       }
       before = cp;
       cp = this.nextCode();
@@ -1249,13 +1249,8 @@ export class Tokenizer {
     return this.reportParseError("invalid-control-character");
   }
 
-  private currChar(cp: number): string {
-    if (cp === CodePoint.LINE_FEED) return "\n";
-    if (cp < 0x10000) return this.text[this.codePointIterator.start.offset];
-    return this.text.slice(
-      this.codePointIterator.start.offset,
-      this.codePointIterator.end.offset,
-    );
+  private currChar(): string {
+    return this.codePointIterator.currChar();
   }
 }