replaced gcexporter by golang.org/x/tools/go/importer

neelance · neelance · commit d60db54d8197 · 2015-05-18T00:21:41.000+02:00
diff --git a/compiler/compiler.go b/compiler/compiler.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/gopherjs/gopherjs/compiler/prelude"
-	"golang.org/x/tools/go/gcimporter"
+	"golang.org/x/tools/go/importer"
 	"golang.org/x/tools/go/types"
 )
 
@@ -35,7 +35,7 @@ type Archive struct {
 	ImportPath   string
 	Name         string
 	Imports      []string
-	GcData       []byte
+	ExportData   []byte
 	Declarations []*Decl
 	FileSet      []byte
 	Minified     bool
@@ -226,7 +226,7 @@ func ReadArchive(filename, path string, r io.Reader, packages map[string]*types.
 	}
 
 	var err error
-	a.types, err = gcimporter.ImportData(packages, filename, path, bytes.NewReader(a.GcData))
+	_, a.types, err = importer.ImportData(packages, a.ExportData)
 	if err != nil {
 		return nil, err
 	}
diff --git a/compiler/package.go b/compiler/package.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/gopherjs/gopherjs/compiler/analysis"
-	"github.com/gopherjs/gopherjs/gcexporter"
+	"golang.org/x/tools/go/importer"
 	"golang.org/x/tools/go/types"
 	"golang.org/x/tools/go/types/typeutil"
 )
@@ -118,8 +118,7 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
 	}
 	importContext.Packages[importPath] = typesPkg
 
-	gcData := bytes.NewBuffer(nil)
-	gcexporter.Write(typesPkg, gcData, sizes32)
+	exportData := importer.ExportData(typesPkg)
 	encodedFileSet := bytes.NewBuffer(nil)
 	if err := fileSet.Write(json.NewEncoder(encodedFileSet).Encode); err != nil {
 		return nil, err
@@ -464,7 +463,7 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
 		ImportPath:   importPath,
 		Name:         typesPkg.Name(),
 		Imports:      importedPaths,
-		GcData:       gcData.Bytes(),
+		ExportData:   exportData,
 		Declarations: allDecls,
 		FileSet:      encodedFileSet.Bytes(),
 		Minified:     minify,
diff --git a/gcexporter/gcexporter.go b/gcexporter/gcexporter.go
