diff options
author | Russ Cox <rsc@golang.org> | 2009-06-06 12:46:38 -0700 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2009-06-06 12:46:38 -0700 |
commit | d5f970a012c2d720ead24e02b7cc981fdf913775 (patch) | |
tree | bec5de54d0c1410ad8e3c25c048d03ae38b23704 /src/cmd/gc/obj.c | |
parent | b1f3a84d79ef4841515eeb9187efd277deed3f64 (diff) | |
download | golang-d5f970a012c2d720ead24e02b7cc981fdf913775.tar.gz |
gc: grammar cleanup:
* no longer distinguishes const, var, type, package names.
* all the predefined names are not tokens anymore.
R=ken
OCL=29326
CL=29985
Diffstat (limited to 'src/cmd/gc/obj.c')
-rw-r--r-- | src/cmd/gc/obj.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/cmd/gc/obj.c b/src/cmd/gc/obj.c index e54010672..64d189896 100644 --- a/src/cmd/gc/obj.c +++ b/src/cmd/gc/obj.c @@ -58,7 +58,7 @@ dumpglobls(void) continue; dowidth(n->type); - ggloblnod(s->oname, n->type->width); + ggloblnod(s->def, n->type->width); } } @@ -393,6 +393,7 @@ dumpsignatures(void) Dcl *d, *x; Type *t, *progt, *methodt, *ifacet, *rcvrt; Sym *s; + Node *n; // copy externdcl list to signatlist for(d=externdcl; d!=D; d=d->forw) { @@ -403,9 +404,10 @@ dumpsignatures(void) if(t == T) continue; - s = signame(t); - if(s == S) + n = signame(t); + if(n == N || n->sym == S) continue; + s = n->sym; x = mal(sizeof(*d)); x->op = OTYPE; @@ -425,10 +427,11 @@ dumpsignatures(void) continue; t = d->dtype; et = t->etype; - s = signame(t); + n = signame(t); //print("signame %S for %T\n", s, t); - if(s == S) + if(n == N || n->sym == S) continue; + s = n->sym; // only emit one if(s->siggen) |