code.ivysaur.me/miqt
1
0
Fork 0
mirror of https://github.com/mappu/miqt.git synced 2025-04-05 05:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

genbindings/connect: only generate connect() stubs for the fully expanded overload

Browse Source
This commit is contained in:
mappu 2024-08-18 18:55:28 +12:00
parent e7d1f05d7f
commit d5eeb64c86
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/genbindings/emitcabi.go
View File

@ -386,7 +386,7 @@ extern "C" {
for _, m := range c.Methods { for _, m := range c.Methods {
ret.WriteString(fmt.Sprintf("%s %s_%s(%s);\n", emitReturnTypeCabi(m.ReturnType), c.ClassName, m.SafeMethodName(), emitParametersCabi(m, c.ClassName+"*"))) ret.WriteString(fmt.Sprintf("%s %s_%s(%s);\n", emitReturnTypeCabi(m.ReturnType), c.ClassName, m.SafeMethodName(), emitParametersCabi(m, c.ClassName+"*")))
if m.IsSignal { if m.IsSignal && !m.HasHiddenParams {
ret.WriteString(fmt.Sprintf("%s %s_connect_%s(void* slot);\n", emitReturnTypeCabi(m.ReturnType), c.ClassName, m.SafeMethodName())) ret.WriteString(fmt.Sprintf("%s %s_connect_%s(void* slot);\n", emitReturnTypeCabi(m.ReturnType), c.ClassName, m.SafeMethodName()))
} }
} }
@ -550,7 +550,7 @@ extern "C" {
afterCall, afterCall,
)) ))
if m.IsSignal { if m.IsSignal && !m.HasHiddenParams {
exactSignal := `static_cast<void (` + c.ClassName + `::*)(` + emitParameterTypesCpp(m) + `)>(&` + c.ClassName + `::` + nativeMethodName + `)` exactSignal := `static_cast<void (` + c.ClassName + `::*)(` + emitParameterTypesCpp(m) + `)>(&` + c.ClassName + `::` + nativeMethodName + `)`
ret.WriteString( ret.WriteString(

2
cmd/genbindings/emitgo.go
View File

@ -376,7 +376,7 @@ import "C"
`) `)
// Add Connect() wrappers for signal functions // Add Connect() wrappers for signal functions
if m.IsSignal { if m.IsSignal && !m.HasHiddenParams {
imports["unsafe"] = struct{}{} imports["unsafe"] = struct{}{}
imports["runtime/cgo"] = struct{}{} imports["runtime/cgo"] = struct{}{}
ret.WriteString(`func (this *` + c.ClassName + `) On` + m.SafeMethodName() + `(slot func()) { ret.WriteString(`func (this *` + c.ClassName + `) On` + m.SafeMethodName() + `(slot func()) {

1
cmd/genbindings/intermediate.go
View File

@ -68,6 +68,7 @@ type CppMethod struct {
Parameters []CppParameter Parameters []CppParameter
IsStatic bool IsStatic bool
IsSignal bool IsSignal bool
HasHiddenParams bool // Set to true if there is an overload with more parameters
} }
func IsArgcArgv(params []CppParameter, pos int) bool { func IsArgcArgv(params []CppParameter, pos int) bool {

2
cmd/genbindings/transformoptional.go
View File

@ -35,6 +35,7 @@ func astTransformOptional(parsed *CppParsedHeader) {
Parameters: nil, Parameters: nil,
IsSignal: m.IsSignal, IsSignal: m.IsSignal,
IsStatic: m.IsStatic, IsStatic: m.IsStatic,
HasHiddenParams: (x != len(m.Parameters)-1),
} }
dupMethod.Parameters = append(dupMethod.Parameters, m.Parameters[0:x+1]...) dupMethod.Parameters = append(dupMethod.Parameters, m.Parameters[0:x+1]...)
c.Methods = append(c.Methods, dupMethod) // TODO can we insert them next, instead of at the end? c.Methods = append(c.Methods, dupMethod) // TODO can we insert them next, instead of at the end?
@ -43,6 +44,7 @@ func astTransformOptional(parsed *CppParsedHeader) {
// Truncate the original method's parameters to only the // Truncate the original method's parameters to only the
// mandatory ones // mandatory ones
m.Parameters = m.Parameters[0:optionalStart] m.Parameters = m.Parameters[0:optionalStart]
m.HasHiddenParams = true
c.Methods[j] = m c.Methods[j] = m
} }