gofront 0.0.1 → 0.0.3

package/src/parser.js

@@ -1,5 +1,10 @@
 // Recursive-descent parser.  Produces an AST from a GoFront token stream.
 //
+// Split into sub-modules under parser/:
+//   types.js        — type expression parsing (slice, map, struct, interface, etc.)
+//   statements.js   — block, control flow, simple statements
+//   expressions.js  — operator precedence, unary, postfix, primary, literals
+//
 // Node kinds used throughout the compiler:
 //   Program, PackageDecl, ImportDecl
 //   FuncDecl, MethodDecl, VarDecl, ConstDecl, TypeDecl
@@ -12,6 +17,9 @@
 //   CompositeLit, KeyValueExpr, FuncLit, AwaitExpr
 
 import { T } from "./lexer.js";
+import { expressionParserMethods } from "./parser/expressions.js";
+import { statementParserMethods } from "./parser/statements.js";
+import { typeParserMethods } from "./parser/types.js";
 
 export class ParseError extends Error {
 	constructor(msg, token, filename, sourceCode) {
@@ -33,28 +41,6 @@ export class ParseError extends Error {
 	}
 }
 
-// Binary operator precedence (higher = binds tighter, matching Go spec)
-const PREC = {
-	[T.OR]: 1,
-	[T.AND]: 2,
-	[T.EQ]: 3,
-	[T.NEQ]: 3,
-	[T.LT]: 3,
-	[T.GT]: 3,
-	[T.LTE]: 3,
-	[T.GTE]: 3,
-	[T.PLUS]: 4,
-	[T.MINUS]: 4,
-	[T.PIPE]: 4,
-	[T.CARET]: 4,
-	[T.STAR]: 5,
-	[T.SLASH]: 5,
-	[T.PERCENT]: 5,
-	[T.LSHIFT]: 5,
-	[T.RSHIFT]: 5,
-	[T.AMP]: 5,
-};
-
 export class Parser {
 	constructor(tokens, filename = null, source = null) {
 		this.tokens = tokens;
@@ -116,7 +102,11 @@ export class Parser {
 		const imports = [];
 		while (this.check(T.IMPORT)) imports.push(this.parseImport());
 		const decls = [];
-		while (!this.check(T.EOF)) decls.push(this.parseTopDecl());
+		while (!this.check(T.EOF)) {
+			const result = this.parseTopDecl();
+			if (Array.isArray(result)) decls.push(...result);
+			else decls.push(result);
+		}
 		return { kind: "Program", pkg, imports, decls, _filename: this.filename };
 	}
 
@@ -129,18 +119,30 @@ export class Parser {
 
 	parseImport() {
 		this.expect(T.IMPORT);
-		const paths = [];
+		const imports = [];
+		const parseOne = () => {
+			const _line = this.peek().line;
+			let alias = null;
+			if (this.check(T.IDENT)) {
+				alias = this.advance().value;
+			} else if (this.check(T.DOT)) {
+				alias = ".";
+				this.advance();
+			}
+			const path = this.expect(T.STRING).value;
+			return { path, alias, _line };
+		};
 		if (this.match(T.LPAREN)) {
 			while (!this.check(T.RPAREN) && !this.check(T.EOF)) {
-				paths.push(this.expect(T.STRING).value);
+				imports.push(parseOne());
 				this.semi();
 			}
 			this.expect(T.RPAREN);
 		} else {
-			paths.push(this.expect(T.STRING).value);
+			imports.push(parseOne());
 		}
 		this.semi();
-		return { kind: "ImportDecl", paths };
+		return { kind: "ImportDecl", imports };
 	}
 
 	// ── Top-level declarations ───────────────────────────────────
@@ -155,7 +157,7 @@ export class Parser {
 			case T.TYPE:
 				return this.parseTypeDecl();
 			case T.VAR:
-				return this.parseVarDecl(true);
+				return this.parseVarDecl();
 			case T.CONST:
 				return this.parseConstDecl();
 			default:
@@ -276,23 +278,18 @@ export class Parser {
 			tok.type === T.FUNC ||
 			tok.type === T.INTERFACE ||
 			tok.type === T.STRUCT ||
-			(tok.type === T.IDENT && tok.value !== "_") ||
-			[
-				"int",
-				"float64",
-				"string",
-				"bool",
-				"any",
-				"byte",
-				"rune",
-				"error",
-			].includes(tok.value)
+			(tok.type === T.IDENT && tok.value !== "_")
 		);
 	}
 
 	parseReturnType(inTypeExpr = false) {
 		// No return type
-		if (this.check(T.LBRACE) || this.check(T.SEMICOLON) || this.check(T.EOF))
+		if (
+			this.check(T.LBRACE) ||
+			this.check(T.RBRACE) ||
+			this.check(T.SEMICOLON) ||
+			this.check(T.EOF)
+		)
 			return null;
 		// Inside a type expression (e.g. func type in a tuple), `,` and `)` also end the type
 		if (inTypeExpr && (this.check(T.COMMA) || this.check(T.RPAREN)))
@@ -329,13 +326,27 @@ export class Parser {
 
 	parseTypeDecl() {
 		this.expect(T.TYPE);
+		if (this.match(T.LPAREN)) {
+			const decls = [];
+			while (!this.check(T.RPAREN) && !this.check(T.EOF)) {
+				const name = this.expect(T.IDENT).value;
+				const isAlias = this.match(T.ASSIGN);
+				const type = this.parseType();
+				decls.push({ kind: "TypeDecl", name, type, isAlias });
+				this.semi();
+			}
+			this.expect(T.RPAREN);
+			this.semi();
+			return decls;
+		}
 		const name = this.expect(T.IDENT).value;
+		const isAlias = this.match(T.ASSIGN);
 		const type = this.parseType();
 		this.semi();
-		return { kind: "TypeDecl", name, type };
+		return { kind: "TypeDecl", name, type, isAlias };
 	}
 
-	parseVarDecl(_topLevel = false) {
+	parseVarDecl() {
 		this.expect(T.VAR);
 		const decls = [];
 		if (this.match(T.LPAREN)) {
@@ -414,707 +425,8 @@ export class Parser {
 		this.semi();
 		return { kind: "ConstDecl", decls };
 	}
-
-	// ── Types ────────────────────────────────────────────────────
-
-	parseType() {
-		const t = this.peek();
-		switch (t.type) {
-			case T.LBRACKET:
-				return this.parseSliceOrArrayType();
-			case T.MAP:
-				return this.parseMapType();
-			case T.FUNC:
-				return this.parseFuncType();
-			case T.STRUCT:
-				return this.parseStructType();
-			case T.INTERFACE:
-				return this.parseInterfaceType();
-			case T.STAR:
-				this.advance();
-				return { kind: "PointerType", base: this.parseType() };
-			case T.IDENT:
-			case "int":
-			case "float64":
-			case "string":
-			case "bool":
-			case "any":
-			case "byte":
-			case "rune":
-			case "error":
-				return this.parseTypeName();
-			default:
-				this.err(`Expected type, got '${t.value}'`);
-		}
-	}
-
-	parseTypeName() {
-		const t = this.advance();
-		let name = t.value;
-		// qualified: pkg.Type
-		if (this.check(T.DOT)) {
-			this.advance();
-			name += `.${this.expect(T.IDENT).value}`;
-		}
-		return { kind: "TypeName", name };
-	}
-
-	parseSliceOrArrayType() {
-		this.expect(T.LBRACKET);
-		if (this.check(T.RBRACKET)) {
-			// slice type: []T
-			this.advance();
-			return { kind: "SliceType", elem: this.parseType() };
-		}
-		// fixed array: [n]T — treated as slice for JS purposes
-		const size = this.parseExpr();
-		this.expect(T.RBRACKET);
-		return { kind: "ArrayType", size, elem: this.parseType() };
-	}
-
-	parseMapType() {
-		this.expect(T.MAP);
-		this.expect(T.LBRACKET);
-		const key = this.parseType();
-		this.expect(T.RBRACKET);
-		const value = this.parseType();
-		return { kind: "MapType", key, value };
-	}
-
-	parseFuncType() {
-		this.expect(T.FUNC);
-		const params = this.parseParamList();
-		const returnType = this.parseReturnType(true);
-		return { kind: "FuncType", params, returnType };
-	}
-
-	parseStructType() {
-		this.expect(T.STRUCT);
-		this.expect(T.LBRACE);
-		const fields = [];
-		while (!this.check(T.RBRACE) && !this.check(T.EOF)) {
-			const names = [this.expect(T.IDENT).value];
-			while (this.match(T.COMMA)) names.push(this.expect(T.IDENT).value);
-			// Check if this is an embedded field (just a type name)
-			// e.g., type T struct { Base }
-			if (this.check(T.SEMICOLON) || this.check(T.RBRACE)) {
-				const typeName = names[0]; // assuming no comma list for embedded
-				fields.push({
-					names: [],
-					type: { kind: "TypeName", name: typeName },
-					embedded: true,
-				});
-				this.semi();
-				continue;
-			}
-			const type = this.parseType();
-			fields.push({ names, type });
-			this.semi();
-		}
-		this.expect(T.RBRACE);
-		return { kind: "StructType", fields };
-	}
-
-	parseInterfaceType() {
-		this.expect(T.INTERFACE);
-		this.expect(T.LBRACE);
-		const methods = [];
-		while (!this.check(T.RBRACE) && !this.check(T.EOF)) {
-			const name = this.expect(T.IDENT).value;
-			const params = this.parseParamList();
-			const returnType = this.parseReturnType();
-			methods.push({ name, params, returnType });
-			this.semi();
-		}
-		this.expect(T.RBRACE);
-		return { kind: "InterfaceType", methods };
-	}
-
-	// ── Statements ───────────────────────────────────────────────
-
-	parseBlock() {
-		this.expect(T.LBRACE);
-		const stmts = [];
-		while (!this.check(T.RBRACE) && !this.check(T.EOF)) {
-			stmts.push(this.parseStmt());
-			this.semi();
-		}
-		this.expect(T.RBRACE);
-		return { kind: "Block", stmts };
-	}
-
-	parseStmt() {
-		const t = this.peek();
-		const stmt = this._parseStmt(t);
-		stmt._line = t.line;
-		return stmt;
-	}
-
-	_parseStmt(t) {
-		switch (t.type) {
-			case T.VAR:
-				return this.parseVarDecl();
-			case T.CONST:
-				return this.parseConstDecl();
-			case T.TYPE:
-				return this.parseTypeDecl();
-			case T.RETURN:
-				return this.parseReturn();
-			case T.DEFER:
-				return this.parseDefer();
-			case T.BREAK:
-				this.advance();
-				this.semi();
-				return { kind: "BranchStmt", keyword: "break" };
-			case T.CONTINUE:
-				this.advance();
-				this.semi();
-				return { kind: "BranchStmt", keyword: "continue" };
-			case T.FALLTHROUGH:
-				this.advance();
-				this.semi();
-				return { kind: "BranchStmt", keyword: "fallthrough" };
-			case T.IF:
-				return this.parseIf();
-			case T.FOR:
-				return this.parseFor();
-			case T.SWITCH:
-				return this.parseSwitch();
-			case T.LBRACE:
-				return this.parseBlock();
-			default:
-				return this.parseSimpleStmt();
-		}
-	}
-
-	parseDefer() {
-		this.expect(T.DEFER);
-		const call = this.parseExpr();
-		return { kind: "DeferStmt", call };
-	}
-
-	parseReturn() {
-		this.expect(T.RETURN);
-		if (this.check(T.SEMICOLON) || this.check(T.RBRACE)) {
-			return { kind: "ReturnStmt", values: [] };
-		}
-		const values = this.parseExprList();
-		return { kind: "ReturnStmt", values };
-	}
-
-	parseIf() {
-		this.expect(T.IF);
-		let init = null;
-		let cond;
-		// if init; cond { } — use noCompLit to avoid "{" being parsed as composite literal
-		const first = this.parseSimpleStmtRaw(true);
-		// Only treat as "init; cond" if semicolon is followed by a non-brace token
-		if (this.check(T.SEMICOLON) && this.peek2().type !== T.LBRACE) {
-			this.advance(); // consume ;
-			init = first;
-			cond = this.parseExpr(0, true);
-		} else {
-			this.match(T.SEMICOLON); // consume any auto-inserted ;
-			cond = this.stmtToExpr(first);
-		}
-		const body = this.parseBlock();
-		// Consume auto-inserted ; before else (Go allows "}\nelse")
-		this.match(T.SEMICOLON);
-		let elseBody = null;
-		if (this.match(T.ELSE)) {
-			elseBody = this.check(T.IF) ? this.parseIf() : this.parseBlock();
-		}
-		return { kind: "IfStmt", init, cond, body, elseBody };
-	}
-
-	parseFor() {
-		this.expect(T.FOR);
-
-		// for { } — infinite loop
-		if (this.check(T.LBRACE)) {
-			return {
-				kind: "ForStmt",
-				init: null,
-				cond: null,
-				post: null,
-				body: this.parseBlock(),
-			};
-		}
-
-		const first = this.parseSimpleStmtRaw(true);
-
-		if (this.check(T.LBRACE)) {
-			// for k, v := range expr { }  — range stmt ends right before {
-			if (this.isRangeStmt(first)) {
-				return {
-					kind: "ForStmt",
-					init: first,
-					cond: null,
-					post: null,
-					body: this.parseBlock(),
-				};
-			}
-			// for cond { }
-			return {
-				kind: "ForStmt",
-				init: null,
-				cond: this.stmtToExpr(first),
-				post: null,
-				body: this.parseBlock(),
-			};
-		}
-
-		this.expect(T.SEMICOLON);
-
-		// for init; cond; post { }
-		let cond = null;
-		if (!this.check(T.SEMICOLON)) cond = this.parseExpr(0, true);
-		this.expect(T.SEMICOLON);
-		let post = null;
-		if (!this.check(T.LBRACE)) post = this.parseSimpleStmtRaw();
-		const body = this.parseBlock();
-		return { kind: "ForStmt", init: first, cond, post, body };
-	}
-
-	isRangeStmt(stmt) {
-		if (!stmt) return false;
-		if (stmt.kind !== "DefineStmt" && stmt.kind !== "AssignStmt") return false;
-		return stmt.rhs?.[0]?.kind === "RangeExpr";
-	}
-
-	parseSwitch() {
-		this.expect(T.SWITCH);
-		let init = null;
-		let tag = null;
-		if (!this.check(T.LBRACE)) {
-			const expr = this.parseExpr(0, true);
-			if (this.match(T.SEMICOLON)) {
-				init = this.exprToStmt(expr);
-				if (!this.check(T.LBRACE)) tag = this.parseExpr(0, true);
-			} else {
-				tag = expr;
-			}
-		}
-		this.expect(T.LBRACE);
-		const cases = [];
-		while (!this.check(T.RBRACE) && !this.check(T.EOF)) {
-			if (this.check(T.CASE)) {
-				this.advance();
-				const list = this.parseExprList();
-				this.expect(T.COLON);
-				const stmts = [];
-				while (
-					!this.check(T.CASE) &&
-					!this.check(T.DEFAULT) &&
-					!this.check(T.RBRACE)
-				) {
-					stmts.push(this.parseStmt());
-					this.semi();
-				}
-				cases.push({ kind: "CaseClause", list, stmts });
-			} else if (this.check(T.DEFAULT)) {
-				this.advance();
-				this.expect(T.COLON);
-				const stmts = [];
-				while (
-					!this.check(T.CASE) &&
-					!this.check(T.DEFAULT) &&
-					!this.check(T.RBRACE)
-				) {
-					stmts.push(this.parseStmt());
-					this.semi();
-				}
-				cases.push({ kind: "CaseClause", list: null, stmts });
-			} else {
-				this.err("Expected case or default");
-			}
-		}
-		this.expect(T.RBRACE);
-		return { kind: "SwitchStmt", init, tag, cases };
-	}
-
-	// Parses a "simple statement": assignment, define, inc/dec, or expression.
-	// Returns a statement node.
-	parseSimpleStmt() {
-		const s = this.parseSimpleStmtRaw();
-		return s;
-	}
-
-	parseSimpleStmtRaw(noCompLit = false) {
-		// Parse left-hand side (could be expr list for multi-assign)
-		const first = this.parseExpr(0, noCompLit);
-		const t = this.peek();
-
-		// a, b, c := ...  or  x, y = ...
-		if (t.type === T.COMMA) {
-			const lhs = [first];
-			while (this.match(T.COMMA)) lhs.push(this.parseExpr());
-			const op = this.advance(); // := or =
-			const rhs = this.parseExprList();
-			if (op.type === T.DEFINE) return { kind: "DefineStmt", lhs, rhs };
-			return { kind: "AssignStmt", lhs, op: "=", rhs };
-		}
-
-		// x := expr
-		if (t.type === T.DEFINE) {
-			this.advance();
-			const rhs = this.parseExprList();
-			return { kind: "DefineStmt", lhs: [first], rhs };
-		}
-
-		// x = expr  or  x += expr  etc.
-		const assignOps = [
-			T.ASSIGN,
-			T.PLUS_ASSIGN,
-			T.MINUS_ASSIGN,
-			T.STAR_ASSIGN,
-			T.SLASH_ASSIGN,
-			T.PERCENT_ASSIGN,
-		];
-		if (assignOps.includes(t.type)) {
-			const op = this.advance().value;
-			const rhs = this.parseExprList();
-			return { kind: "AssignStmt", lhs: [first], op, rhs };
-		}
-
-		// x++  x--
-		if (t.type === T.INC || t.type === T.DEC) {
-			const op = this.advance().value;
-			return { kind: "IncDecStmt", expr: first, op };
-		}
-
-		// for range detection: "for k, v := range expr"
-		// range keyword after :=
-		if (first.kind === "Ident" && first.name === "range") {
-			const expr = this.parseExpr();
-			return { kind: "RangeExpr", expr };
-		}
-
-		return { kind: "ExprStmt", expr: first };
-	}
-
-	// Converts an ExprStmt back to its expression
-	stmtToExpr(stmt) {
-		if (!stmt) return null;
-		if (stmt.kind === "ExprStmt") return stmt.expr;
-		return stmt;
-	}
-
-	exprToStmt(expr) {
-		return { kind: "ExprStmt", expr };
-	}
-
-	// ── Expressions ──────────────────────────────────────────────
-
-	parseExprList() {
-		const exprs = [this.parseExpr()];
-		while (this.match(T.COMMA)) exprs.push(this.parseExpr());
-		return exprs;
-	}
-
-	// noCompLit=true disables composite literal parsing in if/for/switch conditions
-	// to resolve the ambiguity between "if x {" and "if Type{ } {"
-	parseExpr(minPrec = 0, noCompLit = false) {
-		let left = this.parseUnary(noCompLit);
-		while (true) {
-			const prec = PREC[this.peek().type];
-			if (!prec || prec <= minPrec) break;
-			const op = this.advance().value;
-			const right = this.parseExpr(prec, noCompLit);
-			left = { kind: "BinaryExpr", left, op, right };
-		}
-		return left;
-	}
-
-	parseUnary(noCompLit = false) {
-		const t = this.peek();
-		if (
-			t.type === T.NOT ||
-			t.type === T.MINUS ||
-			t.type === T.PLUS ||
-			t.type === T.CARET ||
-			t.type === T.AMP ||
-			t.type === T.STAR
-		) {
-			const op = this.advance().value;
-			return { kind: "UnaryExpr", op, operand: this.parseUnary(noCompLit) };
-		}
-		if (t.type === T.AWAIT) {
-			this.advance();
-			return { kind: "AwaitExpr", expr: this.parseUnary(noCompLit) };
-		}
-		return this.parsePostfix(noCompLit);
-	}
-
-	parsePostfix(noCompLit = false) {
-		let expr = this.parsePrimary();
-		while (true) {
-			const t = this.peek();
-			if (t.type === T.DOT) {
-				this.advance();
-				// type assertion: expr.(Type)
-				if (this.check(T.LPAREN)) {
-					this.advance();
-					const type = this.parseType();
-					this.expect(T.RPAREN);
-					expr = { kind: "TypeAssertExpr", expr, type };
-				} else {
-					const field = this.advance().value;
-					expr = { kind: "SelectorExpr", expr, field };
-				}
-			} else if (t.type === T.LBRACKET) {
-				this.advance();
-				const low = this.check(T.COLON) ? null : this.parseExpr();
-				if (this.match(T.COLON)) {
-					const high = this.check(T.RBRACKET) ? null : this.parseExpr();
-					this.expect(T.RBRACKET);
-					expr = { kind: "SliceExpr", expr, low, high };
-				} else {
-					this.expect(T.RBRACKET);
-					expr = { kind: "IndexExpr", expr, index: low };
-				}
-			} else if (t.type === T.LPAREN) {
-				expr = this.parseCall(expr);
-			} else if (
-				t.type === T.LBRACE &&
-				!noCompLit &&
-				this.isCompositeLitContext(expr)
-			) {
-				expr = this.parseCompositeLit(expr);
-			} else {
-				break;
-			}
-		}
-		return expr;
-	}
-
-	// Composite literals are only allowed after a type name (not arbitrary exprs)
-	isCompositeLitContext(expr) {
-		return (
-			expr.kind === "Ident" ||
-			expr.kind === "SelectorExpr" ||
-			expr.kind === "TypeExpr"
-		);
-	}
-
-	parseCall(fn) {
-		this.expect(T.LPAREN);
-		const args = [];
-		if (!this.check(T.RPAREN)) {
-			do {
-				if (this.check(T.RPAREN)) break;
-				// map[K]V and []T as call args must be parsed as types, not expressions,
-				// when they are NOT followed by { (which would make them composite literals).
-				// Needed for make(map[K]V), make([]T, n), new(T), etc.
-				const t = this.peek();
-				const isSliceOrArrayType =
-					t.type === T.LBRACKET &&
-					(this.peek2()?.type === T.RBRACKET || // []T
-						this.peek2()?.type === T.INT); // [n]T
-				if (
-					(t.type === T.MAP || isSliceOrArrayType) &&
-					!this.looksLikeCompositeLitArg()
-				) {
-					args.push({ kind: "TypeExpr", type: this.parseType() });
-				} else {
-					args.push(this.parseExpr());
-				}
-				this.match(T.ELLIPSIS); // variadic spread, ignore for now
-			} while (this.match(T.COMMA));
-		}
-		this.expect(T.RPAREN);
-		return { kind: "CallExpr", func: fn, args };
-	}
-
-	// Returns true if the current position looks like a composite literal argument,
-	// e.g. []int{1,2,3} or map[string]int{"a":1}.  We scan ahead past the type
-	// tokens to check whether a { follows, without advancing this.pos permanently.
-	looksLikeCompositeLitArg() {
-		let i = this.pos;
-		const src = this.tokens;
-		// Skip over the type tokens: [, ], map, [, K, ], V, ident, etc.
-		// Simple approach: skip until we hit something that can't be part of a type
-		let depth = 0;
-		while (i < src.length) {
-			const tt = src[i].type;
-			if (tt === T.LBRACKET) {
-				depth++;
-				i++;
-				continue;
-			}
-			if (tt === T.RBRACKET) {
-				depth--;
-				i++;
-				continue;
-			}
-			if (depth > 0) {
-				i++;
-				continue;
-			}
-			if (
-				tt === T.MAP ||
-				tt === T.IDENT ||
-				tt === T.STAR ||
-				tt === T.INT ||
-				tt === T.FLOAT ||
-				tt === T.STRING
-			) {
-				i++;
-				continue;
-			}
-			break;
-		}
-		// Skip whitespace tokens (shouldn't exist post-lex, but be safe)
-		while (i < src.length && src[i].type === T.SEMICOLON) i++;
-		return i < src.length && src[i].type === T.LBRACE;
-	}
-
-	parseCompositeLit(typeExpr) {
-		this.expect(T.LBRACE);
-		const elems = [];
-		while (!this.check(T.RBRACE) && !this.check(T.EOF)) {
-			// Implicit composite literal: {X: 1} inside []Point{{X:1}} or map[string]Point{"a": {X:1}}
-			if (this.check(T.LBRACE)) {
-				elems.push(this.parseCompositeLit(null)); // null typeExpr = inferred
-			} else {
-				const first = this.parseExpr();
-				if (this.match(T.COLON)) {
-					// Map key: value — value may also be an implicit composite lit
-					const val = this.check(T.LBRACE)
-						? this.parseCompositeLit(null)
-						: this.parseExpr();
-					elems.push({ kind: "KeyValueExpr", key: first, value: val });
-				} else {
-					elems.push(first);
-				}
-			}
-			this.match(T.COMMA);
-		}
-		this.expect(T.RBRACE);
-		return { kind: "CompositeLit", typeExpr, elems };
-	}
-
-	parsePrimary() {
-		const line = this.peek().line;
-		const expr = this._parsePrimary();
-		if (!expr._line) expr._line = line;
-		return expr;
-	}
-
-	_parsePrimary() {
-		const t = this.peek();
-
-		// Literals
-		if (t.type === T.INT) {
-			this.advance();
-			return { kind: "BasicLit", litKind: "INT", value: t.value };
-		}
-		if (t.type === T.FLOAT) {
-			this.advance();
-			return { kind: "BasicLit", litKind: "FLOAT", value: t.value };
-		}
-		if (t.type === T.STRING) {
-			this.advance();
-			return { kind: "BasicLit", litKind: "STRING", value: t.value };
-		}
-		if (t.type === T.TRUE) {
-			this.advance();
-			return { kind: "BasicLit", litKind: "BOOL", value: "true" };
-		}
-		if (t.type === T.FALSE) {
-			this.advance();
-			return { kind: "BasicLit", litKind: "BOOL", value: "false" };
-		}
-		if (t.type === T.NIL) {
-			this.advance();
-			return { kind: "BasicLit", litKind: "NIL", value: "null" };
-		}
-
-		// Parenthesised expression
-		if (t.type === T.LPAREN) {
-			this.advance();
-			const expr = this.parseExpr();
-			this.expect(T.RPAREN);
-			return expr;
-		}
-
-		// Function literal (sync or async)
-		if (t.type === T.FUNC || t.type === T.ASYNC) {
-			const isAsync = t.type === T.ASYNC;
-			this.advance();
-			if (isAsync) this.expect(T.FUNC);
-			const params = this.parseParamList();
-			const returnType = this.parseReturnType();
-			const body = this.parseBlock();
-			return { kind: "FuncLit", params, returnType, body, async: isAsync };
-		}
-
-		// range expression (only valid inside a for statement)
-		if (t.type === T.RANGE) {
-			this.advance();
-			// Always use noCompLit here: "range slice {" — { is the for body, not a composite lit
-			return { kind: "RangeExpr", expr: this.parseExpr(0, true) };
-		}
-
-		// Builtin / identifier
-		if (
-			t.type === T.IDENT ||
-			this.isTypeKeyword(t) ||
-			this.isBuiltinKeyword(t)
-		) {
-			this.advance();
-			// Type conversion or composite lit: Type(expr) or Type{...}
-			if (this.isTypeKeyword(t) || this.check(T.LPAREN)) {
-				if (this.check(T.LPAREN) && this.isTypeKeyword(t)) {
-					// type conversion: int(x), string(x), etc.
-					this.advance();
-					const expr = this.parseExpr();
-					this.expect(T.RPAREN);
-					return {
-						kind: "TypeConversion",
-						targetType: { kind: "TypeName", name: t.value },
-						expr,
-					};
-				}
-			}
-			return { kind: "Ident", name: t.value };
-		}
-
-		// Slice/array/map composite literals: []int{1,2}, map[string]int{"a":1}
-		if (t.type === T.LBRACKET || t.type === T.MAP) {
-			const typeExpr = this.parseType();
-			return this.parseCompositeLit(typeExpr);
-		}
-
-		this.err(`Unexpected token in expression: '${t.value}'`);
-	}
-
-	isTypeKeyword(t) {
-		return [
-			"int",
-			"float64",
-			"string",
-			"bool",
-			"any",
-			"byte",
-			"rune",
-			"error",
-		].includes(t.value);
-	}
-
-	isBuiltinKeyword(t) {
-		return [
-			"new",
-			"make",
-			"len",
-			"cap",
-			"append",
-			"delete",
-			"copy",
-			"print",
-			"println",
-			"panic",
-			"error",
-		].includes(t.value);
-	}
 }
+
+Object.assign(Parser.prototype, typeParserMethods);
+Object.assign(Parser.prototype, statementParserMethods);
+Object.assign(Parser.prototype, expressionParserMethods);