Feat: Build AST nodes for new language features

src/ast-builder.js

@@ -2,30 +2,45 @@ import { parser } from './parser.js';
 
 const BaseHiVisitor = parser.getBaseCstVisitorConstructor();
 
+// Helper to build a left-associative binary expression AST from a CST
+function buildBinaryExpression(ctx, visitor) {
+    let left = visitor.visit(ctx.left);
+    if (ctx.right) {
+        ctx.right.forEach((rhs, i) => {
+            const operator = ctx.Or[i].image;
+            left = {
+                type: 'BinaryExpression',
+                operator,
+                left,
+                right: visitor.visit(rhs),
+            };
+        });
+    }
+    return left;
+}
+
 class AstBuilder extends BaseHiVisitor {
     constructor() {
         super();
         this.validateVisitor();
     }
     
-    program(ctx) {
+    program(ctx) { return { type: 'Program', body: this.visit(ctx.statements) }; }
-        return { type: 'Program', body: this.visit(ctx.statements) };
+    statements(ctx) { return ctx.statement?.map(stmt => this.visit(stmt)) || []; }
-    }
     
-    statements(ctx) {
-        return ctx.statement?.map(stmt => this.visit(stmt)) || [];
-    }
-
     statement(ctx) {
         if (ctx.declaration) return this.visit(ctx.declaration);
         if (ctx.assignment) return this.visit(ctx.assignment);
+        if (ctx.returnStatement) return this.visit(ctx.returnStatement);
         if (ctx.expressionStatement) return this.visit(ctx.expressionStatement);
     }
     
-    expressionStatement(ctx) {
+    returnStatement(ctx) {
-        return { type: 'ExpressionStatement', expression: this.visit(ctx.expression) };
+        return { type: 'ReturnStatement', argument: ctx.expression ? this.visit(ctx.expression) : null };
     }
 
+    expressionStatement(ctx) { return { type: 'ExpressionStatement', expression: this.visit(ctx.expression) }; }
+
     declaration(ctx) {
         return {
             type: 'VariableDeclaration',
@@ -36,90 +51,96 @@ class AstBuilder extends BaseHiVisitor {
 
     assignment(ctx) {
         return {
-            type: 'Assignment',
+            type: 'AssignmentExpression',
-            identifier: ctx.Identifier[0].image,
+            left: { type: 'Identifier', name: ctx.Identifier[0].image },
-            value: this.visit(ctx.expression),
+            right: this.visit(ctx.expression),
         };
     }
     
-    expression(ctx) {
+    expression(ctx) { return this.visit(ctx.conditionalExpression); }
-        return this.visit(ctx.additiveExpression);
-    }
 
-    additiveExpression(ctx) {
+    conditionalExpression(ctx) {
-        let left = this.visit(ctx.left);
+        if (!ctx.Question) return this.visit(ctx.condition);
-        if (ctx.right) {
+        return {
-            ctx.right.forEach((rhs) => {
+            type: 'ConditionalExpression',
-                left = {
+            test: this.visit(ctx.condition),
-                    type: 'BinaryExpression',
+            consequent: this.visit(ctx.consequent),
-                    operator: '+',
+            alternate: ctx.alternate ? this.visit(ctx.alternate) : { type: 'NullLiteral' },
-                    left: left,
+        };
-                    right: this.visit(rhs),
-                };
-            });
-        }
-        return left;
     }
+    
+    equalityExpression(ctx) { return buildBinaryExpression(ctx, this); }
+    additiveExpression(ctx) { return buildBinaryExpression(ctx, this); }
+    multiplicativeExpression(ctx) { return buildBinaryExpression(ctx, this); }
 
     callExpression(ctx) {
-        let callee = this.visit(ctx.memberExpression);
+        let expr = this.visit(ctx.callee);
         if (ctx.LParen) {
-            return {
+            ctx.LParen.forEach((_, i) => {
-                type: 'CallExpression',
+                expr = {
-                callee: callee,
+                    type: 'CallExpression',
-                arguments: ctx.argumentList ? this.visit(ctx.argumentList) : [],
+                    callee: expr,
-            };
+                    arguments: ctx.argumentList?.[i] ? this.visit(ctx.argumentList[i]) : [],
-        }
-        return callee;
-    }
-    
-    argumentList(ctx) {
-        return ctx.expression.map(expr => this.visit(expr));
-    }
-    
-    memberExpression(ctx) {
-        let obj = this.visit(ctx.primary);
-        if (ctx.Identifier) {
-            ctx.Identifier.forEach(propIdent => {
-                obj = {
-                    type: 'MemberExpression',
-                    object: obj,
-                    property: { type: 'Identifier', name: propIdent.image },
                 };
             });
         }
+        return expr;
+    }
+
+    argumentList(ctx) { return ctx.expression.map(expr => this.visit(expr)); }
+    
+    memberExpression(ctx) {
+        let obj = this.visit(ctx.object);
+        ctx.Identifier?.forEach(prop => {
+            obj = { type: 'MemberExpression', computed: false, object: obj, property: { type: 'Identifier', name: prop.image } };
+        });
+        ctx.expression?.forEach(prop => {
+            obj = { type: 'MemberExpression', computed: true, object: obj, property: this.visit(prop) };
+        });
         return obj;
     }
 
     primary(ctx) {
         if (ctx.literal) return this.visit(ctx.literal);
         if (ctx.Identifier) return { type: 'Identifier', name: ctx.Identifier[0].image };
+        if (ctx.At) return { type: 'ThisExpression' };
         if (ctx.block) return this.visit(ctx.block);
+        if (ctx.arrowExpression) return this.visit(ctx.arrowExpression);
+        if (ctx.arrayLiteral) return this.visit(ctx.arrayLiteral);
         if (ctx.expression) return this.visit(ctx.expression);
     }
     
     literal(ctx) {
-        if (ctx.Number) return { type: 'NumericLiteral', value: Number(ctx.Number[0].image) };
+        if (ctx.Number) {
-        if (ctx.String) return { type: 'StringLiteral', value: ctx.String[0].image };
+            const image = ctx.Number[0].image;
+            if (image === '!0') return { type: 'BooleanLiteral', value: true };
+            return { type: 'NumericLiteral', value: Number(image) };
+        }
+        if (ctx.String) return { type: 'StringLiteral', value: ctx.String[0].image.slice(1,-1) };
+        if (ctx.Null) return { type: 'NullLiteral' };
     }
 
     block(ctx) {
-        return {
+        const params = ctx.parameterList ? this.visit(ctx.parameterList) : [];
-            type: 'Block',
+        const body = this.visit(ctx.statements);
-            properties: ctx.keyValuePairs ? this.visit(ctx.keyValuePairs) : []
+        if (params.length > 0) {
-        };
+            return { type: 'FunctionExpression', params, body: { type: 'BlockStatement', body } };
+        }
+        return { type: 'Block', body };
+    }
+
+    arrowExpression(ctx) {
+        const params = this.visit(ctx.parameterList);
+        const body = ctx.block ? this.visit(ctx.block) : this.visit(ctx.expression);
+        return { type: 'ArrowFunctionExpression', params, body };
     }
     
-    keyValuePairs(ctx) {
+    parameterList(ctx) {
-        return ctx.keyValuePair.map(kv => this.visit(kv));
+        return ctx.Identifier?.map(id => ({ type: 'Identifier', name: id.image })) || [];
     }
     
-    keyValuePair(ctx) {
+    arrayLiteral(ctx) {
-        return {
+        return { type: 'ArrayLiteral', elements: ctx.expression?.map(e => this.visit(e)) || [] };
-            type: 'Property',
-            key: ctx.Identifier[0].image,
-            value: this.visit(ctx.expression)
-        };
     }
 }