1 files changed, 72 insertions, 30 deletions
diff --git a/usr/r/reflect/main.go b/usr/r/reflect/main.go
index 0348cef9f..1967ed7c3 100644
--- a/usr/r/reflect/main.go
+++ b/usr/r/reflect/main.go
@@ -8,37 +8,79 @@ import (
 	"reflect"
 )
 
+func typedump(s string) {
+	t := reflect.ParseTypeString(s);
+	print(reflect.TypeToString(t),"; size = ", t.Size(), "\n");
+}
+
+func valuedump(s string) {
+	t := reflect.ParseTypeString(s);
+	v := reflect.NewInitValue(t);
+	switch v.Kind() {
+	case reflect.Int8Kind:
+		v.(reflect.Int8Value).Put(8);
+	case reflect.Int16Kind:
+		v.(reflect.Int16Value).Put(16);
+	case reflect.Int32Kind:
+		v.(reflect.Int32Value).Put(32);
+	case reflect.Int64Kind:
+		v.(reflect.Int64Value).Put(64);
+	case reflect.Uint8Kind:
+		v.(reflect.Uint8Value).Put(8);
+	case reflect.Uint16Kind:
+		v.(reflect.Uint16Value).Put(16);
+	case reflect.Uint32Kind:
+		v.(reflect.Uint32Value).Put(32);
+	case reflect.Uint64Kind:
+		v.(reflect.Uint64Value).Put(64);
+	case reflect.Float32Kind:
+		v.(reflect.Float32Value).Put(320.0);
+	case reflect.Float64Kind:
+		v.(reflect.Float32Value).Put(640.0);
+	case reflect.StringKind:
+		v.(reflect.StringValue).Put("stringy cheese");
+	}
+	print(s, " value = ", reflect.ValueToString(v), "\n");
+}
+
 func main() {
 	var s string;
 	var t reflect.Type;
-
-	t = reflect.ParseTypeString("int8");
-	s = reflect.ToString(t); print(s, "\n");
-
-	t = reflect.ParseTypeString("**int8");
-	s = reflect.ToString(t); print(s, "\n");
-
-	t = reflect.ParseTypeString("**P.integer");
-	s = reflect.ToString(t); print(s, "\n");
-
-	t = reflect.ParseTypeString("[32]int32");
-	s = reflect.ToString(t); print(s, "\n");
-
-	t = reflect.ParseTypeString("[]int8");
-	s = reflect.ToString(t); print(s, "\n");
-
-	t = reflect.ParseTypeString("map[string]int32");
-	s = reflect.ToString(t); print(s, "\n");
-
-	t = reflect.ParseTypeString("*chan<-string");
-	s = reflect.ToString(t); print(s, "\n");
-
-	t = reflect.ParseTypeString("struct {c *chan *int32; d float32}");
-	s = reflect.ToString(t); print(s, "\n");
-
-	t = reflect.ParseTypeString("*(a int8, b int32)");
-	s = reflect.ToString(t); print(s, "\n");
-
-	t = reflect.ParseTypeString("struct {c *(? *chan *P.integer, ? *int8)}");
-	s = reflect.ToString(t); print(s, "\n");
+	
+	typedump("int8");
+	typedump("int16");
+	typedump("int32");
+	typedump("int64");
+	typedump("uint8");
+	typedump("uint16");
+	typedump("uint32");
+	typedump("uint64");
+	typedump("float32");
+	typedump("float64");
+	typedump("float80");
+	typedump("int8");
+	typedump("**int8");
+	typedump("**P.integer");
+	typedump("[32]int32");
+	typedump("[]int8");
+	typedump("*map[string]int32");
+	typedump("*chan<-string");
+	typedump("struct {c *chan *int32; d float32}");
+	typedump("*(a int8, b int32)");
+	typedump("struct {c *(? *chan *P.integer, ? *int8)}");
+	typedump("struct {a int8; b int32}");
+	typedump("struct {a int8; b int8; b int32}");
+	typedump("struct {a int8; b int8; c int8; b int32}");
+	typedump("struct {a int8; b int8; c int8; d int8; b int32}");
+	typedump("struct {a int8; b int8; c int8; d int8; e int8; b int32}");
+	
+	valuedump("int8");
+	valuedump("int16");
+	valuedump("int32");
+	valuedump("int64");
+	valuedump("uint8");
+	valuedump("uint16");
+	valuedump("uint32");
+	valuedump("uint64");
+	valuedump("string");
 }