struct annotations in imports.

distribute tag across multiple names.

R=ken
OCL=18178
CL=18178

diff --git a/src/cmd/gc/go.y b/src/cmd/gc/go.y
index c49c47f21e7145ff3124b8b6aadc81501dc4710e..cc5a101524f26045c9f59c1c62bf43ee5bef1b7e 100644 (file)
--- a/src/cmd/gc/go.y
+++ b/src/cmd/gc/go.y
@@ -1892,10 +1892,11 @@ hidden_dcl:
        }
 
 hidden_structdcl:
-       sym1 hidden_type
+       sym1 hidden_type oliteral
        {
                $$ = nod(ODCLFIELD, newname($1), N);
                $$->type = $2;
+               $$->val = $3;
        }
 |      '?' hidden_type
        {

diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index d774a8d8349382cf6834ec63ec6a70d79d626d0b..24e894d897dc3d557fd79d4387d9b2880fcf1a65 100644 (file)
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -2192,8 +2192,10 @@ cleanidlist(Node *na)
        if(last->type == T)
                fatal("cleanidlist: no type");
 
-       for(n=na; n->op == OLIST; n=n->right)
+       for(n=na; n->op == OLIST; n=n->right) {
                n->left->type = last->type;
+               n->left->val = last->val;
+       }
        return na;
 }