phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-05 08:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant field in sort helper struct

Browse source 
The pair struct used by sortSeq() had two key fields, where only one
is really needed.
This commit is contained in:
Ben Campbell 2016-09-11 20:42:50 +12:00 committed by Bjørn Erik Pedersen
parent 9c5f2befc0
commit 3392133128
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tpl/template_funcs.go
View file

@ -1040,10 +1040,9 @@ func sortSeq(seq interface{}, args ...interface{}) (interface{}, error) {
switch seqv.Kind() { switch seqv.Kind() {
case reflect.Array, reflect.Slice: case reflect.Array, reflect.Slice:
for i := 0; i < seqv.Len(); i++ { for i := 0; i < seqv.Len(); i++ {
p.Pairs[i].Key = reflect.ValueOf(i)
p.Pairs[i].Value = seqv.Index(i) p.Pairs[i].Value = seqv.Index(i)
if sortByField == "" || sortByField == "value" { if sortByField == "" || sortByField == "value" {
p.Pairs[i].SortByValue = p.Pairs[i].Value p.Pairs[i].Key = p.Pairs[i].Value
} else { } else {
v := p.Pairs[i].Value v := p.Pairs[i].Value
var err error var err error
@ -1053,19 +1052,18 @@ func sortSeq(seq interface{}, args ...interface{}) (interface{}, error) {
return nil, err return nil, err
} }
} }
p.Pairs[i].SortByValue = v p.Pairs[i].Key = v
} }
} }
case reflect.Map: case reflect.Map:
keys := seqv.MapKeys() keys := seqv.MapKeys()
for i := 0; i < seqv.Len(); i++ { for i := 0; i < seqv.Len(); i++ {
p.Pairs[i].Key = keys[i]
p.Pairs[i].Value = seqv.MapIndex(keys[i]) p.Pairs[i].Value = seqv.MapIndex(keys[i])
if sortByField == "" { if sortByField == "" {
p.Pairs[i].SortByValue = p.Pairs[i].Key p.Pairs[i].Key = keys[i]
} else if sortByField == "value" { } else if sortByField == "value" {
p.Pairs[i].SortByValue = p.Pairs[i].Value p.Pairs[i].Key = p.Pairs[i].Value
} else { } else {
v := p.Pairs[i].Value v := p.Pairs[i].Value
var err error var err error
@ -1075,7 +1073,7 @@ func sortSeq(seq interface{}, args ...interface{}) (interface{}, error) {
return nil, err return nil, err
} }
} }
p.Pairs[i].SortByValue = v p.Pairs[i].Key = v
} }
} }
} }
@ -1086,9 +1084,8 @@ func sortSeq(seq interface{}, args ...interface{}) (interface{}, error) {
// https://groups.google.com/forum/#!topic/golang-nuts/FT7cjmcL7gw // https://groups.google.com/forum/#!topic/golang-nuts/FT7cjmcL7gw
// A data structure to hold a key/value pair. // A data structure to hold a key/value pair.
type pair struct { type pair struct {
Key reflect.Value Key reflect.Value
Value reflect.Value Value reflect.Value
SortByValue reflect.Value
} }
// A slice of pairs that implements sort.Interface to sort by Value. // A slice of pairs that implements sort.Interface to sort by Value.
@ -1101,8 +1098,8 @@ type pairList struct {
func (p pairList) Swap(i, j int) { p.Pairs[i], p.Pairs[j] = p.Pairs[j], p.Pairs[i] } func (p pairList) Swap(i, j int) { p.Pairs[i], p.Pairs[j] = p.Pairs[j], p.Pairs[i] }
func (p pairList) Len() int { return len(p.Pairs) } func (p pairList) Len() int { return len(p.Pairs) }
func (p pairList) Less(i, j int) bool { func (p pairList) Less(i, j int) bool {
iv := p.Pairs[i].SortByValue iv := p.Pairs[i].Key
jv := p.Pairs[j].SortByValue jv := p.Pairs[j].Key
if iv.IsValid() { if iv.IsValid() {
if jv.IsValid() { if jv.IsValid() {