Make the reflection library match the reflection string which
6g generates for functions: expect the keyword "func". The
older reflection syntax, without the "func", is still
recognized for simplicity in parsing interface reflection
strings.
R=r,rsc
DELTA=66 (31 added, 8 deleted, 27 changed)
OCL=27396
CL=27422
diff --git a/src/lib/reflect/all_test.go b/src/lib/reflect/all_test.go
index e3f6b9b..ed1e963 100644
--- a/src/lib/reflect/all_test.go
+++ b/src/lib/reflect/all_test.go
@@ -117,8 +117,8 @@
typedump("map[string]int32", "map[string]int32");
typedump("chan<-string", "chan<-string");
typedump("struct {c chan *int32; d float32}", "struct{c chan*int32; d float32}");
- typedump("*(a int8, b int32)", "*(a int8, b int32)");
- typedump("struct {c *(? chan *P.integer, ? *int8)}", "struct{c *(chan*P.integer, *int8)}");
+ typedump("func(a int8, b int32)", "func(a int8, b int32)");
+ typedump("struct {c func(? chan *P.integer, ? *int8)}", "struct{c func(chan*P.integer, *int8)}");
typedump("struct {a int8; b int32}", "struct{a int8; b int32}");
typedump("struct {a int8; b int8; b int32}", "struct{a int8; b int8; b int32}");
typedump("struct {a int8; b int8; c int8; b int32}", "struct{a int8; b int8; c int8; b int32}");
@@ -126,7 +126,8 @@
typedump("struct {a int8; b int8; c int8; d int8; e int8; b int32}", "struct{a int8; b int8; c int8; d int8; e int8; b int32}");
typedump("struct {a int8 \"hi there\"; }", "struct{a int8 \"hi there\"}");
typedump("struct {a int8 \"hi \\x00there\\t\\n\\\"\\\\\"; }", "struct{a int8 \"hi \\x00there\\t\\n\\\"\\\\\"}");
- typedump("struct {f *(args ...)}", "struct{f *(args ...)}");
+ typedump("struct {f func(args ...)}", "struct{f func(args ...)}");
+ typedump("interface { a(? func(? func(? int) int) func(? func(? int)) int); b() }", "interface{a (func(func(int)(int))(func(func(int))(int))); b ()}");
// Values
valuedump("int8", "8");
@@ -148,8 +149,8 @@
valuedump("map[string]int32", "map[string]int32{<can't iterate on maps>}");
valuedump("chan<-string", "chan<-string");
valuedump("struct {c chan *int32; d float32}", "struct{c chan*int32; d float32}{chan*int32, 0}");
- valuedump("*(a int8, b int32)", "*(a int8, b int32)(0)");
- valuedump("struct {c *(? chan *P.integer, ? *int8)}", "struct{c *(chan*P.integer, *int8)}{*(chan*P.integer, *int8)(0)}");
+ valuedump("func(a int8, b int32)", "func(a int8, b int32)(0)");
+ valuedump("struct {c func(? chan *P.integer, ? *int8)}", "struct{c func(chan*P.integer, *int8)}{func(chan*P.integer, *int8)(0)}");
valuedump("struct {a int8; b int32}", "struct{a int8; b int32}{0, 0}");
valuedump("struct {a int8; b int8; b int32}", "struct{a int8; b int8; b int32}{0, 0, 0}");
@@ -243,14 +244,14 @@
t = reflect.ParseTypeString("", "interface {a() *int}");
assert(t.String(), "interface {a() *int}");
- t = reflect.ParseTypeString("", "*(a int8, b int32)");
- assert(t.String(), "*(a int8, b int32)");
+ t = reflect.ParseTypeString("", "func(a int8, b int32)");
+ assert(t.String(), "func(a int8, b int32)");
- t = reflect.ParseTypeString("", "*(a int8, b int32) float");
- assert(t.String(), "*(a int8, b int32) float");
+ t = reflect.ParseTypeString("", "func(a int8, b int32) float");
+ assert(t.String(), "func(a int8, b int32) float");
- t = reflect.ParseTypeString("", "*(a int8, b int32) (a float, b float)");
- assert(t.String(), "*(a int8, b int32) (a float, b float)");
+ t = reflect.ParseTypeString("", "func(a int8, b int32) (a float, b float)");
+ assert(t.String(), "func(a int8, b int32) (a float, b float)");
t = reflect.ParseTypeString("", "[32]int32");
assert(t.String(), "[32]int32");
@@ -311,6 +312,14 @@
assert(v3.Type().String(), "float");
}
+func TestFunctionValue(t *testing.T) {
+ v := reflect.NewValue(func() {});
+ if v.Interface() != v.Interface() {
+ t.Fatalf("TestFunction != itself");
+ }
+ assert(v.Type().String(), "func()");
+}
+
func TestCopyArray(t *testing.T) {
a := []int{ 1, 2, 3, 4, 10, 9, 8, 7 };
b := []int{ 11, 22, 33, 44, 1010, 99, 88, 77, 66, 55, 44 };
