mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
tpl/collections: Convert numeric values to float64 and compare them
Fixes #5685
This commit is contained in:
parent
4c560020bc
commit
fb007e9ae5
2 changed files with 34 additions and 0 deletions
|
@ -114,6 +114,17 @@ func (ns *Namespace) checkCondition(v, mv reflect.Value, op string) (bool, error
|
||||||
slv = v.Interface()
|
slv = v.Interface()
|
||||||
slmv = mv.Interface()
|
slmv = mv.Interface()
|
||||||
}
|
}
|
||||||
|
} else if isNumber(v.Kind()) && isNumber(mv.Kind()) {
|
||||||
|
fv, err := toFloat(v)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
fvp = &fv
|
||||||
|
fmv, err := toFloat(mv)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
fmvp = &fmv
|
||||||
} else {
|
} else {
|
||||||
if mv.Kind() != reflect.Array && mv.Kind() != reflect.Slice {
|
if mv.Kind() != reflect.Array && mv.Kind() != reflect.Slice {
|
||||||
return false, nil
|
return false, nil
|
||||||
|
@ -426,6 +437,8 @@ func toFloat(v reflect.Value) (float64, error) {
|
||||||
switch v.Kind() {
|
switch v.Kind() {
|
||||||
case reflect.Float32, reflect.Float64:
|
case reflect.Float32, reflect.Float64:
|
||||||
return v.Float(), nil
|
return v.Float(), nil
|
||||||
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
||||||
|
return v.Convert(reflect.TypeOf(float64(0))).Float(), nil
|
||||||
case reflect.Interface:
|
case reflect.Interface:
|
||||||
return toFloat(v.Elem())
|
return toFloat(v.Elem())
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,6 +84,27 @@ func TestWhere(t *testing.T) {
|
||||||
key: "b", match: 4.0, op: "<",
|
key: "b", match: 4.0, op: "<",
|
||||||
expect: []map[string]float64{{"a": 1, "b": 2}},
|
expect: []map[string]float64{{"a": 1, "b": 2}},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
seq: []map[string]float64{
|
||||||
|
{"a": 1, "b": 2}, {"a": 3, "b": 4}, {"a": 5, "x": 4},
|
||||||
|
},
|
||||||
|
key: "b", match: 4, op: "<",
|
||||||
|
expect: []map[string]float64{{"a": 1, "b": 2}},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
seq: []map[string]int{
|
||||||
|
{"a": 1, "b": 2}, {"a": 3, "b": 4}, {"a": 5, "x": 4},
|
||||||
|
},
|
||||||
|
key: "b", match: 4.0, op: "<",
|
||||||
|
expect: []map[string]int{{"a": 1, "b": 2}},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
seq: []map[string]int{
|
||||||
|
{"a": 1, "b": 2}, {"a": 3, "b": 4}, {"a": 5, "x": 4},
|
||||||
|
},
|
||||||
|
key: "b", match: 4.2, op: "<",
|
||||||
|
expect: []map[string]int{{"a": 1, "b": 2}, {"a": 3, "b": 4}},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
seq: []map[string]float64{
|
seq: []map[string]float64{
|
||||||
{"a": 1, "b": 2}, {"a": 3, "b": 4}, {"a": 5, "x": 4},
|
{"a": 1, "b": 2}, {"a": 3, "b": 4}, {"a": 5, "x": 4},
|
||||||
|
|
Loading…
Reference in a new issue