Michcio/FoundKey-0x7f
1
1
Fork 0
forked from FoundKeyGang/FoundKey
Code Pull requests Releases Activity

Refactor

Browse source
This commit is contained in:
syuilo 2019-05-01 19:20:47 +09:00
parent c3cd6ad2d2
commit 8b13e3c327
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/misc/aiscript/type-checker.ts
View file

@ -32,7 +32,7 @@ export class ASTypeChecker {
for (let i = 0; i < def.in.length; i++) { for (let i = 0; i < def.in.length; i++) {
const arg = def.in[i]; const arg = def.in[i];
const type = this.typeInference(v.args[i]); const type = this.infer(v.args[i]);
if (type === null) continue; if (type === null) continue;
if (typeof arg === 'number') { if (typeof arg === 'number') {
@ -68,7 +68,7 @@ export class ASTypeChecker {
for (let i = 0; i < def.in.length; i++) { for (let i = 0; i < def.in.length; i++) {
const arg = def.in[i]; const arg = def.in[i];
const type = this.typeInference(v.args[i]); const type = this.infer(v.args[i]);
if (type === null) continue; if (type === null) continue;
if (typeof arg === 'number') { if (typeof arg === 'number') {
@ -86,7 +86,7 @@ export class ASTypeChecker {
} }
@autobind @autobind
public typeInference(v: Block): Type | null { public infer(v: Block): Type | null {
if (v.type === null) return null; if (v.type === null) return null;
if (v.type === 'text') return 'string'; if (v.type === 'text') return 'string';
if (v.type === 'multiLineText') return 'string'; if (v.type === 'multiLineText') return 'string';
@ -95,7 +95,7 @@ export class ASTypeChecker {
if (v.type === 'ref') { if (v.type === 'ref') {
const variable = this.variables.find(va => va.name === v.value); const variable = this.variables.find(va => va.name === v.value);
if (variable) { if (variable) {
return this.typeInference(variable); return this.infer(variable);
} }
const pageVar = this.pageVars.find(va => va.name === v.value); const pageVar = this.pageVars.find(va => va.name === v.value);
@ -120,7 +120,7 @@ export class ASTypeChecker {
for (let i = 0; i < def.in.length; i++) { for (let i = 0; i < def.in.length; i++) {
const arg = def.in[i]; const arg = def.in[i];
if (typeof arg === 'number') { if (typeof arg === 'number') {
const type = this.typeInference(v.args[i]); const type = this.infer(v.args[i]);
if (generic[arg] === undefined) { if (generic[arg] === undefined) {
generic[arg] = type; generic[arg] = type;
@ -142,7 +142,7 @@ export class ASTypeChecker {
@autobind @autobind
public getVarsByType(type: Type | null): Variable[] { public getVarsByType(type: Type | null): Variable[] {
if (type == null) return this.variables; if (type == null) return this.variables;
return this.variables.filter(x => (this.typeInference(x) === null) || (this.typeInference(x) === type)); return this.variables.filter(x => (this.infer(x) === null) || (this.infer(x) === type));
} }
@autobind @autobind