gofront 1.3.2 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "gofront",
-	"version": "1.3.2",
+	"version": "1.3.3",
 	"author": "Luuk van Venrooij",
 	"license": "MIT",
 	"repository": {

package/src/codegen/expressions.js

@@ -58,6 +58,43 @@ const NS_CONSTANTS = {
 	utf8: { RuneError: "0xFFFD", MaxRune: "0x10FFFF", UTFMax: "4" },
 };
 
+const BINARY_OP_PREC = {
+	"||": 1,
+	"&&": 2,
+	"==": 3,
+	"!=": 3,
+	"<": 3,
+	">": 3,
+	"<=": 3,
+	">=": 3,
+	"+": 4,
+	"-": 4,
+	"|": 4,
+	"^": 4,
+	"*": 5,
+	"/": 5,
+	"%": 5,
+	"<<": 5,
+	">>": 5,
+	"&": 5,
+	"&^": 5,
+};
+
+function formatBinaryOperand(genExpr, child, parentOp, isRight) {
+	const code = genExpr(child);
+	if (child.kind !== "BinaryExpr") return code;
+	const parentPrec = BINARY_OP_PREC[parentOp] || 0;
+	const childPrec = BINARY_OP_PREC[child.op] || 0;
+	return (isRight ? childPrec <= parentPrec : childPrec < parentPrec)
+		? `(${code})`
+		: code;
+}
+
+function formatUnaryOperand(genExpr, child) {
+	const code = genExpr(child);
+	return child.kind === "BinaryExpr" ? `(${code})` : code;
+}
+
 const INT_TYPE_NAMES = new Set([
 	"int",
 	"uint",
@@ -250,7 +287,7 @@ export const expressionGenMethods = {
 			if (op === "-") return `{ re: -${inner}.re, im: -${inner}.im }`;
 			return inner;
 		}
-		return `${op}${this.genExpr(expr.operand)}`;
+		return `${op}${formatUnaryOperand((e) => this.genExpr(e), expr.operand)}`;
 	},
 
 	_genSelectorExpr(expr) {
@@ -910,8 +947,20 @@ export const expressionGenMethods = {
 			isComplex(expr.right._type)
 		)
 			return this._genComplexBinary(expr);
-		const l = this.genExpr(expr.left);
-		const r = this.genExpr(expr.right);
+
+		const l = formatBinaryOperand(
+			(e) => this.genExpr(e),
+			expr.left,
+			expr.op,
+			false,
+		);
+		const r = formatBinaryOperand(
+			(e) => this.genExpr(e),
+			expr.right,
+			expr.op,
+			true,
+		);
+
 		if (
 			expr.op === "/" &&
 			this.isIntType(expr.left._type) &&