- more import/export stuff
- use new export syntax
R=r
OCL=13807
CL=13807
diff --git a/usr/gri/gosrc/parser.go b/usr/gri/gosrc/parser.go
index d7e7fa0..0008562 100644
--- a/usr/gri/gosrc/parser.go
+++ b/usr/gri/gosrc/parser.go
@@ -306,7 +306,7 @@
if obj.pnolev < 0 {
panic "obj.pnolev < 0";
}
- pkg := P.comp.pkgs[obj.pnolev];
+ pkg := P.comp.pkg_list[obj.pnolev];
//if pkg.obj.ident != ident {
// panic "pkg.obj.ident != ident";
//}
@@ -1916,10 +1916,10 @@
P.OpenScope();
P.Expect(Scanner.PACKAGE);
- pkg := Globals.NewPackage(P.S.filename);
- pkg.obj = P.ParseIdentDecl(Object.PACKAGE);
+ obj := P.ParseIdentDecl(Object.PACKAGE);
+ pkg := Globals.NewPackage(P.S.filename, obj);
P.comp.Insert(pkg);
- if P.comp.npkgs != 1 {
+ if P.comp.pkg_ref != 1 {
panic "should have exactly one package now";
}
P.Optional(Scanner.SEMICOLON);
