Skip to content

Commit

Permalink
Fix compare of uints and ints in eq, gt etc.
Browse files Browse the repository at this point in the history
Fixes #12733
  • Loading branch information
bep committed Aug 10, 2024
1 parent ef2e30e commit fbfccb3
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 3 deletions.
16 changes: 16 additions & 0 deletions resources/images/images_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,19 @@ W/H rotated: {{ $rotated.Width }}/{{ $rotated.Height }}
b := hugolib.Test(t, files)
b.AssertFileContent("public/index.html", "W/H original: 80/40\n\nW/H rotated: 40/80")
}

// Issue 12733.
func TestOrientationEq(t *testing.T) {
files := `
-- hugo.toml --
-- assets/rotate270.jpg --
sourcefilename: ../testdata/exif/orientation6.jpg
-- layouts/index.html --
{{ $img := resources.Get "rotate270.jpg" }}
{{ $orientation := $img.Exif.Tags.Orientation }}
Orientation: {{ $orientation }}|eq 6: {{ eq $orientation 6 }}|Type: {{ printf "%T" $orientation }}|
`

b := hugolib.Test(t, files)
b.AssertFileContent("public/index.html", "Orientation: 6|eq 6: true|")
}
38 changes: 35 additions & 3 deletions tpl/compare/compare.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,12 @@ func (n *Namespace) Eq(first any, others ...any) bool {
case reflect.Float32, reflect.Float64:
return vv.Float()
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
return vv.Uint()
i := vv.Uint()
// If it can fit in an int, convert it.
if i <= math.MaxInt64 {
return int64(i)
}
return i
case reflect.String:
return vv.String()
default:
Expand Down Expand Up @@ -237,6 +242,16 @@ func (ns *Namespace) compareGet(a any, b any) (float64, float64) {
return ns.compareGetWithCollator(nil, a, b)
}

func (ns *Namespace) compareTwoUints(a uint64, b uint64) (float64, float64) {
if a < b {
return 1, 0
} else if a == b {
return 0, 0
} else {
return 0, 1
}
}

func (ns *Namespace) compareGetWithCollator(collator *langs.Collator, a any, b any) (float64, float64) {
if ac, ok := a.(compare.Comparer); ok {
c := ac.Compare(b)
Expand All @@ -263,12 +278,22 @@ func (ns *Namespace) compareGetWithCollator(collator *langs.Collator, a any, b a
var left, right float64
var leftStr, rightStr *string
av := reflect.ValueOf(a)
bv := reflect.ValueOf(b)

switch av.Kind() {
case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
left = float64(av.Len())
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
if hreflect.IsUint(bv.Kind()) {
return ns.compareTwoUints(uint64(av.Int()), bv.Uint())
}
left = float64(av.Int())
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32:
left = float64(av.Uint())
case reflect.Uint64:
if hreflect.IsUint(bv.Kind()) {
return ns.compareTwoUints(av.Uint(), bv.Uint())
}
case reflect.Float32, reflect.Float64:
left = av.Float()
case reflect.String:
Expand All @@ -290,13 +315,20 @@ func (ns *Namespace) compareGetWithCollator(collator *langs.Collator, a any, b a
}
}

bv := reflect.ValueOf(b)

switch bv.Kind() {
case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
right = float64(bv.Len())
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
if hreflect.IsUint(av.Kind()) {
return ns.compareTwoUints(av.Uint(), uint64(bv.Int()))
}
right = float64(bv.Int())
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32:
right = float64(bv.Uint())
case reflect.Uint64:
if hreflect.IsUint(av.Kind()) {
return ns.compareTwoUints(av.Uint(), bv.Uint())
}
case reflect.Float32, reflect.Float64:
right = bv.Float()
case reflect.String:
Expand Down
11 changes: 11 additions & 0 deletions tpl/compare/compare_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package compare

import (
"math"
"path"
"reflect"
"runtime"
Expand Down Expand Up @@ -199,6 +200,16 @@ func doTestCompare(t *testing.T, tp tstCompareType, funcUnderTest func(a, b any)
{5, 5, 0},
{int(5), int64(5), 0},
{int32(5), int(5), 0},
{int16(4), 4, 0},
{uint8(4), 4, 0},
{uint16(4), 4, 0},
{uint16(4), 4, 0},
{uint32(4), uint16(4), 0},
{uint32(4), uint16(3), 1},
{uint64(4), 4, 0},
{4, uint64(4), 0},
{uint64(math.MaxUint32), uint32(math.MaxUint32), 0},
{uint64(math.MaxUint16), int(math.MaxUint16), 0},
{int16(4), int(5), -1},
{uint(15), uint64(15), 0},
{-2, 1, -1},
Expand Down

0 comments on commit fbfccb3

Please sign in to comment.