From 39e156a960494a8c772801bf5d066e85800d3f6a Mon Sep 17 00:00:00 2001 From: Massimiliano Ghilardi Date: Sun, 7 Jun 2020 18:40:54 +0200 Subject: [PATCH] update dependencies to latest gomacro, fixes #208 --- display.go | 2 +- go.mod | 2 +- go.sum | 21 +++++++++++++-------- kernel.go | 7 +++---- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/display.go b/display.go index 21d9f30..1497547 100644 --- a/display.go +++ b/display.go @@ -276,7 +276,7 @@ func (kernel *Kernel) autoRender(mimeType string, arg interface{}, typ xreflect. conv := kernel.ir.Comp.Converter(typ, xtyp) x := arg if conv != nil { - x = basereflect.Interface(conv(reflect.ValueOf(x))) + x = basereflect.ValueInterface(conv(xreflect.ValueOf(x))) if x == nil { continue } diff --git a/go.mod b/go.mod index 91e980f..39149b7 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/gopherdata/gophernotes go 1.11 require ( - github.com/cosmos72/gomacro v0.0.0-20200523102612-cd4d5176e746 + github.com/cosmos72/gomacro v0.0.0-20200607151955-647446f8352c github.com/go-zeromq/zmq4 v0.9.0 github.com/gofrs/uuid v3.3.0+incompatible golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 diff --git a/go.sum b/go.sum index ef23189..87720f6 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/cosmos72/gomacro v0.0.0-20200523102612-cd4d5176e746 h1:nbfqXxRjX2b6CDv9BeMSpQgePmlQ2WZ1/NxUHyceeLs= -github.com/cosmos72/gomacro v0.0.0-20200523102612-cd4d5176e746/go.mod h1:Osdpin0EoLKzHqueN0M7mrcai0vkT6+WfVM4L1mK46M= +github.com/cosmos72/gomacro v0.0.0-20200607151955-647446f8352c h1:UsTg+MXJsKRHthJ45MyVELUDW6y4NO9ZSEfdb3en1dQ= +github.com/cosmos72/gomacro v0.0.0-20200607151955-647446f8352c/go.mod h1:85N5Kegk4D0TXob/uG3Is9RHvZ66IV6wm92vqu5BrOg= 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.9.0 h1:aFkxnxJvYhXCrE7UhoRR6oP6wqanjkuO2nA0nMsnm0g= @@ -7,23 +7,28 @@ github.com/go-zeromq/zmq4 v0.9.0/go.mod h1:hCJ0OxYnL3Y3erSLQ025VLGi/W63zJjvr9i17 github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0= -github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/peterh/liner v1.2.0 h1:w/UPXyl5GfahFxcTOz2j9wCIHNI+pUPr2laqpojKNCg= github.com/peterh/liner v1.2.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee h1:WG0RUwxtNT4qqaXX3DPA8zHFNm/D9xaBpxzHt1WcA/E= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20200226171234-020676185e75 h1:95pMZrmH6IfFXj0QqqZEpHTQrda/ABLE2nOzgHlJ3GA= -golang.org/x/tools v0.0.0-20200226171234-020676185e75/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375 h1:SjQ2+AKWgZLc1xej6WSzL+Dfs5Uyd5xcZH1mGC411IA= +golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= diff --git a/kernel.go b/kernel.go index 602e9fc..2deff5d 100644 --- a/kernel.go +++ b/kernel.go @@ -11,7 +11,6 @@ import ( "log" "os" "os/exec" - "reflect" "runtime" "strings" "sync" @@ -422,10 +421,10 @@ func (kernel *Kernel) handleExecuteRequest(receipt msgReceipt) error { // inject the actual "Display" closure that displays multimedia data in Jupyter ir := kernel.ir displayPlace := ir.ValueOf("Display") - displayPlace.Set(reflect.ValueOf(receipt.PublishDisplayData)) + displayPlace.Set(xreflect.ValueOf(receipt.PublishDisplayData)) defer func() { // remove the closure before returning - displayPlace.Set(reflect.ValueOf(stubDisplay)) + displayPlace.Set(xreflect.ValueOf(stubDisplay)) }() // eval @@ -534,7 +533,7 @@ func doEval(ir *interp.Interp, outerr OutErr, code string) (val []interface{}, t nonNilCount := 0 values := make([]interface{}, len(results)) for i, result := range results { - val := basereflect.Interface(result) + val := basereflect.ValueInterface(result) if val != nil { nonNilCount++ }