型チェッカーを強化

Author: ikasoba

features/core/errors/AiTypeError.ts

@@ -8,6 +8,8 @@ export enum AiTypeErrorKind {
   MissingArgumentError,
   InvalidArgumentError,
   CanNotAssignToImmutableVariable,
+  UnDeclaredVariable,
+  CanNotReadProperty,
 }
 
 export class AiTypeError extends Error {
@@ -64,3 +66,19 @@ export class AiCanNotAssignToImmutableVariableError extends AiTypeError {
     super(AiTypeErrorKind.CanNotAssignToImmutableVariable, location);
   }
 }
+
+export class AiUnDeclaredVariableError extends AiTypeError {
+  constructor(public name: string, location: SourceLocation) {
+    super(AiTypeErrorKind.UnDeclaredVariable, location);
+  }
+}
+
+export class AiCanNotReadPropertyError extends AiTypeError {
+  constructor(
+    public targetType: string,
+    public name: string,
+    location: SourceLocation
+  ) {
+    super(AiTypeErrorKind.CanNotReadProperty, location);
+  }
+}

features/core/errors/index.ts

@@ -11,6 +11,8 @@ import {
   AiMissingArgumentError,
   AiInvalidArgumentError,
   AiCanNotAssignToImmutableVariableError,
+  AiUnDeclaredVariableError,
+  AiCanNotReadPropertyError,
 } from "./AiTypeError.js";
 
 export type ParserError =
@@ -25,4 +27,6 @@ export type TypeError =
   | AiCanNotCallError
   | AiMissingArgumentError
   | AiInvalidArgumentError
-  | AiCanNotAssignToImmutableVariableError;
+  | AiCanNotAssignToImmutableVariableError
+  | AiUnDeclaredVariableError
+  | AiCanNotReadPropertyError;

features/core/i18n/aiscript/typeError.ts

@@ -2,10 +2,12 @@ import {
   AiAlreadyDeclaredVariableError,
   AiCanNotAssignToImmutableVariableError,
   AiCanNotCallError,
+  AiCanNotReadPropertyError,
   AiInvalidArgumentError,
   AiMissingArgumentError,
   AiNotAssignableTypeError,
   AiTypeErrorKind,
+  AiUnDeclaredVariableError,
 } from "../../errors/AiTypeError.js";
 import { TypeError } from "../../index.js";
 import { I18nLocalizerResult, I18nMessage, I18nMessages } from "../core.js";
@@ -31,6 +33,12 @@ export const typeErrorMessage = {
     CanNotAssignToImmutableVariable(name: string) {
       return `変数\`${name}\`は不変なので、新たに代入することはできません。`;
     },
+    UnDeclaredVariable(name: string) {
+      return `変数\`${name}\`は定義されていません。`;
+    },
+    CanNotReadProperty(target: string, name: string) {
+      return `型\`${target}\`から\`${name}\`プロパティを読み取れません。`;
+    },
   } satisfies I18nMessage<keyof typeof AiTypeErrorKind>,
 } satisfies I18nMessages;
 
@@ -52,6 +60,10 @@ export const typeErrorLocalizer = (
     return ["typing.MissingArgumentError", [error.pos, error.expectType]];
   } else if (error instanceof AiCanNotAssignToImmutableVariableError) {
     return ["typing.CanNotAssignToImmutableVariable", [error.name]];
+  } else if (error instanceof AiUnDeclaredVariableError) {
+    return ["typing.UnDeclaredVariable", [error.name]];
+  } else if (error instanceof AiCanNotReadPropertyError) {
+    return ["typing.CanNotReadProperty", [error.targetType, error.name]];
   }
 
   switch (error.kind) {
@@ -71,9 +83,15 @@ export const typeErrorLocalizer = (
       ];
 
     case AiTypeErrorKind.MissingArgumentError:
-      return ["typing.MissingArgumentError", [-1, "<:unknown:>"]];
+      return ["typing.MissingArgumentError", [NaN, "<:unknown:>"]];
 
     case AiTypeErrorKind.CanNotAssignToImmutableVariable:
       return ["typing.CanNotAssignToImmutableVariable", ["<:unknown:>"]];
+
+    case AiTypeErrorKind.UnDeclaredVariable:
+      return ["typing.UnDeclaredVariable", ["<:unknown:>"]];
+
+    case AiTypeErrorKind.CanNotReadProperty:
+      return ["typing.CanNotReadProperty", ["<:unknown:>", "<:unknown:>"]];
   }
 };

