removed Archive.types field

neelance · neelance · commit 95054d85ac61 · 2016-02-25T00:13:44.000+01:00
diff --git a/compiler/compiler.go b/compiler/compiler.go
@@ -40,8 +40,6 @@ type Archive struct {
 	IncJSCode    []byte
 	FileSet      []byte
 	Minified     bool
-
-	types *types.Package
 }
 
 type Decl struct {
@@ -241,11 +239,10 @@ func ReadArchive(filename, path string, r io.Reader, packages map[string]*types.
 	}
 
 	var err error
-	_, a.types, err = importer.ImportData(packages, a.ExportData)
+	_, packages[path], err = importer.ImportData(packages, a.ExportData)
 	if err != nil {
 		return nil, err
 	}
-	packages[path] = a.types
 
 	return &a, nil
 }
diff --git a/compiler/package.go b/compiler/package.go
@@ -114,7 +114,7 @@ func (pi packageImporter) Import(path string) (*types.Package, error) {
 		return nil, err
 	}
 
-	return a.types, nil
+	return pi.importContext.Packages[a.ImportPath], nil
 }
 
 func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, importContext *ImportContext, minify bool) (*Archive, error) {
@@ -530,7 +530,6 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
 		Declarations: allDecls,
 		FileSet:      encodedFileSet.Bytes(),
 		Minified:     minify,
-		types:        typesPkg,
 	}, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ type Archive struct {`
`40`	`40`	`IncJSCode []byte`
`41`	`41`	`FileSet []byte`
`42`	`42`	`Minified bool`
`43`		`-`
`44`		`- types *types.Package`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`type Decl struct {`
`@@ -241,11 +239,10 @@ func ReadArchive(filename, path string, r io.Reader, packages map[string]*types.`
`241`	`239`	`}`
`242`	`240`
`243`	`241`	`var err error`
`244`		`- _, a.types, err = importer.ImportData(packages, a.ExportData)`
	`242`	`+ _, packages[path], err = importer.ImportData(packages, a.ExportData)`
`245`	`243`	`if err != nil {`
`246`	`244`	`return nil, err`
`247`	`245`	`}`
`248`		`- packages[path] = a.types`
`249`	`246`
`250`	`247`	`return &a, nil`
`251`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func (pi packageImporter) Import(path string) (*types.Package, error) {`
`114`	`114`	`return nil, err`
`115`	`115`	`}`
`116`	`116`
`117`		`- return a.types, nil`
	`117`	`+ return pi.importContext.Packages[a.ImportPath], nil`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`func Compile(importPath string, files []ast.File, fileSet token.FileSet, importContext ImportContext, minify bool) (Archive, error) {`
`@@ -530,7 +530,6 @@ func Compile(importPath string, files []ast.File, fileSet token.FileSet, impor`
`530`	`530`	`Declarations: allDecls,`
`531`	`531`	`FileSet: encodedFileSet.Bytes(),`
`532`	`532`	`Minified: minify,`
`533`		`- types: typesPkg,`
`534`	`533`	`}, nil`
`535`	`534`	`}`
`536`	`535`