ref: 2fefc01606fddb119f368c89fb2dedd452ad6547
parent: 0c251be66bf3ad4abafbc47583e394ca4e6ffcf1
author: Bjørn Erik Pedersen <[email protected]>
date: Thu Jan 23 05:48:28 EST 2020
tpl/compare: Fix eq when > 2 args Fixes #6786
--- a/tpl/compare/compare.go
+++ b/tpl/compare/compare.go
@@ -119,11 +119,17 @@
normFirst := normalize(first)
for _, other := range others {
if e, ok := first.(compare.Eqer); ok {
- return e.Eq(other)
+ if e.Eq(other) {
+ return true
+ }
+ continue
}
if e, ok := other.(compare.Eqer); ok {
- return e.Eq(first)
+ if e.Eq(first) {
+ return true
+ }
+ continue
}
other = normalize(other)
--- a/tpl/compare/compare_test.go
+++ b/tpl/compare/compare_test.go
@@ -275,6 +275,9 @@
{1, []interface{}{1, 2}, true},
{1, []interface{}{2, 1}, true},
{1, []interface{}{2, 3}, false},
+ {tstEqerType1("a"), []interface{}{tstEqerType1("a"), tstEqerType1("b")}, true},
+ {tstEqerType1("a"), []interface{}{tstEqerType1("b"), tstEqerType1("a")}, true},
+ {tstEqerType1("a"), []interface{}{tstEqerType1("b"), tstEqerType1("c")}, false},
} {
result := ns.Eq(test.first, test.others...)