features/core/server/LanguageServer.ts

@@ -16,6 +16,8 @@ import { parserErrorLocalizer } from "../i18n/aiscript/syntaxError.js";
 import { aiLocation2LspPosition } from "./location.js";
 import { TypeChecker } from "../typing/TypeChecker.js";
 import { typeErrorLocalizer } from "../i18n/aiscript/typeError.js";
+import { AiScriptError } from "@syuilo/aiscript/error.js";
+import { SourceLocation } from "../parser/SourceRange.js";
 
 export * as Lsp from "vscode-languageserver";
 export * as TextDocument from "vscode-languageserver-textdocument";
@@ -61,7 +63,9 @@ export class LanguageServer {
     this.conn.console.log("did change content - " + change.document.uri);
 
     try {
+      this.conn.console.log("start parse");
       const ast = this.parser.parseFromString(text, parserErrors);
+      this.conn.console.log("end parse");
       for (const error of parserErrors) {
         const message = this.i18n.localize(parserErrorLocalizer, error);
 
@@ -77,8 +81,10 @@ export class LanguageServer {
       }
 
       const scope = this.typeChecker.globalScope.copy();
+      this.conn.console.log("start type check");
       this.typeChecker.preRunBlock(ast, scope, typeErrors);
       this.typeChecker.runBlock(ast, scope, typeErrors);
+      this.conn.console.log("end type check");
 
       for (const error of typeErrors) {
         const message = this.i18n.localize(typeErrorLocalizer, error);
@@ -99,20 +105,21 @@ export class LanguageServer {
         diagnostics: diagnostics,
       });
     } catch (err) {
+      const loc: SourceLocation = (err instanceof AiScriptError
+        ? err.loc
+        : null) ?? {
+        column: 0,
+        line: 0,
+      };
+
       this.conn.sendDiagnostics({
         uri: change.document.uri,
         diagnostics: [
           {
             message: "" + err,
             range: {
-              start: {
-                character: 0,
-                line: 0,
-              },
-              end: {
-                character: 0,
-                line: 9,
-              },
+              start: aiLocation2LspPosition(loc),
+              end: aiLocation2LspPosition(loc),
             },
           },
         ],

features/core/typing/Scope.ts

@@ -1,13 +1,14 @@
 import { Ast } from "@syuilo/aiscript/index.js";
 import { AiAlreadyDeclaredVariableError } from "../errors/AiTypeError.js";
-import { TypeValue } from "./TypeValue.js";
+import { TypeValue, ident, primitiveType } from "./TypeValue.js";
 import { Variable } from "./Variable.js";
 
 export class Scope {
   constructor(
     private parent?: Scope,
     private types = new Map<string, TypeValue>(),
-    private variables = new Map<string, Variable>()
+    private variables = new Map<string, Variable>(),
+    private overridedVariables = new Map<string, Variable>()
   ) {}
 
   copy() {
@@ -35,16 +36,23 @@ export class Scope {
   }
 
   defineVariable(ident: Ast.Identifier, variable: Variable) {
-    if (this.variables.has(ident.name) == null) {
+    if (this.variables.has(ident.name)) {
       return new AiAlreadyDeclaredVariableError(ident.name, ident.loc);
     }
 
     this.variables.set(ident.name, variable);
   }
 
+  overrideVariable(ident: Ast.Identifier, variable: Variable) {
+    this.overridedVariables.set(ident.name, variable);
+  }
+
   getVariable(ident: Ast.Identifier): Variable | null {
     return (
-      this.parent?.getVariable(ident) ?? this.variables.get(ident.name) ?? null
+      this.overridedVariables.get(ident.name) ??
+      this.parent?.getVariable(ident) ??
+      this.variables.get(ident.name) ??
+      null
     );
   }