forked from aiscript-dev/aiscript
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
enhance: Add type declaration (aiscript-dev#146)
* parsing types * parsing types * parsing types * add types * fix * apply node structure for interpreter * add a plugin for type validation * fix * apply node structure for serializer * implement type declaration * add test * lint * add type scanning of fn content * clean code * refactor: type, type source * replace `argType` -> `type`
- Loading branch information
Showing
8 changed files
with
287 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| import * as aiscript from '../..'; | ||
| import { SemanticError } from '../../error'; | ||
| import { Node } from '../../node'; | ||
| import { getTypeBySource } from '../../type'; | ||
|
|
||
| function validate(node: Node) { | ||
| switch (node.type) { | ||
| case 'def': { | ||
| if (node.varType != null) { | ||
| getTypeBySource(node.varType); | ||
| } | ||
| validate(node.expr); | ||
| break; | ||
| } | ||
| case 'fn': { | ||
| for (const arg of node.args) { | ||
| if (arg.type != null) { | ||
| getTypeBySource(arg.type); | ||
| } | ||
| } | ||
| if (node.ret != null) { | ||
| getTypeBySource(node.ret); | ||
| } | ||
| for (const n of node.children) { | ||
| validate(n); | ||
| } | ||
| break; | ||
| } | ||
| } | ||
| // TODO: ブロックも全部スキャン | ||
| } | ||
|
|
||
| export function validateType(nodes: Node[]): Node[] { | ||
| for (const node of nodes) { | ||
| validate(node); | ||
| } | ||
| return nodes; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| import { SemanticError } from './error'; | ||
| import { Loc } from './node'; | ||
|
|
||
| // Type source (AST) | ||
|
|
||
| export type NamedTypeSource = { | ||
| type: 'named'; // 名前付き型 | ||
| loc?: Loc; // コード位置 | ||
| name: string; // 型名 | ||
| inner?: TypeSource; // 内側の型 | ||
| }; | ||
|
|
||
| export type FnTypeSource = { | ||
| type: 'fn' // 関数の型 | ||
| loc?: Loc; // コード位置 | ||
| args: TypeSource[]; // 引数の型 | ||
| result: TypeSource; // 戻り値の型 | ||
| }; | ||
|
|
||
| export type TypeSource = NamedTypeSource | FnTypeSource; | ||
|
|
||
| // Type (IR) | ||
|
|
||
| export type TSimple<N extends string = string> = { | ||
| type: 'simple'; | ||
| name: N; | ||
| } | ||
|
|
||
| export function T_SIMPLE<T extends string>(name: T): TSimple<T> { | ||
| return { | ||
| type: 'simple', | ||
| name: name | ||
| }; | ||
| } | ||
|
|
||
| export function isAny(x: Type): x is TSimple<'any'> { | ||
| return x.type == 'simple' && x.name == 'any'; | ||
| } | ||
|
|
||
| export type TGeneric<N extends string = string> = { | ||
| type: 'generic'; | ||
| name: N; | ||
| inners: Type[]; | ||
| } | ||
|
|
||
| export function T_GENERIC<N extends string>(name: N, inners: Type[]): TGeneric<N> { | ||
| return { | ||
| type: 'generic', | ||
| name: name, | ||
| inners: inners | ||
| }; | ||
| } | ||
|
|
||
| export type TFn = { | ||
| type: 'fn'; | ||
| args: Type[]; | ||
| result: Type; | ||
| }; | ||
|
|
||
| export function T_FN(args: Type[], result: Type): TFn { | ||
| return { | ||
| type: 'fn', | ||
| args, | ||
| result | ||
| }; | ||
| } | ||
|
|
||
| export type Type = TSimple | TGeneric | TFn; | ||
|
|
||
| // Utility | ||
|
|
||
| export function isCompatibleType(a: Type, b: Type): boolean { | ||
| if (isAny(a) || isAny(b)) return true; | ||
| if (a.type != b.type) return false; | ||
|
|
||
| switch (a.type) { | ||
| case 'simple': { | ||
| b = (b as TSimple); // NOTE: TypeGuardが効かない | ||
| if (a.name != b.name) return false; | ||
| break; | ||
| } | ||
| case 'generic': { | ||
| b = (b as TGeneric); // NOTE: TypeGuardが効かない | ||
| // name | ||
| if (a.name != b.name) return false; | ||
| // inners | ||
| if (a.inners.length != b.inners.length) return false; | ||
| for (let i = 0; i < a.inners.length; i++) { | ||
| if (!isCompatibleType(a.inners[i], b.inners[i])) return false; | ||
| } | ||
| break; | ||
| } | ||
| case 'fn': { | ||
| b = (b as TFn); | ||
| // fn result | ||
| if (!isCompatibleType(a.result, b.result)) return false; | ||
| // fn args | ||
| if (a.args.length != b.args.length) return false; | ||
| for (let i = 0; i < a.args.length; i++) { | ||
| if (!isCompatibleType(a.args[i], b.args[i])) return false; | ||
| } | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| export function getTypeName(type: Type): string { | ||
| switch (type.type) { | ||
| case 'simple': { | ||
| return type.name; | ||
| } | ||
| case 'generic': { | ||
| return `${ type.name }<${ type.inners.map(inner => getTypeName(inner)).join(', ') }>`; | ||
| } | ||
| case 'fn': { | ||
| return `@(${ type.args.map(arg => getTypeName(arg)).join(', ') }) => ${ getTypeName(type.result) }`; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| export function getTypeNameBySource(typeSource: TypeSource): string { | ||
| switch (typeSource.type) { | ||
| case 'named': { | ||
| if (typeSource.inner) { | ||
| const inner = getTypeNameBySource(typeSource.inner); | ||
| return `${ typeSource.name }<${ inner }>`; | ||
| } else { | ||
| return typeSource.name; | ||
| } | ||
| } | ||
| case 'fn': { | ||
| const args = typeSource.args.map(arg => getTypeNameBySource(arg)).join(', '); | ||
| const result = getTypeNameBySource(typeSource.result); | ||
| return `@(${ args }) => ${ result }`; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| export function getTypeBySource(typeSource: TypeSource): Type { | ||
| if (typeSource.type == 'named') { | ||
| switch (typeSource.name) { | ||
| // simple types | ||
| case 'null': | ||
| case 'bool': | ||
| case 'num': | ||
| case 'str': | ||
| case 'any': | ||
| case 'void': { | ||
| if (typeSource.inner == null) { | ||
| return T_SIMPLE(typeSource.name); | ||
| } | ||
| break; | ||
| } | ||
| // alias for Generic types | ||
| case 'arr': | ||
| case 'obj': { | ||
| let innerType: Type; | ||
| if (typeSource.inner != null) { | ||
| innerType = getTypeBySource(typeSource.inner); | ||
| } else { | ||
| innerType = T_SIMPLE('any'); | ||
| } | ||
| return T_GENERIC(typeSource.name, [innerType]); | ||
| } | ||
| } | ||
| throw new SemanticError(`Unknown type: '${ getTypeNameBySource(typeSource) }'`); | ||
| } else { | ||
| const argTypes = typeSource.args.map(arg => getTypeBySource(arg)); | ||
| return T_FN(argTypes, getTypeBySource(typeSource.result)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters