From: David Symonds <dsymonds@golang.org>
Date: Wed, 1 Apr 2015 21:24:35 +0000 (-0700)
Subject: go/scanner: Simplify ErrorList.Sort implementation.
X-Git-Tag: go1.5beta1~1353
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9b696be08bd252c29de61740951dc8f0b115bfc4;p=gostls13.git

go/scanner: Simplify ErrorList.Sort implementation.

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 <gri@golang.org>
---

diff --git a/src/go/scanner/errors.go b/src/go/scanner/errors.go
index 7c9ab254ee..bf7bfa30e4 100644
--- a/src/go/scanner/errors.go
+++ b/src/go/scanner/errors.go
@@ -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,