Encode embedded *structs

Oneledger · Dec 20, 2013 · efc01ff · efc01ff
1 parent 8f07d18
commit efc01ff
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/encode.go b/encode.go
@@ -324,7 +324,12 @@ func (enc *Encoder) eStruct(key Key, rv reflect.Value) error {
 			f := rt.Field(i)
 			frv := rv.Field(i)
 			if f.Anonymous {
-				addFields(frv.Type(), frv, f.Index)
+				t := frv.Type()
+				if t.Kind() == reflect.Ptr {
+					t = t.Elem()
+					frv = frv.Elem()
+				}
+				addFields(t, frv, f.Index)
 			} else if isStructOrMap(frv) {
 				fieldsSub = append(fieldsSub, append(startingIndex, f.Index...))
 			} else {

diff --git a/encode_test.go b/encode_test.go
@@ -186,12 +186,22 @@ ArrayOfMixedSlices = [[1, 2], ["a", "b"]]`,
 			input:      struct{ Embedded }{Embedded{1}},
 			wantOutput: "_int = 1",
 		},
+		"embedded *struct": {
+			input:      struct{ *Embedded }{&Embedded{1}},
+			wantOutput: "_int = 1",
+		},
 		"nested embedded struct": {
 			input: struct {
 				Struct struct{ Embedded } `toml:"_struct"`
 			}{struct{ Embedded }{Embedded{1}}},
 			wantOutput: "[_struct]\n  _int = 1",
 		},
+		"nested embedded *struct": {
+			input: struct {
+				Struct struct{ *Embedded } `toml:"_struct"`
+			}{struct{ *Embedded }{&Embedded{1}}},
+			wantOutput: "[_struct]\n  _int = 1",
+		},
 		"array of tables": {
 			input: struct {
 				Structs []*struct{ Int int } `toml:"struct"`