code.ivysaur.me/miqt
1
0
Fork 0
mirror of https://github.com/mappu/miqt.git synced 2025-03-12 10:30:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

genbindings/go: conditionally disable extra return type indirection

Browse Source
This commit is contained in:
mappu 2025-02-06 17:36:51 +13:00
parent c1bf148a5a
commit f192a6a330
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/genbindings/emitgo.go
View File

@ -173,13 +173,13 @@ func (p CppParameter) RenderTypeGo(gfs *goFileState) string {
return ret // ignore const return ret // ignore const
} }
func (p CppParameter) renderReturnTypeGo(gfs *goFileState) string { func (p CppParameter) renderReturnTypeGo(gfs *goFileState, indirection bool) string {
ret := p.RenderTypeGo(gfs) ret := p.RenderTypeGo(gfs)
if ret == "void" { if ret == "void" {
ret = "" ret = ""
} }
if p.QtClassType() && p.ParameterType != "QString" && p.ParameterType != "QByteArray" && !(p.Pointer || p.ByRef) { if indirection && p.QtClassType() && p.ParameterType != "QString" && p.ParameterType != "QByteArray" && !(p.Pointer || p.ByRef) {
// FIXME normalize this part // FIXME normalize this part
ret = "*" + ret ret = "*" + ret
} }
@ -921,7 +921,7 @@ import "C"
preamble, forwarding := gfs.emitParametersGo2CABIForwarding(m) preamble, forwarding := gfs.emitParametersGo2CABIForwarding(m)
returnTypeDecl := m.ReturnType.renderReturnTypeGo(&gfs) returnTypeDecl := m.ReturnType.renderReturnTypeGo(&gfs, true)
rvalue := `C.` + cabiMethodName(c, m) + `(` + forwarding + `)` rvalue := `C.` + cabiMethodName(c, m) + `(` + forwarding + `)`
@ -997,7 +997,7 @@ import "C"
forwarding = "unsafe.Pointer(this.h)" + strings.TrimPrefix(forwarding, `this.h`) // TODO integrate properly forwarding = "unsafe.Pointer(this.h)" + strings.TrimPrefix(forwarding, `this.h`) // TODO integrate properly
returnTypeDecl := m.ReturnType.renderReturnTypeGo(&gfs) returnTypeDecl := m.ReturnType.renderReturnTypeGo(&gfs, false)
gfs.imports["unsafe"] = struct{}{} gfs.imports["unsafe"] = struct{}{}
@ -1006,7 +1006,7 @@ import "C"
func (this *` + goClassName + `) ` + m.goMethodName() + ` (` + gfs.emitParametersGo(m.Parameters) + `) ` + returnTypeDecl + ` { func (this *` + goClassName + `) ` + m.goMethodName() + ` (` + gfs.emitParametersGo(m.Parameters) + `) ` + returnTypeDecl + ` {
` + preamble + ` ` + preamble + `
var _dynamic_cast_ok C.bool = false var _dynamic_cast_ok C.bool = false
` + gfs.emitCabiToGo("_ret := ", m.ReturnType, `C.`+cabiProtectedBaseName(c, m)+`(&_dynamic_cast_ok, `+forwarding+`)`) + ` ` + gfs.emitCabiToGo("_method_ret := ", m.ReturnType, `C.`+cabiProtectedBaseName(c, m)+`(&_dynamic_cast_ok, `+forwarding+`)`) + `
if !_dynamic_cast_ok { if !_dynamic_cast_ok {
panic("miqt: can only call protected methods for directly constructed types") panic("miqt: can only call protected methods for directly constructed types")
} }
@ -1014,7 +1014,7 @@ import "C"
if !m.ReturnType.Void() { if !m.ReturnType.Void() {
ret.WriteString(` ret.WriteString(`
return _ret return _method_ret
`) `)
} }
@ -1038,7 +1038,7 @@ import "C"
forwarding = "unsafe.Pointer(this.h)" + strings.TrimPrefix(forwarding, `this.h`) // TODO integrate properly forwarding = "unsafe.Pointer(this.h)" + strings.TrimPrefix(forwarding, `this.h`) // TODO integrate properly
returnTypeDecl := m.ReturnType.renderReturnTypeGo(&gfs) returnTypeDecl := m.ReturnType.renderReturnTypeGo(&gfs, true)
ret.WriteString(` ret.WriteString(`
func (this *` + goClassName + `) callVirtualBase_` + m.goMethodName() + `(` + gfs.emitParametersGo(m.Parameters) + `) ` + returnTypeDecl + ` { func (this *` + goClassName + `) callVirtualBase_` + m.goMethodName() + `(` + gfs.emitParametersGo(m.Parameters) + `) ` + returnTypeDecl + ` {
@ -1077,7 +1077,7 @@ import "C"
cabiReturnType = "" cabiReturnType = ""
} }
superCbType := `func(` + gfs.emitParametersGo(m.Parameters) + `) ` + m.ReturnType.renderReturnTypeGo(&gfs) superCbType := `func(` + gfs.emitParametersGo(m.Parameters) + `) ` + m.ReturnType.renderReturnTypeGo(&gfs, true)
goCbType := `func(` goCbType := `func(`
if !m.IsPureVirtual { if !m.IsPureVirtual {
@ -1087,7 +1087,7 @@ import "C"
} }
} }
goCbType += gfs.emitParametersGo(m.Parameters) goCbType += gfs.emitParametersGo(m.Parameters)
goCbType += `) ` + m.ReturnType.renderReturnTypeGo(&gfs) goCbType += `) ` + m.ReturnType.renderReturnTypeGo(&gfs, true)
callbackName := cabiCallbackName(c, m) callbackName := cabiCallbackName(c, m)
ret.WriteString(`func (this *` + goClassName + `) On` + m.goMethodName() + `(slot ` + goCbType + `) { ret.WriteString(`func (this *` + goClassName + `) On` + m.goMethodName() + `(slot ` + goCbType + `) {
ok := C.` + cabiOverrideVirtualName(c, m) + `(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)) ) ok := C.` + cabiOverrideVirtualName(c, m) + `(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)) )