Allow multiple merge keys

Author: moskyb

decode.go

@@ -770,6 +770,11 @@ func (d *decoder) mapping(n *Node, out reflect.Value) (good bool) {
 		nerrs := len(d.terrors)
 		for i := 0; i < l; i += 2 {
 			ni := n.Content[i]
+			if isMerge(ni) {
+				// Merge keys ("<<") are discarded during processing, so don't need to be unique.
+				continue
+			}
+
 			for j := i + 2; j < l; j += 2 {
 				nj := n.Content[j]
 				if ni.Kind == nj.Kind && ni.Value == nj.Value {
@@ -816,7 +821,7 @@ func (d *decoder) mapping(n *Node, out reflect.Value) (good bool) {
 	mergedFields := d.mergedFields
 	d.mergedFields = nil
 
-	var mergeNode *Node
+	mergeNodes := []*Node{}
 
 	mapIsNew := false
 	if out.IsNil() {
@@ -825,7 +830,7 @@ func (d *decoder) mapping(n *Node, out reflect.Value) (good bool) {
 	}
 	for i := 0; i < l; i += 2 {
 		if isMerge(n.Content[i]) {
-			mergeNode = n.Content[i+1]
+			mergeNodes = append(mergeNodes, n.Content[i+1])
 			continue
 		}
 		k := reflect.New(kt).Elem()
@@ -852,8 +857,8 @@ func (d *decoder) mapping(n *Node, out reflect.Value) (good bool) {
 	}
 
 	d.mergedFields = mergedFields
-	if mergeNode != nil {
-		d.merge(n, mergeNode, out)
+	for _, node := range mergeNodes {
+		d.merge(n, node, out)
 	}
 
 	d.stringMapType = stringMapType

decode_test.go

@@ -1530,6 +1530,37 @@ func (s *S) TestMergeNestedStruct(c *C) {
 	c.Assert(testm["outer"], DeepEquals, wantm)
 }
 
+const doubleMerge = `
+one: &one
+  a: 1
+  b: 2
+  d: 5
+
+two: &two
+  b: 3
+  c: 4
+  e: 6
+
+merged:
+  a: 0
+  <<: *one
+  <<: *two
+  e: 7
+`
+
+func (s *S) TestDoubleMerge(c *C) {
+	var m map[string]interface{}
+	err := yaml.Unmarshal([]byte(doubleMerge), &m)
+	c.Assert(err, IsNil)
+	c.Assert(m["merged"], DeepEquals, map[string]interface{}{
+		"a": 0, // The value of the parent is preserved over what's brought in by the merge
+		"b": 3,
+		"c": 4,
+		"d": 5,
+		"e": 7,
+	})
+}
+
 var unmarshalNullTests = []struct {
 	input              string
 	pristine, expected func() interface{}