Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/interpreter/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export class Interpreter {
}

const value = await this._eval(node.expr, nsScope);
this.define(nsScope, node.dest, value, node.mut);
await this.define(nsScope, node.dest, value, node.mut);

break;
}
Expand Down Expand Up @@ -396,7 +396,7 @@ export class Interpreter {
}
value.attr = attrs;
}
this.define(scope, node.dest, value, node.mut);
await this.define(scope, node.dest, value, node.mut);
return NULL;
}

Expand Down
30 changes: 24 additions & 6 deletions src/parser/plugins/validate-keyword.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,33 @@ function throwReservedWordError(name: string, loc: Ast.Loc): void {
throw new AiScriptSyntaxError(`Reserved word "${name}" cannot be used as variable name.`, loc.start);
}

function validateDest(node: Ast.Node): Ast.Node {
return visitNode(node, node => {
switch (node.type) {
case 'null': {
throwReservedWordError(node.type, node.loc);
break;
}
case 'bool': {
throwReservedWordError(`${node.value}`, node.loc);
break;
}
case 'identifier': {
if (reservedWord.includes(node.name)) {
throwReservedWordError(node.name, node.loc);
}
break;
}
}

return node;
});
}

function validateNode(node: Ast.Node): Ast.Node {
switch (node.type) {
case 'def': {
visitNode(node, node => {
if (node.type === 'identifier' && reservedWord.includes(node.name)) {
throwReservedWordError(node.name, node.loc);
}
return node;
});
validateDest(node.dest);
break;
}
case 'ns':
Expand Down
4 changes: 2 additions & 2 deletions src/parser/syntaxes/statements.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export function parseBlockOrStatement(s: ITokenStream): Ast.Statement | Ast.Expr

/**
* ```abnf
* VarDef = ("let" / "var") IDENT [":" Type] "=" Expr
* VarDef = ("let" / "var") (IDENT / Expr) [":" Type] "=" Expr
* ```
*/
function parseVarDef(s: ITokenStream): Ast.Definition {
Expand All @@ -123,7 +123,7 @@ function parseVarDef(s: ITokenStream): Ast.Definition {
s.next();

let dest: Ast.Expression;
// 全部parseExprに任せるとparseReferenceが型注釈を巻き込んでしまうためIdentifierのみ個別に処理
// 全部parseExprに任せるとparseReferenceが型注釈を巻き込んでパースしてしまうためIdentifierのみ個別に処理
if (s.is(TokenKind.Identifier)) {
const nameStartPos = s.getPos();
const name = s.getTokenValue();
Expand Down