Fix BinExpr precendence not being drilled down

1 files changed, 5 insertions, 30 deletions

diff --git a/pkg/lang/parser/exprs.go b/pkg/lang/parser/exprs.go
index b08864a..ceda018 100644
--- a/pkg/lang/parser/exprs.go
+++ b/pkg/lang/parser/exprs.go
@@ -26,38 +26,13 @@ func (p *Parser) parseBinaryExpr() (ast.Expr, error) {
 			return ast.Expr{}, err
 		}
 
-		// Check precedence and associativity.
-		if right.Kind == ast.ExprKindBinary {
-			rightBin := right.Value.(ast.ExprBinary)
-
-			needsSwitch := (op.Precedence() > rightBin.Op.Precedence()) ||
-				(op.Precedence() == rightBin.Op.Precedence() && op.Associativity() == ast.AssociativityLeft)
-
-			if needsSwitch {
-				left = ast.Expr{
-					At:   left.At,
-					Kind: ast.ExprKindBinary,
-					Value: ast.ExprBinary{
-						Left:  left,
-						Op:    op,
-						Right: rightBin.Left,
-					},
-				}
-
-				right = rightBin.Right
-
-				op = rightBin.Op
-			}
-		}
+		// Adjust for precedence and associativity.
+		binary := p.mergeIntoBinary(left, op, right)
 
 		left = ast.Expr{
-			At:   left.At,
-			Kind: ast.ExprKindBinary,
-			Value: ast.ExprBinary{
-				Left:  left,
-				Op:    op,
-				Right: right,
-			},
+			At:    left.At,
+			Kind:  ast.ExprKindBinary,
+			Value: binary,
 		}
 	}