Fix ast printing of ?.[

expr-lang · Feb 12, 2024 · ffaec9e · ffaec9e
1 parent 84ac0b8
commit ffaec9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ast/print.go b/ast/print.go
@@ -112,7 +112,7 @@ func (n *MemberNode) String() string {
 		if str, ok := n.Property.(*StringNode); ok && utils.IsValidIdentifier(str.Value) {
 			return fmt.Sprintf("%s?.%s", n.Node.String(), str.Value)
 		} else {
-			return fmt.Sprintf("get(%s, %s)", n.Node.String(), n.Property.String())
+			return fmt.Sprintf("%s?.[%s]", n.Node.String(), n.Property.String())
 		}
 	}
 	if str, ok := n.Property.(*StringNode); ok && utils.IsValidIdentifier(str.Value) {

diff --git a/ast/print_test.go b/ast/print_test.go
@@ -28,6 +28,8 @@ func TestPrint(t *testing.T) {
 		{`a["the b"]`, `a["the b"]`},
 		{`a.b[0]`, `a.b[0]`},
 		{`a?.b`, `a?.b`},
+		{`x[0][1]`, `x[0][1]`},
+		{`x?.[0]?.[1]`, `x?.[0]?.[1]`},
 		{`-a`, `-a`},
 		{`!a`, `!a`},
 		{`not a`, `not a`},
@@ -88,7 +90,7 @@ func TestPrint_MemberNode(t *testing.T) {
 		Property: &ast.StringNode{Value: "b c"},
 		Optional: true,
 	}
-	require.Equal(t, `get(a, "b c")`, node.String())
+	require.Equal(t, `a?.["b c"]`, node.String())
 }
 
 func TestPrint_ConstantNode(t *testing.T) {