update to latest zmq4 and latest gomacro: adds ability to import local packages

given a relative or absolute filesystem path

Author: cosmos72

go.mod

@@ -3,7 +3,7 @@ module github.com/gopherdata/gophernotes
 go 1.13
 
 require (
-	github.com/cosmos72/gomacro v0.0.0-20220109145729-f19a149b3738
-	github.com/go-zeromq/zmq4 v0.13.0
+	github.com/cosmos72/gomacro v0.0.0-20220530072503-c719ab5c40fc
+	github.com/go-zeromq/zmq4 v0.14.1
 	github.com/gofrs/uuid v4.2.0+incompatible
 )

go.sum

@@ -1,9 +1,9 @@
-github.com/cosmos72/gomacro v0.0.0-20220109145729-f19a149b3738 h1:ytvTPy+n9k+0Txa1pkgfW9ACxuDnJslOECC83O1gC9Y=
-github.com/cosmos72/gomacro v0.0.0-20220109145729-f19a149b3738/go.mod h1:60O8/t169OwS8bX0BeWSjxlGGb/I5cGYc6Brt5rWDL0=
+github.com/cosmos72/gomacro v0.0.0-20220530072503-c719ab5c40fc h1:JTky1C2BMhJ+Rwf8IFFQNwrOQntLrQhp2QImELC2jLo=
+github.com/cosmos72/gomacro v0.0.0-20220530072503-c719ab5c40fc/go.mod h1:60O8/t169OwS8bX0BeWSjxlGGb/I5cGYc6Brt5rWDL0=
 github.com/go-zeromq/goczmq/v4 v4.2.2 h1:HAJN+i+3NW55ijMJJhk7oWxHKXgAuSBkoFfvr8bYj4U=
 github.com/go-zeromq/goczmq/v4 v4.2.2/go.mod h1:Sm/lxrfxP/Oxqs0tnHD6WAhwkWrx+S+1MRrKzcxoaYE=
-github.com/go-zeromq/zmq4 v0.13.0 h1:XUWXLyeRsPsv4KlKMXnv/cEm//Vew2RLuNmDFQnZQXU=
-github.com/go-zeromq/zmq4 v0.13.0/go.mod h1:TrFwdPHMSLG7Rhp8OVhQBkb4bSajfucWv8rwoEFIgSY=
+github.com/go-zeromq/zmq4 v0.14.1 h1:DlHlNzzOeB8mvC5YkoAraiCToA7MfDK5j+iQhVp/uo0=
+github.com/go-zeromq/zmq4 v0.14.1/go.mod h1:mfhCJhT9+zDabvUOd3/gvV08Nqny6pmUabKi224/2Ps=
 github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0=
 github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=

kernel.go

@@ -135,10 +135,7 @@ func runKernel(connectionFile string) {
 
 	// Inject the "display" package to render HTML, JSON, PNG, JPEG, SVG... from interpreted code
 	// maybe a dot-import is easier to use?
-	display, err := ir.Comp.ImportPackageOrError("display", "display")
-	if err != nil {
-		log.Print(err)
-	}
+	display := importPackage(ir, "display", "display")
 
 	// Inject the stub "Display" function. declare a variable
 	// instead of a function, because we want to later change
@@ -245,6 +242,17 @@ func runKernel(connectionFile string) {
 	}
 }
 
+func importPackage(ir *interp.Interp, path string, alias string) *interp.Import {
+	packages, err := ir.ImportPackagesOrError(
+		map[string]interp.PackageName{
+			path: interp.PackageName(alias),
+		})
+	if err != nil {
+		log.Print(err)
+	}
+	return packages[path]
+}
+
 // prepareSockets sets up the ZMQ sockets through which the kernel
 // will communicate.
 func prepareSockets(connInfo ConnectionInfo) (SocketGroup, error) {