Rooba
/
gopy
mirror of https://github.com/go-python/gopy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bind: support for typed constants+vars 

Fixes #43

Change-Id: Ibf21bc4c792fe25e34f85b69a41a1f6d135e87f4
This commit is contained in:
Sebastien Binet 2015-08-12 10:52:32 +02:00
parent c4ad7bd023
commit 1b431ce89d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bind/gengo.go
View File

@ -458,7 +458,7 @@ func (g *goGen) genConst(o Const) {
g.Printf("//export cgo_func_%s_get\n", o.id)
g.Printf("func cgo_func_%[1]s_get() %[2]s {\n", o.id, sym.cgotypename())
g.Indent()
g.Printf("return %s.%s\n", o.pkg.Name(), o.obj.Name())
g.Printf("return %s(%s.%s)\n", sym.cgotypename(), o.pkg.Name(), o.obj.Name())
g.Outdent()
g.Printf("}\n\n")
}
@ -476,11 +476,11 @@ func (g *goGen) genVar(o Var) {
}
g.Printf("return ")
if o.needWrap() {
g.Printf("%s(unsafe.Pointer(&", ret)
}
g.Printf("%s.%s", pkgname, o.Name())
if o.needWrap() {
g.Printf("))")
g.Printf("%s(unsafe.Pointer(&%s.%s))",
ret, pkgname, o.Name(),
)
} else {
g.Printf("%s(%s.%s)", ret, pkgname, o.Name())
}
g.Printf("\n")
g.Outdent()
@ -492,6 +492,8 @@ func (g *goGen) genVar(o Var) {
vset := "v"
if needWrapType(typ) {
vset = fmt.Sprintf("*(*%s)(unsafe.Pointer(v))", o.sym.gofmt())
} else {
vset = fmt.Sprintf("%s(v)", o.sym.gofmt())
}
g.Printf(
"%[1]s.%[2]s = %[3]s\n",