hi-language/transpiler
1
0
Fork 0
mirror of https://github.com/hi-language/transpiler.git synced 2026-01-13 16:18:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Correctly build binary expression AST

Browse Source
This commit is contained in:
multipleof4
2025-09-26 08:38:31 -07:00
parent aefd5cab75
commit 36069fcb01
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ast-builder.js
View File

@@ -6,8 +6,19 @@ const BaseHiVisitor = parser.getBaseCstVisitorConstructor();
function buildBinaryExpression(ctx, visitor) {
let left = visitor.visit(ctx.left);
if (ctx.right) {
// Collect all possible operator tokens from the context.
const operators = [];
if (ctx.EqEq) operators.push(...ctx.EqEq);
if (ctx.Plus) operators.push(...ctx.Plus);
if (ctx.Minus) operators.push(...ctx.Minus);
if (ctx.Star) operators.push(...ctx.Star);
if (ctx.Slash) operators.push(...ctx.Slash);
// Sort operators by their position in the source text to handle mixed operators correctly.
operators.sort((a, b) => a.startOffset - b.startOffset);
ctx.right.forEach((rhs, i) => {
const operator = ctx.Or[i].image;
const operator = operators[i].image;
left = {
type: 'BinaryExpression',
operator,
@@ -123,7 +134,7 @@ class AstBuilder extends BaseHiVisitor {
block(ctx) {
const params = ctx.parameterList ? this.visit(ctx.parameterList) : [];
const body = this.visit(ctx.statements);
if (params.length > 0) {
if (ctx.parameterList) { // If there's a param list, it's a function
return { type: 'FunctionExpression', params, body: { type: 'BlockStatement', body } };
}
return { type: 'Block', body };