aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Symonds <dsymonds@golang.org>2011-07-27 13:29:44 +1000
committerDavid Symonds <dsymonds@golang.org>2011-07-27 13:29:44 +1000
commitfc1cf588093ba7c687971783d3e075b6010a966b (patch)
tree0b352cc1cf4d56e58a50fddd1bb440a487045bbf
parent2fc962697a3a363e9b79a672d7b999332a6d0b9e (diff)
downloadgo-fc1cf588093ba7c687971783d3e075b6010a966b.tar.gz
go-fc1cf588093ba7c687971783d3e075b6010a966b.zip
reflect: doc fixes for obsolete types.
R=golang-dev, rsc CC=golang-dev https://golang.org/cl/4802061
-rw-r--r--src/pkg/reflect/all_test.go4
-rw-r--r--src/pkg/reflect/type.go12
-rw-r--r--src/pkg/unsafe/unsafe.go2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/pkg/reflect/all_test.go b/src/pkg/reflect/all_test.go
index ac43b50bb1..15c69c1f06 100644
--- a/src/pkg/reflect/all_test.go
+++ b/src/pkg/reflect/all_test.go
@@ -1327,8 +1327,8 @@ func TestImportPath(t *testing.T) {
}
}
-func TestDotDotDot(t *testing.T) {
- // Test example from FuncType.DotDotDot documentation.
+func TestVariadic(t *testing.T) {
+ // Test example from Type documentation.
var f func(x int, y ...float64)
typ := TypeOf(f)
if typ.NumIn() == 2 && typ.In(0) == TypeOf(int(0)) {
diff --git a/src/pkg/reflect/type.go b/src/pkg/reflect/type.go
index 28d94eb408..4c377e1fe1 100644
--- a/src/pkg/reflect/type.go
+++ b/src/pkg/reflect/type.go
@@ -114,11 +114,11 @@ type Type interface {
// is a "..." parameter. If so, t.In(t.NumIn() - 1) returns the parameter's
// implicit actual type []T.
//
- // For concreteness, if t represents func(x int, y ... float), then
+ // For concreteness, if t represents func(x int, y ... float64), then
//
// t.NumIn() == 2
// t.In(0) is the reflect.Type for "int"
- // t.In(1) is the reflect.Type for "[]float"
+ // t.In(1) is the reflect.Type for "[]float64"
// t.IsVariadic() == true
//
// IsVariadic panics if the type's Kind is not Func.
@@ -232,8 +232,8 @@ const (
// commonType is the common implementation of most values.
// It is embedded in other, public struct types, but always
-// with a unique tag like "uint" or "float" so that the client cannot
-// convert from, say, *UintType to *FloatType.
+// with a unique tag like `reflect:"array"` or `reflect:"ptr"`
+// so that code cannot convert from, say, *arrayType to *ptrType.
type commonType struct {
size uintptr
@@ -977,8 +977,8 @@ func PtrTo(t Type) Type {
}
rt.i = (*runtime.PtrType)(unsafe.Pointer(&rt.ptrType))
- // initialize p using *byte's PtrType as a prototype.
- // have to do assignment as PtrType, not runtime.PtrType,
+ // initialize p using *byte's ptrType as a prototype.
+ // have to do assignment as ptrType, not runtime.PtrType,
// in order to write to unexported fields.
p = &rt.ptrType
bp := (*ptrType)(unsafe.Pointer(unsafe.Typeof((*byte)(nil)).(*runtime.PtrType)))
diff --git a/src/pkg/unsafe/unsafe.go b/src/pkg/unsafe/unsafe.go
index 8507bed525..a1257066ef 100644
--- a/src/pkg/unsafe/unsafe.go
+++ b/src/pkg/unsafe/unsafe.go
@@ -47,7 +47,7 @@ func Reflect(i interface{}) (typ interface{}, addr Pointer)
// empty interface value with contents the type and the value (not the pointer to
// the value). The typ is assumed to contain a pointer to a runtime type; the type
// information in the interface{} is ignored, so that, for example, both
-// *reflect.StructType and *runtime.StructType can be passed for typ.
+// *reflect.structType and *runtime.StructType can be passed for typ.
func Unreflect(typ interface{}, addr Pointer) (ret interface{})
// New allocates and returns a pointer to memory for a new value of the given type.