qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 17:56:55 -07:00
Code Releases Activity

embedded types

Browse Source 
R=r
OCL=17676
CL=17676
This commit is contained in:
Ken Thompson 2008-10-22 17:25:10 -07:00
parent 5d30161ca7
commit 6fecb76eea
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/gc/go.y
View File

@ -1855,7 +1855,11 @@ hidden_structdcl:
}
| '?' hidden_type
{
$$ = embedded($2->sym);
if(isptr[$2->etype]) {
$$ = embedded($2->type->sym);
$$->type = ptrto($$->type);
} else
$$ = embedded($2->sym);
}
hidden_interfacedcl:

42
src/cmd/gc/walk.c
View File

@ -3224,6 +3224,8 @@ loop:
goto loop;
}
static int prdot = 0;
int
lookdot0(Sym *s, Type *t)
{
@ -3240,11 +3242,21 @@ lookdot0(Sym *s, Type *t)
if(f->sym == s)
c++;
}
//BOTCH need method
u = methtype(t);
if(u != T) {
for(f=u->method; f!=T; f=f->down)
if(f->sym == s)
{
if(prdot)
print("found method %S\n", s);
c++;
}
}
return c;
}
static Node* dotlist;
enum { maxembed = 10 }; // max depth search for embedded types
static Sym* dotlist[maxembed+1]; // maxembed..1
int
adddot1(Sym *s, Type *t, int d)
@ -3268,10 +3280,8 @@ adddot1(Sym *s, Type *t, int d)
if(f->sym == S)
continue;
a = adddot1(s, f->type, d-1);
if(a != 0 && c == 0) {
dotlist = nod(ODOT, dotlist, N);
dotlist->type = f;
}
if(a != 0 && c == 0)
dotlist[d] = f->sym;
c += a;
}
return c;
@ -3296,23 +3306,33 @@ adddot(Node *n)
if(s == S)
return n;
dotlist = N;
for(d=0; d<5; d++) {
for(d=0; d<maxembed; d++) {
c = adddot1(s, t, d);
if(c > 0)
goto out;
}
if(prdot) {
print("missed");
dump("", n);
}
return n;
out:
if(c > 1)
yyerror("ambiguous DOT reference %S", s);
if(prdot)
if(d > 0)
print("add dots:");
// rebuild elided dots
for(l=dotlist; l!=N; l=l->left) {
for(c=d; c>0; c--) {
n = nod(ODOT, n, n->right);
n->left->right = newname(l->type->sym);
n->left->right = newname(dotlist[c]);
if(prdot)
print(" %S", dotlist[c]);
}
if(prdot)
if(d > 0)
print("\n");
return n;
}