From 678a14f74c2ed666fb48049a0a2ec4be68cf57a3 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Mon, 19 Oct 2009 19:27:40 -0700
Subject: 6g bug fixes:  * bug211  * embedded interfaces with lowercase methods
  * var _ = f() at top level

R=ken
OCL=35898
CL=35898
---
 src/cmd/gc/dcl.c   | 18 +++++++++++++-----
 src/cmd/gc/sinit.c |  2 ++
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/cmd/gc/dcl.c b/src/cmd/gc/dcl.c
index 1be129f9b..131d68892 100644
--- a/src/cmd/gc/dcl.c
+++ b/src/cmd/gc/dcl.c
@@ -762,15 +762,20 @@ ok:
 Type**
 stotype(NodeList *l, int et, Type **t)
 {
-	Type *f, *t1, **t0;
+	Type *f, *t1, *t2, **t0;
 	Strlit *note;
 	int lno;
 	NodeList *init;
 	Node *n;
+	char *what;
 
 	t0 = t;
 	init = nil;
 	lno = lineno;
+	what = "field";
+	if(et == TINTER)
+		what = "method";
+
 	for(; l; l=l->next) {
 		n = l->n;
 		lineno = n->lineno;
@@ -827,14 +832,17 @@ stotype(NodeList *l, int et, Type **t)
 				continue;
 			}
 			for(t1=n->type->type; t1!=T; t1=t1->down) {
-				// TODO(rsc): Is this really an error?
-				if(strcmp(t1->sym->package, package) != 0)
-					yyerror("embedded interface contains unexported method %S", t1->sym);
 				f = typ(TFIELD);
 				f->type = t1->type;
 				f->width = BADWIDTH;
 				f->nname = newname(t1->sym);
 				f->sym = t1->sym;
+				for(t2=*t0; t2!=T; t2=t2->down) {
+					if(t2->sym == f->sym) {
+						yyerror("duplicate method %s", t2->sym->name);
+						break;
+					}
+				}
 				*t = f;
 				t = &f->down;
 			}
@@ -855,7 +863,7 @@ stotype(NodeList *l, int et, Type **t)
 			if(f->sym && !isblank(f->nname)) {
 				for(t1=*t0; t1!=T; t1=t1->down) {
 					if(t1->sym == f->sym) {
-						yyerror("duplicate field %s", t1->sym->name);
+						yyerror("duplicate %s %s", what, t1->sym->name);
 						break;
 					}
 				}
diff --git a/src/cmd/gc/sinit.c b/src/cmd/gc/sinit.c
index c22a582e1..d25694fb7 100644
--- a/src/cmd/gc/sinit.c
+++ b/src/cmd/gc/sinit.c
@@ -27,6 +27,8 @@ init1(Node *n, NodeList **out)
 	case PFUNC:
 		break;
 	default:
+		if(isblank(n))
+			*out = list(*out, n->defn);
 		return;
 	}
 
-- 
cgit v1.2.3