Merge pull request #109 from erggo/master

Fixes GcImport move.

Author: axw

exports.go

@@ -8,6 +8,7 @@ import (
 	"bufio"
 	"bytes"
 	"code.google.com/p/go.tools/go/exact"
+	"code.google.com/p/go.tools/go/gcimporter"
 	"code.google.com/p/go.tools/go/types"
 	"fmt"
 	"go/ast"
@@ -88,15 +89,15 @@ func (c *importer) Import(imports map[string]*types.Package, path string) (pkg *
 				}
 			}
 		}
-		pkg, err = types.GcImportData(imports, pkgfile, path, bufio.NewReader(bytes.NewBuffer(data)))
+		pkg, err = gcimporter.ImportData(imports, pkgfile, path, bufio.NewReader(bytes.NewBuffer(data)))
 	}
 	if pkg == nil || err != nil {
 		if data != nil {
 			return nil, fmt.Errorf("Failed to load package %s: %v", path, err)
 		}
 		// Package has not been compiled yet, so fall back to
 		// the standard GcImport.
-		pkg, err = types.GcImport(imports, path)
+		pkg, err = gcimporter.Import(imports, path)
 	}
 
 	c.myimports[path] = pkg