1
0
mirror of https://github.com/golang/go synced 2024-11-22 21:40:03 -07:00

the any fix was too aggressive; allow any in any import.

R=ken
OCL=30768
CL=30768
This commit is contained in:
Russ Cox 2009-06-25 16:57:56 -07:00
parent fa6df47986
commit 1ea28570ec

View File

@ -272,6 +272,9 @@ importfile(Val *f)
return; return;
} }
if(!debug['A'])
anysym->def = typenod(types[TANY]);
if(!findpkg(f->u.sval)) if(!findpkg(f->u.sval))
fatal("can't find import: %Z", f->u.sval); fatal("can't find import: %Z", f->u.sval);
imp = Bopen(namebuf, OREAD); imp = Bopen(namebuf, OREAD);
@ -343,12 +346,12 @@ unimportfile(void)
void void
cannedimports(char *file, char *cp) cannedimports(char *file, char *cp)
{ {
lineno++; // if sys.6 is included on line 1,
linehist(file, 0, 0); // the debugger gets confused
if(!debug['A']) if(!debug['A'])
anysym->def = typenod(types[TANY]); anysym->def = typenod(types[TANY]);
lineno++; // if sys.6 is included on line 1,
linehist(file, 0, 0); // the debugger gets confused
pushedio = curio; pushedio = curio;
curio.bin = nil; curio.bin = nil;
curio.peekc = 0; curio.peekc = 0;