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

fix renamed-package bug in exported names:

Browse Source 
always show original name

R=ken
OCL=18603
CL=18603
This commit is contained in:
Russ Cox 2008-11-05 15:59:34 -08:00
parent 11a3f759fd
commit 553c98dca4
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -912,14 +912,13 @@ out:
int
Sconv(Fmt *fp)
{
char buf[500];
Sym *s;
char *opk, *pkg, *nam;
s = va_arg(fp->args, Sym*);
if(s == S) {
snprint(buf, sizeof(buf), "<S>");
goto out;
fmtstrcpy(fp, "<S>");
return 0;
}
pkg = "<nil>";
@ -934,18 +933,12 @@ Sconv(Fmt *fp)
nam = s->name;
if(!(fp->flags & FmtShort))
if(strcmp(pkg, package) || strcmp(opk, package) || (fp->flags & FmtLong)) {
if(strcmp(opk, pkg) == 0) {
snprint(buf, sizeof(buf), "%s.%s", pkg, nam);
goto out;
}
snprint(buf, sizeof(buf), "(%s)%s.%s", opk, pkg, nam);
goto out;
if(strcmp(opk, package) || (fp->flags & FmtLong)) {
fmtprint(fp, "%s.%s", opk, nam);
return 0;
}
snprint(buf, sizeof(buf), "%s", nam);
out:
return fmtstrcpy(fp, buf);
fmtstrcpy(fp, nam);
return 0;
}
static char*