stdを分離

Author: uzmoi

src/interpreter/index.ts

@@ -7,7 +7,6 @@ import { AiScriptError, NonAiScriptError, AiScriptNamespaceError, AiScriptIndexO
 import * as Ast from '../node.js';
 import { nodeToJs } from '../utils/node-to-js.js';
 import { Scope } from './scope.js';
-import { std } from './lib/std.js';
 import { RETURN, unWrapRet, BREAK, CONTINUE, assertValue, isControl, type Control, unWrapLabeledBreak } from './control.js';
 import { assertNumber, assertString, assertFunction, assertBoolean, assertObject, assertArray, eq, isObject, isArray, expectAny, reprValue, isFunction } from './util.js';
 import { NULL, FN_NATIVE, BOOL, NUM, STR, ARR, OBJ, FN, ERROR } from './value.js';
@@ -36,12 +35,11 @@ export class Interpreter {
 	private abortHandlers: (() => void)[] = [];
 	private pauseHandlers: (() => void)[] = [];
 	private unpauseHandlers: (() => void)[] = [];
-	private vars: Record<string, Variable> = {};
 	private irqRate: number;
 	private irqSleep: () => Promise<void>;
 
 	constructor(
-		consts: Record<string, Value>,
+		globals: Record<string, Value>,
 		private opts: {
 			in?(q: string): Promise<string>;
 			out?(value: Value): void;
@@ -67,13 +65,12 @@ export class Interpreter {
 			}),
 		};
 
-		this.vars = Object.fromEntries(Object.entries({
-			...consts,
-			...std,
-			...io,
-		}).map(([k, v]) => [k, Variable.const(v)]));
-
-		this.scope = new Scope([new Map(Object.entries(this.vars))]);
+		this.scope = new Scope([
+			new Map(
+				Object.entries({ ...globals, ...io })
+					.map(([k, v]) => [k, Variable.const(v)]),
+			),
+		]);
 		this.scope.opts.log = (type, params): void => {
 			switch (type) {
 				case 'add': this.log('var:add', params); break;

test/interpreter.ts

@@ -2,6 +2,7 @@ import * as assert from 'assert';
 import { describe, expect, test, vi, beforeEach, afterEach } from 'vitest';
 import { Parser, Interpreter, values, errors, utils, Ast } from '../src';
 import { FALSE, NUM, OBJ, STR, TRUE, Value } from '../src/interpreter/value';
+import { std } from '../src/interpreter/lib/std';
 
 let { FN_NATIVE } = values;
 let { AiScriptRuntimeError, AiScriptIndexOutOfRangeError, AiScriptHostsideError } = errors;
@@ -261,6 +262,7 @@ describe('pause', () => {
 		let count = 0;
 
 		const interpreter = new Interpreter({
+			...std,
 			count: values.FN_NATIVE(() => { count++; }),
 		}, {});
 

test/testutils.ts

@@ -1,11 +1,12 @@
 import { expect as globalExpect } from 'vitest';
 import { Parser, Interpreter } from '../src';
 import { Value } from '../src/interpreter/value';
+import { std } from '../src/interpreter/lib/std';
 
 export async function exe(script: string): Promise<Value | undefined> {
 	const parser = new Parser();
 	let result = undefined;
-	const interpreter = new Interpreter({}, {
+	const interpreter = new Interpreter(std, {
 		out(value) {
 			if (!result) result = value;
 			else if (!Array.isArray(result)) result = [result, value];
@@ -23,7 +24,7 @@ export async function exe(script: string): Promise<Value | undefined> {
 
 export function exeSync(script: string): Value | undefined {
 	const parser = new Parser();
-	const interpreter = new Interpreter({}, {
+	const interpreter = new Interpreter(std, {
 		out(value) {
 		},
 		log(type, {val}) {