diff options
Diffstat (limited to 'doc/progs/sortmain.go')
| -rw-r--r-- | doc/progs/sortmain.go | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/progs/sortmain.go b/doc/progs/sortmain.go index 74d1d1840..a94529579 100644 --- a/doc/progs/sortmain.go +++ b/doc/progs/sortmain.go @@ -7,7 +7,7 @@ package main import "sort" func ints() { - data := []int{74, 59, 238, -784, 9845, 959, 905, 0, 0, 42, 7586, -5467984, 7586}; + data := []int(74, 59, 238, -784, 9845, 959, 905, 0, 0, 42, 7586, -5467984, 7586); a := sort.IntArray(data); sort.Sort(a); if !sort.IsSorted(a) { @@ -16,7 +16,7 @@ func ints() { } func strings() { - data := []string{"monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"}; + data := []string("monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"); a := sort.StringArray(data); sort.Sort(a); if !sort.IsSorted(a) { @@ -39,15 +39,15 @@ func (p *dayArray) Less(i, j int) bool { return p.data[i].num < p.data[j].num; func (p *dayArray) Swap(i, j int) { p.data[i], p.data[j] = p.data[j], p.data[i]; } func days() { - Sunday := day{ 0, "SUN", "Sunday" }; - Monday := day{ 1, "MON", "Monday" }; - Tuesday := day{ 2, "TUE", "Tuesday" }; - Wednesday := day{ 3, "WED", "Wednesday" }; - Thursday := day{ 4, "THU", "Thursday" }; - Friday := day{ 5, "FRI", "Friday" }; - Saturday := day{ 6, "SAT", "Saturday" }; - data := []*day{&Tuesday, &Thursday, &Sunday, &Monday, &Friday}; - a := dayArray{data}; + Sunday := day( 0, "SUN", "Sunday" ); + Monday := day( 1, "MON", "Monday" ); + Tuesday := day( 2, "TUE", "Tuesday" ); + Wednesday := day( 3, "WED", "Wednesday" ); + Thursday := day( 4, "THU", "Thursday" ); + Friday := day( 5, "FRI", "Friday" ); + Saturday := day( 6, "SAT", "Saturday" ); + data := []*day(&Tuesday, &Thursday, &Sunday, &Monday, &Friday); + a := dayArray(data); sort.Sort(&a); if !sort.IsSorted(&a) { panic() |