Fix ToMap for tables in nested mixed-type arrays

tomltree_write.go

@@ -518,18 +518,24 @@ func (t *Tree) ToMap() map[string]interface{} {
 
 // toValue converts a tomlValue to a built-in Go type.
 func (t *tomlValue) toValue() interface{} {
-	switch v := t.value.(type) {
-	case []interface{}:
-		s := make([]interface{}, len(v))
-		for i := range s {
-			switch e := v[i].(type) {
+	var doSlice func([]interface{}) []interface{}
+	doSlice = func(s1 []interface{}) []interface{} {
+		s2 := make([]interface{}, len(s1))
+		for i := range s1 {
+			switch v := s1[i].(type) {
 			case *Tree:
-				s[i] = e.ToMap()
+				s2[i] = v.ToMap()
+			case []interface{}:
+				s2[i] = doSlice(v)
 			default:
-				s[i] = e
+				s2[i] = v
 			}
 		}
-		return s
+		return s2
+	}
+	switch v := t.value.(type) {
+	case []interface{}:
+		return doSlice(v)
 	default:
 		return v
 	}

tomltree_write_test.go

@@ -296,12 +296,15 @@ func TestTreeWriteToMapWithArrayOfInlineTables(t *testing.T) {
 }
 
 func TestTreeWriteToMapWithTableInMixedArray(t *testing.T) {
-	tree, _ := Load(`a = ["foo", {bar = "baz"}]`)
+	tree, _ := Load(`a = ["foo", ["bar", {baz = "quux"}]]`)
 	expected := map[string]interface{}{
 		"a": []interface{}{
 			"foo",
-			map[string]interface{}{
-				"bar": "baz",
+			[]interface{}{
+				"bar",
+				map[string]interface{}{
+					"baz": "quux",
+				},
 			},
 		},
 	}