Interpreterの型付けを修正 (aiscript-dev#307)

FineArchs · Aug 20, 2023 · b6ca5fc · b6ca5fc
1 parent 49e3156
commit b6ca5fc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/etc/aiscript.api.md b/etc/aiscript.api.md
@@ -511,7 +511,12 @@ type InfixOperator = '||' | '&&' | '==' | '!=' | '<=' | '>=' | '<' | '>' | '+' |
 
 // @public (undocumented)
 export class Interpreter {
-    constructor(vars: Interpreter['vars'], opts?: Interpreter['opts']);
+    constructor(vars: Record<string, Value>, opts?: {
+        in?(q: string): Promise<string>;
+        out?(value: Value): void;
+        log?(type: string, params: Record<string, any>): void;
+        maxStep?: number;
+    });
     // (undocumented)
     abort(): void;
     // (undocumented)

diff --git a/src/interpreter/index.ts b/src/interpreter/index.ts
@@ -16,21 +16,20 @@ const IRQ_RATE = 300;
 const IRQ_AT = IRQ_RATE - 1;
 
 export class Interpreter {
-	private vars: Record<string, Value>;
-	private opts: {
-		in?(q: string): Promise<string>;
-		out?(value: Value): void;
-		log?(type: string, params: Record<string, any>): void;
-		maxStep?: number;
-	};
 	public stepCount = 0;
 	private stop = false;
 	public scope: Scope;
 	private abortHandlers: (() => void)[] = [];
 
-	constructor(vars: Interpreter['vars'], opts?: Interpreter['opts']) {
-		this.opts = opts ?? {};
-
+	constructor(
+		private vars: Record<string, Value>,
+		private opts: {
+			in?(q: string): Promise<string>;
+			out?(value: Value): void;
+			log?(type: string, params: Record<string, any>): void;
+			maxStep?: number;
+		} = {},
+	) {
 		const io = {
 			print: FN_NATIVE(([v]) => {
 				expectAny(v);