Locにノードの終了位置を追加

etc/aiscript.api.md

@@ -22,9 +22,9 @@ abstract class AiScriptError extends Error {
     // (undocumented)
     info?: any;
     // (undocumented)
-    loc?: Loc;
-    // (undocumented)
     name: string;
+    // (undocumented)
+    pos?: Pos;
 }
 
 // @public
@@ -34,11 +34,11 @@ class AiScriptIndexOutOfRangeError extends AiScriptRuntimeError {
 
 // @public
 class AiScriptNamespaceError extends AiScriptError {
-    constructor(message: string, loc: Loc, info?: any);
-    // (undocumented)
-    loc: Loc;
+    constructor(message: string, pos: Pos, info?: any);
     // (undocumented)
     name: string;
+    // (undocumented)
+    pos: Pos;
 }
 
 // @public
@@ -50,20 +50,20 @@ class AiScriptRuntimeError extends AiScriptError {
 
 // @public
 class AiScriptSyntaxError extends AiScriptError {
-    constructor(message: string, loc: Loc, info?: any);
-    // (undocumented)
-    loc: Loc;
+    constructor(message: string, pos: Pos, info?: any);
     // (undocumented)
     name: string;
+    // (undocumented)
+    pos: Pos;
 }
 
 // @public
 class AiScriptTypeError extends AiScriptError {
-    constructor(message: string, loc: Loc, info?: any);
-    // (undocumented)
-    loc: Loc;
+    constructor(message: string, pos: Pos, info?: any);
     // (undocumented)
     name: string;
+    // (undocumented)
+    pos: Pos;
 }
 
 // @public
@@ -119,6 +119,7 @@ declare namespace Ast {
     export {
         isStatement,
         isExpression,
+        Pos,
         Loc,
         Node_2 as Node,
         Namespace,
@@ -390,10 +391,10 @@ function isString(val: Value): val is VStr;
 // @public (undocumented)
 function jsToVal(val: any): Value;
 
-// @public
+// @public (undocumented)
 type Loc = {
-    line: number;
-    column: number;
+    start: Pos;
+    end: Pos;
 };
 
 // @public (undocumented)
@@ -503,6 +504,12 @@ export type ParserPlugin = (nodes: Ast.Node[]) => Ast.Node[];
 // @public (undocumented)
 export type PluginType = 'validate' | 'transform';
 
+// @public
+type Pos = {
+    line: number;
+    column: number;
+};
+
 // @public (undocumented)
 type Prop = NodeBase & {
     type: 'prop';

src/error.ts

@@ -1,11 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Loc } from './node.js';
+import type { Pos } from './node.js';
 
 export abstract class AiScriptError extends Error {
 	// name is read by Error.prototype.toString
 	public name = 'AiScript';
 	public info?: any;
-	public loc?: Loc;
+	public pos?: Pos;
 
 	constructor(message: string, info?: any) {
 		super(message);
@@ -34,17 +34,17 @@ export class NonAiScriptError extends AiScriptError {
  */
 export class AiScriptSyntaxError extends AiScriptError {
 	public name = 'Syntax';
-	constructor(message: string, public loc: Loc, info?: any) {
-		super(`${message} (Line ${loc.line}, Column ${loc.column})`, info);
+	constructor(message: string, public pos: Pos, info?: any) {
+		super(`${message} (Line ${pos.line}, Column ${pos.column})`, info);
 	}
 }
 /**
  * Type validation(parser/plugins/validate-type) errors.
  */ 
 export class AiScriptTypeError extends AiScriptError {
 	public name = 'Type';
-	constructor(message: string, public loc: Loc, info?: any) {
-		super(`${message} (Line ${loc.line}, Column ${loc.column})`, info);
+	constructor(message: string, public pos: Pos, info?: any) {
+		super(`${message} (Line ${pos.line}, Column ${pos.column})`, info);
 	}
 }
 
@@ -53,8 +53,8 @@ export class AiScriptTypeError extends AiScriptError {
  */
 export class AiScriptNamespaceError extends AiScriptError {
 	public name = 'Namespace';
-	constructor(message: string, public loc: Loc, info?: any) {
-		super(`${message} (Line ${loc.line}, Column ${loc.column})`, info);
+	constructor(message: string, public pos: Pos, info?: any) {
+		super(`${message} (Line ${pos.line}, Column ${pos.column})`, info);
 	}
 }
 

src/interpreter/index.ts

@@ -191,7 +191,7 @@ export class Interpreter {
 			switch (node.type) {
 				case 'def': {
 					if (node.mut) {
-						throw new AiScriptNamespaceError('No "var" in namespace declaration: ' + node.name, node.loc);
+						throw new AiScriptNamespaceError('No "var" in namespace declaration: ' + node.name, node.loc.start);
 					}
 
 					const variable: Variable = {
@@ -211,7 +211,7 @@ export class Interpreter {
 					// exhaustiveness check
 					const n: never = node;
 					const nd = n as Ast.Node;
-					throw new AiScriptNamespaceError('invalid ns member type: ' + nd.type, nd.loc);
+					throw new AiScriptNamespaceError('invalid ns member type: ' + nd.type, nd.loc.start);
 				}
 			}
 		}
@@ -246,11 +246,11 @@ export class Interpreter {
 	@autobind
 	private _eval(node: Ast.Node, scope: Scope): Promise<Value> {
 		return this.__eval(node, scope).catch(e => {
-			if (e.loc) throw e;
+			if (e.pos) throw e;
 			else {
 				const e2 = (e instanceof AiScriptError) ? e : new NonAiScriptError(e);
-				e2.loc = node.loc;
-				e2.message = `${e2.message} (Line ${node.loc.line}, Column ${node.loc.column})`;
+				e2.pos = node.loc.start;
+				e2.message = `${e2.message} (Line ${e2.pos.line}, Column ${e2.pos.column})`;
 				throw e2;
 			}
 		});

src/node.ts

@@ -2,11 +2,16 @@
  * ASTノード
 */
 
-export type Loc = {
+export type Pos = {
 	line: number;
 	column: number;
 };
 
+export type Loc = {
+	start: Pos;
+	end: Pos;
+};
+
 export type Node = Namespace | Meta | Statement | Expression | TypeSource | Attribute;
 
 type NodeBase = {

src/parser/plugins/validate-keyword.ts

@@ -53,7 +53,7 @@ const reservedWord = [
 ];
 
 function throwReservedWordError(name: string, loc: Ast.Loc): void {
-	throw new AiScriptSyntaxError(`Reserved word "${name}" cannot be used as variable name.`, loc);
+	throw new AiScriptSyntaxError(`Reserved word "${name}" cannot be used as variable name.`, loc.start);
 }
 
 function validateNode(node: Ast.Node): Ast.Node {