aboutsummaryrefslogtreecommitdiffstats
path: root/jsre
diff options
context:
space:
mode:
authorzsfelfoldi <zsfelfoldi@gmail.com>2015-05-08 19:29:48 +0800
committerzsfelfoldi <zsfelfoldi@gmail.com>2015-05-08 19:29:48 +0800
commitd7dabce73291d2bb768625c7e465f2f645980dbf (patch)
treee8b18338a66ae05cab4aafe8a063bdc7d0c049ba /jsre
parent1de1359e3b99785ea94f7d75c8aa0dac6b034f24 (diff)
downloadgo-tangerine-d7dabce73291d2bb768625c7e465f2f645980dbf.tar
go-tangerine-d7dabce73291d2bb768625c7e465f2f645980dbf.tar.gz
go-tangerine-d7dabce73291d2bb768625c7e465f2f645980dbf.tar.bz2
go-tangerine-d7dabce73291d2bb768625c7e465f2f645980dbf.tar.lz
go-tangerine-d7dabce73291d2bb768625c7e465f2f645980dbf.tar.xz
go-tangerine-d7dabce73291d2bb768625c7e465f2f645980dbf.tar.zst
go-tangerine-d7dabce73291d2bb768625c7e465f2f645980dbf.zip
ToVal serialization fix
Diffstat (limited to 'jsre')
-rw-r--r--jsre/jsre.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/jsre/jsre.go b/jsre/jsre.go
index 7de41428b..adf2f8121 100644
--- a/jsre/jsre.go
+++ b/jsre/jsre.go
@@ -297,7 +297,7 @@ func (self *JSRE) PrettyPrint(v interface{}) (val otto.Value, err error) {
return method.Call(method, v)
}
-// creates an otto value from a go type
+// creates an otto value from a go type (serialized version)
func (self *JSRE) ToValue(v interface{}) (otto.Value, error) {
done := make(chan bool)
req := &evalReq{
@@ -311,9 +311,10 @@ func (self *JSRE) ToValue(v interface{}) (otto.Value, error) {
return req.res.result, req.res.err
}
+// creates an otto value from a go type (non-serialized version)
func (self *JSRE) ToVal(v interface{}) otto.Value {
- result, err := self.ToValue(v)
+ result, err := self.vm.ToValue(v)
if err != nil {
fmt.Println("Value unknown:", err)
return otto.UndefinedValue()