mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

include local types in typestrings 

R=r
DELTA=16  (14 added, 1 deleted, 1 changed)
OCL=17584
CL=17584
This commit is contained in:
Russ Cox 2008-10-21 15:57:38 -07:00
parent 44b0ecc5ca
commit 2c3ddf5ef6
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cmd/6l/go.c
View File

@ -90,16 +90,17 @@ ldpkg(Biobuf *f, int64 len, char *filename)
fprint(2, "6l: short pkg read %s\n", filename);
return;
}
// first $$ marks beginning of exports
p0 = strstr(data, "$$");
if(p0 == nil)
return;
p0 += 2;
while(*p0 != '\n' && *p0 != '\0')
p0++;
p1 = strstr(p0, "$$");
if(p1 == nil) {
fprint(2, "6l: cannot find end of imports in %s\n", filename);
fprint(2, "6l: cannot find end of exports in %s\n", filename);
return;
}
while(*p0 == ' ' || *p0 == '\t' || *p0 == '\n')
@ -115,6 +116,18 @@ ldpkg(Biobuf *f, int64 len, char *filename)
p0++;
loadpkgdata(filename, p0, p1 - p0);
// local types begin where exports end.
p0 = p1;
while(*p0 != '\n' && *p0 != '\0')
p0++;
p1 = strstr(p0, "$$");
if(p1 == nil) {
fprint(2, "6l: cannot find end of local types in %s\n", filename);
return;
}
loadpkgdata(filename, p0, p1 - p0);
}
static void