From: Russ Cox Date: Fri, 27 Oct 2017 14:21:46 +0000 (-0400) Subject: sort: split post-Go1.4 code into its own file X-Git-Tag: go1.10beta1~567 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3caa02f603fcb895763f2f5c3f737ef69fa9cf0a;p=gostls13.git sort: split post-Go1.4 code into its own file This will let us build the latest sort when bootstrapping the compiler. The compiler depends on the precise tie-breaks used by sort in some cases, and it's easier to bring sort along than require checking every sort call ever added to the compiler. Change-Id: Idc622f89aedbb40d848708c76650fc28779d0c3c Reviewed-on: https://go-review.googlesource.com/73951 Run-TryBot: Russ Cox TryBot-Result: Gobot Gobot Reviewed-by: Cherry Zhang --- diff --git a/src/sort/slice.go b/src/sort/slice.go new file mode 100644 index 0000000000..206f12173d --- /dev/null +++ b/src/sort/slice.go @@ -0,0 +1,46 @@ +// Copyright 2017 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build !compiler_bootstrap go1.8 + +package sort + +import "reflect" + +// Slice sorts the provided slice given the provided less function. +// +// The sort is not guaranteed to be stable. For a stable sort, use +// SliceStable. +// +// The function panics if the provided interface is not a slice. +func Slice(slice interface{}, less func(i, j int) bool) { + rv := reflect.ValueOf(slice) + swap := reflect.Swapper(slice) + length := rv.Len() + quickSort_func(lessSwap{less, swap}, 0, length, maxDepth(length)) +} + +// SliceStable sorts the provided slice given the provided less +// function while keeping the original order of equal elements. +// +// The function panics if the provided interface is not a slice. +func SliceStable(slice interface{}, less func(i, j int) bool) { + rv := reflect.ValueOf(slice) + swap := reflect.Swapper(slice) + stable_func(lessSwap{less, swap}, rv.Len()) +} + +// SliceIsSorted tests whether a slice is sorted. +// +// The function panics if the provided interface is not a slice. +func SliceIsSorted(slice interface{}, less func(i, j int) bool) bool { + rv := reflect.ValueOf(slice) + n := rv.Len() + for i := n - 1; i > 0; i-- { + if less(i, i-1) { + return false + } + } + return true +} diff --git a/src/sort/sort.go b/src/sort/sort.go index 081b700798..a7304af53d 100644 --- a/src/sort/sort.go +++ b/src/sort/sort.go @@ -8,8 +8,6 @@ // collections. package sort -import "reflect" - // A type, typically a collection, that satisfies sort.Interface can be // sorted by the routines in this package. The methods require that the // elements of the collection be enumerated by an integer index. @@ -238,43 +236,6 @@ type lessSwap struct { Swap func(i, j int) } -// Slice sorts the provided slice given the provided less function. -// -// The sort is not guaranteed to be stable. For a stable sort, use -// SliceStable. -// -// The function panics if the provided interface is not a slice. -func Slice(slice interface{}, less func(i, j int) bool) { - rv := reflect.ValueOf(slice) - swap := reflect.Swapper(slice) - length := rv.Len() - quickSort_func(lessSwap{less, swap}, 0, length, maxDepth(length)) -} - -// SliceStable sorts the provided slice given the provided less -// function while keeping the original order of equal elements. -// -// The function panics if the provided interface is not a slice. -func SliceStable(slice interface{}, less func(i, j int) bool) { - rv := reflect.ValueOf(slice) - swap := reflect.Swapper(slice) - stable_func(lessSwap{less, swap}, rv.Len()) -} - -// SliceIsSorted tests whether a slice is sorted. -// -// The function panics if the provided interface is not a slice. -func SliceIsSorted(slice interface{}, less func(i, j int) bool) bool { - rv := reflect.ValueOf(slice) - n := rv.Len() - for i := n - 1; i > 0; i-- { - if less(i, i-1) { - return false - } - } - return true -} - type reverse struct { // This embedded Interface permits Reverse to use the methods of // another Interface implementation.