summaryrefslogtreecommitdiff
path: root/test/interface
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2009-10-19 19:27:40 -0700
committerRuss Cox <rsc@golang.org>2009-10-19 19:27:40 -0700
commit151b73626d1857f2c25b52bef0b4675c67848bad (patch)
treef2800343eb6c3fb03f604c88db3e150d81e65219 /test/interface
parent8bc185a7a1c22814387bc73540d70e000835d2f8 (diff)
downloadgo-151b73626d1857f2c25b52bef0b4675c67848bad.tar.gz
6g bug fixes:
* bug211 * embedded interfaces with lowercase methods * var _ = f() at top level R=ken OCL=35898 CL=35898
Diffstat (limited to 'test/interface')
-rw-r--r--test/interface/embed.go42
-rw-r--r--test/interface/embed1.go45
2 files changed, 66 insertions, 21 deletions
diff --git a/test/interface/embed.go b/test/interface/embed.go
index d216b890d..936ea49b7 100644
--- a/test/interface/embed.go
+++ b/test/interface/embed.go
@@ -34,7 +34,7 @@ var pi = &i
var ok = true
-func check(v int64, s string) {
+func check(s string, v int64) {
if v != Value {
println(s, v);
ok = false;
@@ -42,38 +42,38 @@ func check(v int64, s string) {
}
func main() {
- check(t.M(), "t.M");
- check(pt.M(), "pt.M");
- check(ti.M(), "ti.M");
- check(pti.M(), "pti.M");
- check(s.M(), "s.M");
- check(ps.M(), "ps.M");
- check(sp.M(), "sp.M");
- check(psp.M(), "psp.M");
+ check("t.M()", t.M());
+ check("pt.M()", pt.M());
+ check("ti.M()", ti.M());
+ check("pti.M()", pti.M());
+ check("s.M()", s.M());
+ check("ps.M()", ps.M());
+ check("sp.M()", sp.M());
+ check("psp.M()", psp.M());
i = t;
- check(i.M(), "i.M - i = t");
- check(pi.M(), "pi.M - i = t");
+ check("i = t; i.M()", i.M());
+ check("i = t; pi.M()", pi.M());
i = pt;
- check(i.M(), "i.M - i = pt");
- check(pi.M(), "pi.M - i = pt");
+ check("i = pt; i.M()", i.M());
+ check("i = pt; pi.M()", pi.M());
i = s;
- check(i.M(), "i.M - i = s");
- check(pi.M(), "pi.M - i = s");
+ check("i = s; i.M()", i.M());
+ check("i = s; pi.M()", pi.M());
i = ps;
- check(i.M(), "i.M - i = ps");
- check(pi.M(), "pi.M - i = ps");
+ check("i = ps; i.M()", i.M());
+ check("i = ps; pi.M()", pi.M());
i = sp;
- check(i.M(), "i.M - i = sp");
- check(pi.M(), "pi.M - i = sp");
+ check("i = sp; i.M()", i.M());
+ check("i = sp; pi.M()", pi.M());
i = psp;
- check(i.M(), "i.M - i = psp");
- check(pi.M(), "pi.M - i = psp");
+ check("i = psp; i.M()", i.M());
+ check("i = psp; pi.M()", pi.M());
if !ok {
println("BUG: interface10");
diff --git a/test/interface/embed1.go b/test/interface/embed1.go
new file mode 100644
index 000000000..b3fe06f47
--- /dev/null
+++ b/test/interface/embed1.go
@@ -0,0 +1,45 @@
+// $G $D/embed0.go && $G $D/$F.go && $L embed0.$A $F.$A && ./$A.out
+
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Check that embedded interface types can have local methods.
+
+package main
+
+import "./embed0"
+
+type T int
+func (t T) m() {}
+
+type I interface { m() }
+type J interface { I; }
+
+type PI interface { p.I; }
+type PJ interface { p.J; }
+
+func main() {
+ var i I;
+ var j J;
+ var t T;
+ i = t;
+ j = t;
+ _ = i;
+ _ = j;
+ i = j;
+ _ = i;
+ j = i;
+ _ = j;
+ var pi PI;
+ var pj PJ;
+ var pt p.T;
+ pi = pt;
+ pj = pt;
+ _ = pi;
+ _ = pj;
+ pi = pj;
+ _ = pi;
+ pj = pi;
+ _ = pj;
+}