From 4731f2f78783d25d2d5bfcd243a725d867ae7ffb Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Tue, 25 Sep 2018 14:24:44 +0200 Subject: [PATCH] testdata: add better tests for struct expanding --- testdata/print.go | 3 +++ testdata/print.txt | 1 + testdata/structexpand.go | 44 +++++++++++++++++++-------------------- testdata/structexpand.txt | 18 ++++++++-------- 4 files changed, 35 insertions(+), 31 deletions(-) diff --git a/testdata/print.go b/testdata/print.go index 39c951af..a8d2ada6 100644 --- a/testdata/print.go +++ b/testdata/print.go @@ -29,6 +29,9 @@ func main() { // print float64 println(3.14) + // print interface + println(interface{}(nil)) + // print map println(map[string]int{"three": 3, "five": 5}) diff --git a/testdata/print.txt b/testdata/print.txt index 4c37c5d2..bc03de89 100644 --- a/testdata/print.txt +++ b/testdata/print.txt @@ -16,5 +16,6 @@ a b c 123456789012 -123456789012 +3.140000e+000 +(0:nil) map[2] true false diff --git a/testdata/structexpand.go b/testdata/structexpand.go index 66cf0a63..77613b2a 100644 --- a/testdata/structexpand.go +++ b/testdata/structexpand.go @@ -52,53 +52,53 @@ type s8 struct { b byte // 1 element } -type s9 struct { +func test0(s s0) { + println("test0") } func test1(s s1) { - println("test1") + println("test1", s.a) } func test2(s s2) { - println("test2") + println("test2", s.a, s.b) } func test3(s s3) { - println("test3") + println("test3", s.a, s.b, s.c) } func test4(s s4) { - println("test4") + println("test4", s.a, s.b, s.c, s.d) } func test5(s s5) { - println("test5") + println("test5", s.a.aa, s.a.ab, s.b) } func test6(s s6) { - println("test6") + println("test6", s.a, len(s.a), s.b) } func test7(s s7) { - println("test7") + println("test7", s.a, s.b) } func test8(s s8) { - println("test8") -} - -func test9(s s9) { - println("test9") + println("test8", len(s.a), cap(s.a), s.a[0], s.a[1], s.b) } func main() { - test1(s1{}) - test2(s2{}) - test3(s3{}) - test4(s4{}) - test5(s5{}) - test6(s6{}) - test7(s7{}) - test8(s8{}) - test9(s9{}) + test0(s0{}) + test1(s1{1}) + test2(s2{1, 2}) + test3(s3{1, 2, 3}) + test4(s4{1, 2, 3, 4}) + test5(s5{a: struct { + aa byte + ab byte + }{1, 2}, b: 3}) + test6(s6{"foo", 5}) + test7(s7{a: nil, b: 8}) + test8(s8{[]byte{12, 13, 14}[:2], 6}) } diff --git a/testdata/structexpand.txt b/testdata/structexpand.txt index d9614671..2cfc411a 100644 --- a/testdata/structexpand.txt +++ b/testdata/structexpand.txt @@ -1,9 +1,9 @@ -test1 -test2 -test3 -test4 -test5 -test6 -test7 -test8 -test9 +test0 +test1 1 +test2 1 2 +test3 1 2 3 +test4 1 2 3 4 +test5 1 2 3 +test6 foo 3 5 +test7 (0:nil) 8 +test8 2 3 12 13 6