Imported Upstream version 2011-02-01.1upstream/2011-02-01.1

4 files changed, 11 insertions, 12 deletions

diff --git a/doc/progs/file.go b/doc/progs/file.go
index d3fb5ae9e..df3a3cf71 100644
--- a/doc/progs/file.go
+++ b/doc/progs/file.go
@@ -22,9 +22,9 @@ func newFile(fd int, name string) *File {
 }
 
 var (
-	Stdin  = newFile(0, "/dev/stdin")
-	Stdout = newFile(1, "/dev/stdout")
-	Stderr = newFile(2, "/dev/stderr")
+	Stdin  = newFile(syscall.Stdin, "/dev/stdin")
+	Stdout = newFile(syscall.Stdout, "/dev/stdout")
+	Stderr = newFile(syscall.Stderr, "/dev/stderr")
 )
 
 func Open(name string, mode int, perm uint32) (file *File, err os.Error) {
diff --git a/doc/progs/run b/doc/progs/run
index 29f1f8152..241e65dfa 100755
--- a/doc/progs/run
+++ b/doc/progs/run
@@ -29,9 +29,8 @@ for i in \
 	sieve.go \
 	sieve1.go \
 	server1.go \
+	strings.go \
 ; do
-	BASE=$(basename $i .go)
-
 	$GC $i
 done
 
@@ -58,6 +57,7 @@ testit helloworld "" "Hello, world; or Καλημέρα κόσμε; or こんに
 testit helloworld3 "" "hello, world can't open file; err=no such file or directory"
 testit echo "hello, world" "hello, world"
 testit sum "" "6"
+testit strings "" ""
 
 alphabet=abcdefghijklmnopqrstuvwxyz
 rot13=nopqrstuvwxyzabcdefghijklm
diff --git a/doc/progs/sort.go b/doc/progs/sort.go
index 6738860d9..79e7f563e 100644
--- a/doc/progs/sort.go
+++ b/doc/progs/sort.go
@@ -37,11 +37,11 @@ func (p IntArray) Less(i, j int) bool  { return p[i] < p[j] }
 func (p IntArray) Swap(i, j int)       { p[i], p[j] = p[j], p[i] }
 
 
-type FloatArray []float
+type Float64Array []float64
 
-func (p FloatArray) Len() int            { return len(p) }
-func (p FloatArray) Less(i, j int) bool  { return p[i] < p[j] }
-func (p FloatArray) Swap(i, j int)       { p[i], p[j] = p[j], p[i] }
+func (p Float64Array) Len() int            { return len(p) }
+func (p Float64Array) Less(i, j int) bool  { return p[i] < p[j] }
+func (p Float64Array) Swap(i, j int)       { p[i], p[j] = p[j], p[i] }
 
 
 type StringArray []string
@@ -54,10 +54,10 @@ func (p StringArray) Swap(i, j int)       { p[i], p[j] = p[j], p[i] }
 // Convenience wrappers for common cases
 
 func SortInts(a []int)        { Sort(IntArray(a)) }
-func SortFloats(a []float)    { Sort(FloatArray(a)) }
+func SortFloat64s(a []float64)    { Sort(Float64Array(a)) }
 func SortStrings(a []string)  { Sort(StringArray(a)) }
 
 
 func IntsAreSorted(a []int) bool       { return IsSorted(IntArray(a)) }
-func FloatsAreSorted(a []float) bool   { return IsSorted(FloatArray(a)) }
+func Float64sAreSorted(a []float64) bool   { return IsSorted(Float64Array(a)) }
 func StringsAreSorted(a []string) bool { return IsSorted(StringArray(a)) }
diff --git a/doc/progs/strings.go b/doc/progs/strings.go
index 0ec25f8e8..2cdb6101a 100644
--- a/doc/progs/strings.go
+++ b/doc/progs/strings.go
@@ -4,7 +4,6 @@
 
 package main
 
-import "fmt"
 import "os"
 
 func main() {