fix: avoid changing item value in merging

gochore · Jun 17, 2020 · 07844f8 · 07844f8
1 parent 9315865
commit 07844f8
Show file tree

Hide file tree

Showing 13 changed files with 143 additions and 65 deletions.
diff --git a/cmd/generate/x_sequence.go.tmpl b/cmd/generate/x_sequence.go.tmpl
@@ -166,20 +166,26 @@ func Merge{{.Name}}(seq1, seq2 {{.Name}}Sequence, fn func(item1, item2 *{{.Name}
 		var item *{{.Name}}Item
 		switch {
 		case i1 == seq1.Len():
-			item = fn(nil, &seq2[i2])
+			v2 := seq2[i2]
+			item = fn(nil, &v2)
 			i2++
 		case i2 == seq2.Len():
-			item = fn(&seq1[i1], nil)
+			v1 := seq1[i1]
+			item = fn(&v1, nil)
 			i1++
 		case seq1[i1].Time.Equal(seq2[i2].Time):
-			item = fn(&seq1[i1], &seq2[i2])
+			v1 := seq1[i1]
+			v2 := seq2[i2]
+			item = fn(&v1, &v2)
 			i1++
 			i2++
 		case seq1[i1].Time.Before(seq2[i2].Time):
-			item = fn(&seq1[i1], nil)
+			v1 := seq1[i1]
+			item = fn(&v1, nil)
 			i1++
 		case seq1[i1].Time.After(seq2[i2].Time):
-			item = fn(nil, &seq2[i2])
+			v2 := seq2[i2]
+			item = fn(nil, &v2)
 			i2++
 		}
 		if item != nil {

diff --git a/float32_sequence.go b/float32_sequence.go
diff --git a/float64_sequence.go b/float64_sequence.go
diff --git a/int16_sequence.go b/int16_sequence.go
diff --git a/int32_sequence.go b/int32_sequence.go
diff --git a/int64_sequence.go b/int64_sequence.go
diff --git a/int8_sequence.go b/int8_sequence.go
diff --git a/int_sequence.go b/int_sequence.go
diff --git a/uint16_sequence.go b/uint16_sequence.go
diff --git a/uint32_sequence.go b/uint32_sequence.go
diff --git a/uint64_sequence.go b/uint64_sequence.go
diff --git a/uint8_sequence.go b/uint8_sequence.go