return correct AST until compile error

This commit is contained in:
Shautvast 2024-12-07 23:01:09 +01:00
parent 2de4cac1af
commit 4f574e4198
3 changed files with 69 additions and 25 deletions

View file

@ -29,6 +29,7 @@ import {interpret} from "./interpreter.js";
{v1: "pillars(number, length, shift = 0, direction = UP)", v2: "pillars(3, 10, 0, DOWN);"},
{v1: "moving_pillars(number, length, shift = 0, direction = DOWN)", v2: "moving_pillars(3, 10, 0, DOWN);"},
{v1: "staircase(number, size, direction = DOWN)", v2: "staircase(3, 1, DOWN);"},
{v1: "repeat([start], end){...}", v2: "repeat(5){\n}"},
];
const slices = {};
for (let i = 0; i < help.length; i++) {

View file

@ -267,14 +267,8 @@ export function interpret(init_env, code) {
}
};
try {
const statements = parse(code);
for (let i = 0; i < statements.length; i++) {
THIS.execute(statements[i]);
}
} catch (e) {
console.log(e);
}
}

View file

@ -46,8 +46,14 @@ export function parse(code) {
const parse = () => {
let statements = [];
while (!is_at_end()) {
try {
statements.push(declaration());
} catch (e) {
console.log(e);
current = tokens.length - 1; // stop compiling
}
}
return statements;
}
@ -66,7 +72,12 @@ export function parse(code) {
initializer = expression();
}
consume(SEMICOLON, "Expected semicolon");
return {class: "var", name:name, initializer: initializer, accept: (visitor) => visitor.visitVariableStatement(name, initializer)};
return {
class: "var",
name: name,
initializer: initializer,
accept: (visitor) => visitor.visitVariableStatement(name, initializer)
};
}
const statement = () => {
@ -130,7 +141,12 @@ export function parse(code) {
if (expr.class === 'Variable') {
let name = expr.name;
return {class: "assign", var_name: name, init_expr: value, accept: (visitor) => visitor.visitAssignExpr(name, value)};
return {
class: "assign",
var_name: name,
init_expr: value,
accept: (visitor) => visitor.visitAssignExpr(name, value)
};
}
throw error(equals, "Invalid assignment target.");
@ -160,7 +176,11 @@ export function parse(code) {
const expressionStatement = () => {
const value = expression();
consume(SEMICOLON, "Expected semicolon");
return {class: "expressionStatement", expression: value, accept: (visitor) => visitor.visitExpressionStatement(value)};
return {
class: "expressionStatement",
expression: value,
accept: (visitor) => visitor.visitExpressionStatement(value)
};
}
const block = () => {
@ -178,7 +198,13 @@ export function parse(code) {
let operator = previous();
let right = comparison();
const left = expr;
expr = {class: "binaryExpr", operator: operator, left: expr, right: right, accept: (visitor) => visitor.visitBinaryExpr(operator, left, right)};
expr = {
class: "binaryExpr",
operator: operator,
left: expr,
right: right,
accept: (visitor) => visitor.visitBinaryExpr(operator, left, right)
};
}
return expr;
}
@ -189,7 +215,13 @@ export function parse(code) {
let operator = previous();
let right = term();
const left = expr;
expr = {class: "binaryExpr", operator: operator, left: expr, right: right, accept: (visitor) => visitor.visitBinaryExpr(operator, left, right)};
expr = {
class: "binaryExpr",
operator: operator,
left: expr,
right: right,
accept: (visitor) => visitor.visitBinaryExpr(operator, left, right)
};
}
return expr;
}
@ -200,7 +232,13 @@ export function parse(code) {
let operator = previous();
let right = factor();
const left = expr;
expr = {class: "binaryExpr", operator: operator, left: expr, right: right, accept: (visitor) => visitor.visitBinaryExpr(operator, left, right)};
expr = {
class: "binaryExpr",
operator: operator,
left: expr,
right: right,
accept: (visitor) => visitor.visitBinaryExpr(operator, left, right)
};
}
return expr;
}
@ -211,7 +249,13 @@ export function parse(code) {
let operator = previous();
let right = unary();
const left = expr;
expr = {class: "binaryExpr", operator: operator, left: expr, right: right, accept: (visitor) => visitor.visitBinaryExpr(operator, left, right)};
expr = {
class: "binaryExpr",
operator: operator,
left: expr,
right: right,
accept: (visitor) => visitor.visitBinaryExpr(operator, left, right)
};
}
return expr;
}
@ -220,7 +264,12 @@ export function parse(code) {
if (match(BANG, MINUS)) {
let operator = previous();
let right = unary();
return {class: "unaryExpr", operator: operator, right: right, accept: (visitor) => visitor.visitUnaryExpr(operator, right)};
return {
class: "unaryExpr",
operator: operator,
right: right,
accept: (visitor) => visitor.visitUnaryExpr(operator, right)
};
}
return primary();
}