clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-29 22:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

embedded interface types in interfaces.

Browse Source 
R=ken
OCL=25072
CL=25072
This commit is contained in:
Russ Cox 2009-02-16 16:36:18 -08:00
parent 78906c3836
commit b4af09ab56
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/cmd/gc/dcl.c
View File

@ -643,7 +643,7 @@ funclit1(Type *type, Node *body)
Type** Type**
stotype(Node *n, int et, Type **t) stotype(Node *n, int et, Type **t)
{ {
Type *f; Type *f, *t1;
Iter save; Iter save;
String *note; String *note;
int lno; int lno;
@ -666,20 +666,50 @@ loop:
goto next; goto next;
} }
if(n->op != ODCLFIELD || n->type == T) if(n->op != ODCLFIELD)
fatal("stotype: oops %N\n", n); fatal("stotype: oops %N\n", n);
if(n->type == T) {
// assume error already printed
goto next;
}
switch(n->val.ctype) { switch(n->val.ctype) {
case CTSTR: case CTSTR:
if(et != TSTRUCT)
yyerror("interface method cannot have annotation");
note = n->val.u.sval; note = n->val.u.sval;
break; break;
default: default:
yyerror("field annotation must be string"); if(et != TSTRUCT)
yyerror("interface method cannot have annotation");
else
yyerror("field annotation must be string");
case CTxxx: case CTxxx:
note = nil; note = nil;
break; break;
} }
if(et == TINTER && n->left == N) {
// embedded interface - inline the methods
if(n->type->etype != TINTER) {
yyerror("interface contains embedded non-interface %T", t);
goto next;
}
for(t1=n->type->type; t1!=T; t1=t1->down) {
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;
*t = f;
t = &f->down;
}
goto next;
}
f = typ(TFIELD); f = typ(TFIELD);
f->type = n->type; f->type = n->type;
f->note = note; f->note = note;

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

@ -57,7 +57,7 @@
%type <node> exprsym3_list_r exprsym3 %type <node> exprsym3_list_r exprsym3
%type <node> name onew_name new_name new_name_list_r new_field %type <node> name onew_name new_name new_name_list_r new_field
%type <node> vardcl_list_r vardcl Avardcl Bvardcl %type <node> vardcl_list_r vardcl Avardcl Bvardcl
%type <node> interfacedcl_list_r interfacedcl %type <node> interfacedcl_list_r interfacedcl interfacedcl1
%type <node> structdcl_list_r structdcl embed %type <node> structdcl_list_r structdcl embed
%type <node> fnres Afnres Bfnres fnliteral xfndcl fndcl fnbody %type <node> fnres Afnres Bfnres fnliteral xfndcl fndcl fnbody
%type <node> braced_keyexpr_list keyval_list_r keyval %type <node> braced_keyexpr_list keyval_list_r keyval
@ -1385,8 +1385,8 @@ embed:
context = nil; context = nil;
} }
interfacedcl: interfacedcl1:
new_name ',' interfacedcl new_name ',' interfacedcl1
{ {
$$ = nod(ODCLFIELD, $1, N); $$ = nod(ODCLFIELD, $1, N);
$$ = nod(OLIST, $$, $3); $$ = nod(OLIST, $$, $3);
@ -1397,6 +1397,14 @@ interfacedcl:
$$->type = $2; $$->type = $2;
} }
interfacedcl:
interfacedcl1
| latype
{
$$ = nod(ODCLFIELD, N, N);
$$->type = oldtype($1);
}
indcl: indcl:
'(' oarg_type_list ')' fnres '(' oarg_type_list ')' fnres
{ {