qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-10-03 20:31:22 -06:00
Code Releases Activity

structure field annotation strings

Browse Source 
R=ken
OCL=18176
CL=18176
This commit is contained in:
Russ Cox 2008-10-30 15:13:09 -07:00
parent ebf14c625d
commit f27aaf4819
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -450,10 +450,12 @@ stotype(Node *n, Type **t)
Type *f;
Iter save;
char buf[100];
String *note;
n = listfirst(&save, &n);
loop:
note = nil;
if(n == N) {
*t = T;
return t;
@ -471,8 +473,20 @@ loop:
if(n->type->etype == TARRAY && n->type->bound < 0)
yyerror("type of a structure field cannot be an open array");
switch(n->val.ctype) {
case CTSTR:
note = n->val.u.sval;
break;
default:
yyerror("structure field annotation must be string");
case CTxxx:
note = nil;
break;
}
f = typ(TFIELD);
f->type = n->type;
f->note = note;
if(n->left != N && n->left->op == ONAME) {
f->nname = n->left;

1
src/cmd/gc/go.h
View File

@ -147,6 +147,7 @@ struct Type
// TFIELD
Type* down; // also used in TMAP
String* note; // literal string annotation
// TARRAY
int32 bound; // negative is dynamic array

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

@ -72,6 +72,7 @@
%type <type> non_name_type Anon_fn_type Bnon_fn_type
%type <type> Anon_chan_type Bnon_chan_type
%type <type> indcl fnlitdcl dotdotdot
%type <val> oliteral
%type <val> hidden_constant
%type <node> hidden_dcl hidden_structdcl
@ -1388,10 +1389,11 @@ structdcl:
$$ = nod(ODCLFIELD, $1, N);
$$ = nod(OLIST, $$, $3);
}
| new_name type
| new_name type oliteral
{
$$ = nod(ODCLFIELD, $1, N);
$$->type = $2;
$$->val = $3;
}
| embed
| '*' embed
@ -1761,6 +1763,12 @@ oexport:
$$ = 1;
}
oliteral:
{
$$.ctype = CTxxx;
}
| LLITERAL
/*
* import syntax from header of
* an output package

9
src/cmd/gc/subr.c
View File

@ -1078,9 +1078,12 @@ Tpretty(Fmt *fp, Type *t)
if(t->sym == S || t->embedded) {
if(exporting)
fmtprint(fp, "? ");
return fmtprint(fp, "%T", t->type);
}
return fmtprint(fp, "%hS %T", t->sym, t->type);
fmtprint(fp, "%T", t->type);
} else
fmtprint(fp, "%hS %T", t->sym, t->type);
if(t->note)
fmtprint(fp, " \"%Z\"", t->note);
return 0;
case TFORW:
if(exporting)