diff options
| author | Russ Cox <rsc@golang.org> | 2011-07-27 17:56:13 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2011-07-27 17:56:13 -0400 |
| commit | 1bd4b6371a6ca08dd08a543bda9ffbe5992b52ee (patch) | |
| tree | 00d06e50725e4b7bda246a199d8a6fe4807cf391 | |
| parent | 112267d55e8a6c3733dd55889d26485008cd81d7 (diff) | |
| download | go-1bd4b6371a6ca08dd08a543bda9ffbe5992b52ee.tar.gz go-1bd4b6371a6ca08dd08a543bda9ffbe5992b52ee.zip | |
gc: use more Go-like names for methods
Fixes #991.
R=ken2
CC=golang-dev
https://golang.org/cl/4819049
| -rw-r--r-- | src/cmd/gc/dcl.c | 12 | ||||
| -rw-r--r-- | src/pkg/runtime/debug/stack_test.go | 4 | ||||
| -rw-r--r-- | test/fixedbugs/bug350.go | 15 |
3 files changed, 26 insertions, 5 deletions
diff --git a/src/cmd/gc/dcl.c b/src/cmd/gc/dcl.c index 827cd99d9c..ba1aa83888 100644 --- a/src/cmd/gc/dcl.c +++ b/src/cmd/gc/dcl.c @@ -1079,7 +1079,10 @@ methodsym(Sym *nsym, Type *t0, int iface) if(t0->width < types[tptr]->width) suffix = "·i"; } - p = smprint("%#hT·%s%s", t0, nsym->name, suffix); + if(t0->sym == S && isptr[t0->etype]) + p = smprint("(%#hT).%s%s", t0, nsym->name, suffix); + else + p = smprint("%#hT.%s%s", t0, nsym->name, suffix); s = pkglookup(p, s->pkg); free(p); return s; @@ -1106,14 +1109,17 @@ methodname1(Node *n, Node *t) char *star; char *p; - star = ""; + star = nil; if(t->op == OIND) { star = "*"; t = t->left; } if(t->sym == S || isblank(n)) return newname(n->sym); - p = smprint("%s%S·%S", star, t->sym, n->sym); + if(star) + p = smprint("(%s%S).%S", star, t->sym, n->sym); + else + p = smprint("%S.%S", t->sym, n->sym); n = newname(pkglookup(p, t->sym->pkg)); free(p); return n; diff --git a/src/pkg/runtime/debug/stack_test.go b/src/pkg/runtime/debug/stack_test.go index 4aeea13ffd..94293bb934 100644 --- a/src/pkg/runtime/debug/stack_test.go +++ b/src/pkg/runtime/debug/stack_test.go @@ -23,7 +23,7 @@ func (t T) method() []byte { Don't worry much about the base levels, but check the ones in our own package. /Users/r/go/src/pkg/runtime/debug/stack_test.go:15 (0x13878) - *T.ptrmethod: return Stack() + (*T).ptrmethod: return Stack() /Users/r/go/src/pkg/runtime/debug/stack_test.go:18 (0x138dd) T.method: return t.ptrmethod() /Users/r/go/src/pkg/runtime/debug/stack_test.go:23 (0x13920) @@ -40,7 +40,7 @@ func TestStack(t *testing.T) { t.Fatal("too few lines") } check(t, lines[0], "src/pkg/runtime/debug/stack_test.go") - check(t, lines[1], "\t*T.ptrmethod: return Stack()") + check(t, lines[1], "\t(*T).ptrmethod: return Stack()") check(t, lines[2], "src/pkg/runtime/debug/stack_test.go") check(t, lines[3], "\tT.method: return t.ptrmethod()") check(t, lines[4], "src/pkg/runtime/debug/stack_test.go") diff --git a/test/fixedbugs/bug350.go b/test/fixedbugs/bug350.go new file mode 100644 index 0000000000..aac2949017 --- /dev/null +++ b/test/fixedbugs/bug350.go @@ -0,0 +1,15 @@ +// errchk $G $D/$F.go + +// Copyright 2011 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. + +package main + +type T int + +func (T) m() {} +func (T) m() {} // ERROR "T[.]m redeclared" + +func (*T) p() {} +func (*T) p() {} // ERROR "[(][*]T[)][.]p redeclared" |