Fix import source symbol package

_test/baz-bat/baz-bat.go

@@ -0,0 +1,3 @@
+package baz
+
+var Name = "baz-bat"

_test/import9.go

@@ -0,0 +1,10 @@
+package main
+
+import "github.com/containous/yaegi/_test/baz-bat"
+
+func main() {
+	println(baz.Name)
+}
+
+// Output:
+// baz-bat

interp/gta.go

@@ -153,9 +153,9 @@ func (interp *Interpreter) gta(root *node, rpath, pkgID string) ([]*node, error)
 				name = n.child[0].ident
 			} else {
 				ipath = n.child[0].rval.String()
-				name = identifier.FindString(ipath)
 			}
 			// Try to import a binary package first, or a source package
+			var pkgName string
 			if interp.binPkg[ipath] != nil {
 				switch name {
 				case "_": // no import of symbols
@@ -168,9 +168,13 @@ func (interp *Interpreter) gta(root *node, rpath, pkgID string) ([]*node, error)
 						sc.sym[n] = &symbol{kind: binSym, typ: &itype{cat: valueT, rtype: typ, scope: sc}, rval: v}
 					}
 				default: // import symbols in package namespace
+					if name == "" {
+						name = identifier.FindString(ipath)
+					}
+
 					sc.sym[name] = &symbol{kind: pkgSym, typ: &itype{cat: binPkgT, path: ipath, scope: sc}}
 				}
-			} else if err = interp.importSrc(rpath, ipath); err == nil {
+			} else if pkgName, err = interp.importSrc(rpath, ipath); err == nil {
 				sc.types = interp.universe.types
 				switch name {
 				case "_": // no import of symbols
@@ -181,6 +185,10 @@ func (interp *Interpreter) gta(root *node, rpath, pkgID string) ([]*node, error)
 						}
 					}
 				default: // import symbols in package namespace
+					if name == "" {
+						name = pkgName
+					}
+
 					sc.sym[name] = &symbol{kind: pkgSym, typ: &itype{cat: srcPkgT, path: ipath, scope: sc}}
 				}
 			} else {

interp/src.go

@@ -8,12 +8,12 @@ import (
 	"strings"
 )
 
-func (interp *Interpreter) importSrc(rPath, path string) error {
+func (interp *Interpreter) importSrc(rPath, path string) (string, error) {
 	var dir string
 	var err error
 
 	if interp.srcPkg[path] != nil {
-		return nil
+		return "", nil
 	}
 
 	// For relative import paths in the form "./xxx" or "../xxx", the initial
@@ -27,17 +27,17 @@ func (interp *Interpreter) importSrc(rPath, path string) error {
 		}
 		dir = filepath.Join(filepath.Dir(interp.Name), rPath, path)
 	} else if dir, rPath, err = pkgDir(interp.context.GOPATH, rPath, path); err != nil {
-		return err
+		return "", err
 	}
 
 	if interp.rdir[path] {
-		return fmt.Errorf("import cycle not allowed\n\timports %s", path)
+		return "", fmt.Errorf("import cycle not allowed\n\timports %s", path)
 	}
 	interp.rdir[path] = true
 
 	files, err := ioutil.ReadDir(dir)
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	var initNodes []*node
@@ -57,12 +57,12 @@ func (interp *Interpreter) importSrc(rPath, path string) error {
 		name = filepath.Join(dir, name)
 		var buf []byte
 		if buf, err = ioutil.ReadFile(name); err != nil {
-			return err
+			return "", err
 		}
 
 		var pname string
 		if pname, root, err = interp.ast(string(buf), name); err != nil {
-			return err
+			return "", err
 		}
 		if root == nil {
 			continue
@@ -78,7 +78,7 @@ func (interp *Interpreter) importSrc(rPath, path string) error {
 		if pkgName == "" {
 			pkgName = pname
 		} else if pkgName != pname {
-			return fmt.Errorf("found packages %s and %s in %s", pkgName, pname, dir)
+			return "", fmt.Errorf("found packages %s and %s in %s", pkgName, pname, dir)
 		}
 		rootNodes = append(rootNodes, root)
 
@@ -86,7 +86,7 @@ func (interp *Interpreter) importSrc(rPath, path string) error {
 		var list []*node
 		list, err = interp.gta(root, subRPath, path)
 		if err != nil {
-			return err
+			return "", err
 		}
 		revisit[subRPath] = append(revisit[subRPath], list...)
 	}
@@ -94,7 +94,7 @@ func (interp *Interpreter) importSrc(rPath, path string) error {
 	// Revisit incomplete nodes where GTA could not complete.
 	for pkg, nodes := range revisit {
 		if err = interp.gtaRetry(nodes, pkg, path); err != nil {
-			return err
+			return "", err
 		}
 	}
 
@@ -102,7 +102,7 @@ func (interp *Interpreter) importSrc(rPath, path string) error {
 	for _, root := range rootNodes {
 		var nodes []*node
 		if nodes, err = interp.cfg(root, path); err != nil {
-			return err
+			return "", err
 		}
 		initNodes = append(initNodes, nodes...)
 	}
@@ -120,7 +120,7 @@ func (interp *Interpreter) importSrc(rPath, path string) error {
 	// Once all package sources have been parsed, execute entry points then init functions
 	for _, n := range rootNodes {
 		if err = genRun(n); err != nil {
-			return err
+			return "", err
 		}
 		interp.run(n, nil)
 	}
@@ -134,7 +134,7 @@ func (interp *Interpreter) importSrc(rPath, path string) error {
 		interp.run(n, interp.frame)
 	}
 
-	return nil
+	return pkgName, nil
 }
 
 // pkgDir returns the absolute path in filesystem for a package given its name and