Compare commits

..

2 Commits

Author SHA1 Message Date
ba4861a5fb fix loop keyword syntax 2024-12-17 10:25:13 +01:00
f90fcd431f source map else 2024-12-17 10:24:18 +01:00
5 changed files with 7 additions and 5 deletions

View File

@ -45,7 +45,7 @@ export type ExprKind =
| { type: "call"; subject: Expr; args: Expr[] }
| { type: "unary"; unaryType: UnaryType; subject: Expr }
| { type: "binary"; binaryType: BinaryType; left: Expr; right: Expr }
| { type: "if"; cond: Expr; truthy: Expr; falsy?: Expr }
| { type: "if"; cond: Expr; truthy: Expr; falsy?: Expr; elsePos?: Pos }
| { type: "bool"; value: boolean }
| { type: "null" }
| { type: "loop"; body: Expr }

View File

@ -47,7 +47,7 @@ export class Compiler {
const lowerer = new Lowerer(lexer.currentPos());
lowerer.lower(ast);
lowerer.printProgram();
// lowerer.printProgram();
const { program, fnNames } = lowerer.finish();
return { program, fnNames };

View File

@ -490,7 +490,7 @@ export class Lowerer {
this.program.setLabel(falseLabel);
if (expr.kind.falsy) {
this.addSourceMap(expr.kind.falsy.pos);
this.addSourceMap(expr.kind.elsePos!);
this.lowerExpr(expr.kind.falsy);
} else {
this.program.add(Ops.PushNull);

View File

@ -456,17 +456,18 @@ export class Parser {
if (!this.test("else")) {
return this.expr({ type: "if", cond, truthy }, pos);
}
const elsePos = this.pos();
this.step();
if (this.test("if")) {
const falsy = this.parseIf();
return this.expr({ type: "if", cond, truthy, falsy }, pos);
return this.expr({ type: "if", cond, truthy, falsy, elsePos }, pos);
}
if (!this.test("{")) {
this.report("expected block");
return this.expr({ type: "error" }, pos);
}
const falsy = this.parseBlock();
return this.expr({ type: "if", cond, truthy, falsy }, pos);
return this.expr({ type: "if", cond, truthy, falsy, elsePos }, pos);
}
private parseBinary(): Expr {

View File

@ -154,6 +154,7 @@ function syntaxHighlight(code: string): string {
"or",
"and",
"not",
"loop",
"while",
"for",
"in",