fix bugs parsing functions in reflect library.
parsed interfaces wrong.
could not handle a function with a single type as a return value.
R=rsc
DELTA=34 (20 added, 2 deleted, 12 changed)
OCL=18511
CL=18520
diff --git a/src/lib/reflect/test.go b/src/lib/reflect/test.go
index 54fd5ac..13be64c 100644
--- a/src/lib/reflect/test.go
+++ b/src/lib/reflect/test.go
@@ -88,7 +88,6 @@
export type T struct { a int; b float64; c string; d *int }
func main() {
-//NOTE: INTERFACES PARSE INCORRECTLY: parser's Fields() stops at '('
var s string;
var t reflect.Type;
@@ -224,13 +223,18 @@
name, typ, tag, offset = st.Field(1);
assert(typ.String(), "float32");
- //TODO! this is bad - can't put a method in an interface!
- t = reflect.ParseTypeString("", "interface {a int}");
- assert(t.String(), "interface {a int}");
+ 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("", "*(a int8, b int32) float");
+ assert(t.String(), "*(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("", "[32]int32");
assert(t.String(), "[32]int32");
at = t.(reflect.ArrayType);
