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

genbindings/cabi: refactor and simplify getReferencedTypes

Browse Source
This commit is contained in:
mappu 2024-11-04 20:48:56 +13:00
parent ad29389e9e
commit 69011a5acb
1 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cmd/genbindings/emitcabi.go
View File

@ -428,44 +428,33 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string)
func getReferencedTypes(src *CppParsedHeader) []string { func getReferencedTypes(src *CppParsedHeader) []string {
foundTypes := map[string]struct{}{} foundTypes := map[string]struct{}{}
maybeAddType := func(p CppParameter) {
if p.QtClassType() {
foundTypes[p.ParameterType] = struct{}{}
}
if t, ok := p.QListOf(); ok {
foundTypes["QList"] = struct{}{} // FIXME or QVector?
if t.QtClassType() {
foundTypes[t.ParameterType] = struct{}{}
}
}
}
for _, c := range src.Classes { for _, c := range src.Classes {
foundTypes[c.ClassName] = struct{}{} foundTypes[c.ClassName] = struct{}{}
for _, ctor := range c.Ctors { for _, ctor := range c.Ctors {
for _, p := range ctor.Parameters { for _, p := range ctor.Parameters {
if p.QtClassType() { maybeAddType(p)
foundTypes[p.ParameterType] = struct{}{}
}
if t, ok := p.QListOf(); ok {
foundTypes["QList"] = struct{}{} // FIXME or QVector?
if t.QtClassType() {
foundTypes[t.ParameterType] = struct{}{}
}
}
} }
} }
for _, m := range c.Methods { for _, m := range c.Methods {
for _, p := range m.Parameters { for _, p := range m.Parameters {
if p.QtClassType() { maybeAddType(p)
foundTypes[p.ParameterType] = struct{}{}
}
if t, ok := p.QListOf(); ok {
foundTypes["QList"] = struct{}{} // FIXME or QVector?
if t.QtClassType() {
foundTypes[t.ParameterType] = struct{}{}
}
}
}
if m.ReturnType.QtClassType() {
foundTypes[m.ReturnType.ParameterType] = struct{}{}
}
if t, ok := m.ReturnType.QListOf(); ok {
foundTypes["QList"] = struct{}{} // FIXME or QVector?
if t.QtClassType() {
foundTypes[t.ParameterType] = struct{}{}
}
} }
maybeAddType(m.ReturnType)
} }
} }
@ -477,10 +466,7 @@ func getReferencedTypes(src *CppParsedHeader) []string {
// Convert to sorted list // Convert to sorted list
foundTypesList := make([]string, 0, len(foundTypes)) foundTypesList := make([]string, 0, len(foundTypes))
for ft := range foundTypes { for ft := range foundTypes {
if strings.HasPrefix(ft, "QList<") || strings.HasPrefix(ft, "QVector<") { // TODO properly exclude via the QListOf() check above if !AllowClass(ft) {
continue
}
if strings.HasSuffix(ft, "Private") { // qbrush.h finds QGradientPrivate
continue continue
} }