Fix ast printing for ?? operator

Fixes #442
expr-lang · Nov 16, 2023 · 507d734 · 507d734
1 parent dbbec97
commit 507d734
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/ast/print.go b/ast/print.go
@@ -58,18 +58,23 @@ func (n *UnaryNode) String() string {
 }
 
 func (n *BinaryNode) String() string {
-	var left, right string
-	if b, ok := n.Left.(*BinaryNode); ok && operator.Less(b.Operator, n.Operator) {
-		left = fmt.Sprintf("(%s)", n.Left.String())
+	var lhs, rhs string
+
+	lb, ok := n.Left.(*BinaryNode)
+	if ok && (operator.Less(lb.Operator, n.Operator) || lb.Operator == "??") {
+		lhs = fmt.Sprintf("(%s)", n.Left.String())
 	} else {
-		left = n.Left.String()
+		lhs = n.Left.String()
 	}
-	if b, ok := n.Right.(*BinaryNode); ok && operator.Less(b.Operator, n.Operator) {
-		right = fmt.Sprintf("(%s)", n.Right.String())
+
+	rb, ok := n.Right.(*BinaryNode)
+	if ok && operator.Less(rb.Operator, n.Operator) {
+		rhs = fmt.Sprintf("(%s)", n.Right.String())
 	} else {
-		right = n.Right.String()
+		rhs = n.Right.String()
 	}
-	return fmt.Sprintf("%s %s %s", left, n.Operator, right)
+
+	return fmt.Sprintf("%s %s %s", lhs, n.Operator, rhs)
 }
 
 func (n *ChainNode) String() string {

diff --git a/ast/print_test.go b/ast/print_test.go
@@ -3,10 +3,11 @@ package ast_test
 import (
 	"testing"
 
-	"github.com/antonmedv/expr/ast"
-	"github.com/antonmedv/expr/parser"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/antonmedv/expr/ast"
+	"github.com/antonmedv/expr/parser"
 )
 
 func TestPrint(t *testing.T) {
@@ -67,6 +68,7 @@ func TestPrint(t *testing.T) {
 		{`a[1:]`, `a[1:]`},
 		{`a[1:]`, `a[1:]`},
 		{`a[:]`, `a[:]`},
+		{`(nil ?? 1) > 0`, `(nil ?? 1) > 0`},
 	}
 
 	for _, tt := range tests {