Skip to content

Commit

Permalink
go/scanner: Simplify ErrorList.Sort implementation.
Browse files Browse the repository at this point in the history
It functions exactly the same, but this is the more common
style for these kinds of multi-key comparison functions,
and is more regular.

Change-Id: I46630948f893bcc96c05eb3d36eb82e1d97a6fa0
Reviewed-on: https://go-review.googlesource.com/8358
Reviewed-by: Robert Griesemer <[email protected]>
  • Loading branch information
dsymonds committed Apr 1, 2015
1 parent 919a6fb commit 9b696be
Showing 1 changed file with 8 additions and 17 deletions.
25 changes: 8 additions & 17 deletions src/go/scanner/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,16 @@ func (p ErrorList) Less(i, j int) bool {
// Note that it is not sufficient to simply compare file offsets because
// the offsets do not reflect modified line information (through //line
// comments).
if e.Filename < f.Filename {
return true
if e.Filename != f.Filename {
return e.Filename < f.Filename
}
if e.Filename == f.Filename {
if e.Line < f.Line {
return true
}
if e.Line == f.Line {
if e.Column < f.Column {
return true
}
if e.Column == f.Column {
if p[i].Msg < p[j].Msg {
return true
}
}
}
if e.Line != f.Line {
return e.Line < f.Line
}
if e.Column != f.Column {
return e.Column < f.Column
}
return false
return p[i].Msg < p[j].Msg
}

// Sort sorts an ErrorList. *Error entries are sorted by position,
Expand Down

0 comments on commit 9b696be

Please sign in to comment.