fix

Author: admpub

decode.go

@@ -264,19 +264,14 @@ func (md *MetaData) unifyMap(mapping interface{}, rv reflect.Value) error {
 	if !ok {
 		return badtype("map", mapping)
 	}
-	if rv.IsNil() {
+	isNil := rv.IsNil()
+	if isNil {
 		rv.Set(reflect.MakeMap(rv.Type()))
 	}
 	for k, v := range tmap {
 		md.decoded[md.context.add(k).String()] = true
 		md.context = append(md.context, k)
-
 		rvkey := indirect(reflect.New(rv.Type().Key()))
-		rvval := reflect.Indirect(reflect.New(rv.Type().Elem()))
-		if err := md.unify(v, rvval); err != nil {
-			return err
-		}
-		md.context = md.context[0 : len(md.context)-1]
 		keyType := rvkey.Kind()
 		if keyType >= reflect.Int && keyType <= reflect.Uint64 {
 			i, err := strconv.ParseInt(k, 10, 64)
@@ -295,6 +290,28 @@ func (md *MetaData) unifyMap(mapping interface{}, rv reflect.Value) error {
 					keyType, mapping)
 			}
 		}
+		var rvval reflect.Value
+		destType := rv.Type().Elem()
+		if !isNil {
+			prval := rv.MapIndex(rvkey)
+			if prval.IsValid() {
+				if prval.Kind() == reflect.Interface {
+					prval = reflect.ValueOf(prval.Interface())
+				}
+				destType = prval.Type()
+				if destType.Kind() == reflect.Map {
+					rvval = prval
+				}
+				//fmt.Printf("[confl] %v(%v) =====> %v\n", k, rv.Type().Key().Kind(), destType.Kind())
+			}
+		}
+		if rvval.Kind() == reflect.Invalid {
+			rvval = reflect.Indirect(reflect.New(destType))
+		}
+		if err := md.unify(v, rvval); err != nil {
+			return err
+		}
+		md.context = md.context[0 : len(md.context)-1]
 		rv.SetMapIndex(rvkey, rvval)
 	}
 	return nil

decode_test.go

@@ -1,7 +1,6 @@
 package confl
 
 import (
-	"encoding/json"
 	"fmt"
 	"log"
 	"reflect"
@@ -454,8 +453,9 @@ func TestDecodeMap(t *testing.T) {
 	}
 	var tab table
 	tab.H = map[string]interface{}{
-		`table`: &Table2{Name: `0`},
-		`list`:  []string{`1`, `2`},
+		`table`:  &Table2{Name: `0`},
+		`table2`: Table2{Name: `00`},
+		`list`:   []string{`1`, `2`},
 		`mapInMap`: map[string]interface{}{
 			`inString`: `v`,
 			`inList`:   []string{`1`, `2`},
@@ -465,6 +465,9 @@ func TestDecodeMap(t *testing.T) {
 	table : {
 		Name : "1"
 	}
+	table2 : {
+		Name : "10"
+	}
 	list : ["11","12"]
 	mapInMap : {
 		"inString" : "y"
@@ -474,19 +477,18 @@ func TestDecodeMap(t *testing.T) {
 	if _, err := Decode(str, &tab); err != nil {
 		t.Fatal(err)
 	}
-	expected, _ := json.Marshal(table{
+	expected := table{
 		H: map[string]interface{}{
-			`table`: &Table2{Name: `1`},
-			`list`:  []string{`11`, `12`},
+			`table`:  &Table2{Name: `1`},
+			`table2`: Table2{Name: `10`},
+			`list`:   []string{`11`, `12`},
 			`mapInMap`: map[string]interface{}{
 				`inString`: `y`,
 				`inList`:   []string{`21`, `22`},
 			},
 		},
-	})
-	actual, _ := json.Marshal(tab)
-	println(string(actual))
-	assert.Equal(t, string(expected), string(actual))
+	}
+	assert.Equal(t, expected, tab)
 }
 
 func TestDecodeSizedInts(t *testing.T) {

doc.go

@@ -3,3 +3,13 @@ Package confl provides facilities for decoding and encoding TOML/NGINX configura
 files via reflection.
 */
 package confl
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+func printJSON(v interface{}) {
+	b, _ := json.MarshalIndent(v, ``, `  `)
+	fmt.Println(string(b))
+}