update

ota-meshi · Apr 7, 2022 · e20a1e6 · e20a1e6
1 parent 6382efe
commit e20a1e6
Show file tree

Hide file tree

Showing 3 changed files with 131 additions and 104 deletions.
diff --git a/src/context.ts b/src/context.ts
@@ -76,13 +76,21 @@ export class Context {
     }
 
     /* istanbul ignore next */
-    public throwUnexpectedTokenError(cst: CST.Token): ParseError {
+    public throwUnexpectedTokenError(cst: CST.Token | Token): ParseError {
         const token = "source" in cst ? `'${cst.source}'` : cst.type
         throw this.throwError(`Unexpected token: ${token}`, cst)
     }
 
-    public throwError(message: string, cst: CST.Token | number): ParseError {
-        const offset = typeof cst === "number" ? cst : cst.offset
+    public throwError(
+        message: string,
+        cst: CST.Token | Token | number,
+    ): ParseError {
+        const offset =
+            typeof cst === "number"
+                ? cst
+                : "offset" in cst
+                ? cst.offset
+                : cst.range[0]
         const loc = this.getLocFromIndex(offset)
         throw new ParseError(message, offset, loc.line, loc.column)
     }