code.ivysaur.me
/
miqt
mirror of https://github.com/mappu/miqt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

genbindings/typedefs: centralize exceptions

This commit is contained in:
mappu 2024-09-19 19:39:05 +12:00
parent 841605a279
commit 286cfa90c9
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/genbindings/exceptions.go
View File

@ -5,6 +5,30 @@ import (
"strings" "strings"
) )
func InsertTypedefs() {
// Seed well-known typedefs
// QString is deleted from this binding
KnownTypedefs["QStringList"] = CppTypedef{"QStringList", parseSingleTypeString("QList<QString>")}
// FIXME this isn't picked up automatically because QFile inherits QFileDevice and the name refers to its parent class
KnownTypedefs["QFile::FileTime"] = CppTypedef{"QFile::FileTime", parseSingleTypeString("QFileDevice::FileTime")}
// n.b. Qt 5 only
KnownTypedefs["QLineF::IntersectionType"] = CppTypedef{"QLineF::IntersectionType", parseSingleTypeString("QLineF::IntersectType")}
// Not sure the reason for this one
KnownTypedefs["QSocketDescriptor::DescriptorType"] = CppTypedef{"QSocketDescriptor::DescriptorType", parseSingleTypeString("QSocketNotifier::Type")}
// QFlags<> typedef
KnownTypedefs["QTouchEvent::TouchPoint::InfoFlags"] = CppTypedef{"QTouchEvent::TouchPoint::InfoFlags", parseSingleTypeString("QFlags<QTouchEvent::TouchPoint::InfoFlag>")}
// QFile doesn't see QFileDevice parent class enum
KnownTypedefs["QFile::Permissions"] = CppTypedef{"QFile::Permissions", parseSingleTypeString("QFileDevice::Permissions")}
KnownTypedefs["QFileDevice::Permissions"] = CppTypedef{"QFile::Permissions", parseSingleTypeString("QFlags<QFileDevice::Permission>")}
}
func AllowHeader(fullpath string) bool { func AllowHeader(fullpath string) bool {
fname := filepath.Base(fullpath) fname := filepath.Base(fullpath)

19
cmd/genbindings/intermediate.go
View File

@ -15,25 +15,6 @@ func init() {
KnownClassnames = make(map[string]struct{}) KnownClassnames = make(map[string]struct{})
KnownTypedefs = make(map[string]CppTypedef) KnownTypedefs = make(map[string]CppTypedef)
KnownEnums = make(map[string]CppEnum) KnownEnums = make(map[string]CppEnum)
// Seed well-known typedefs
KnownTypedefs["QRgb"] = CppTypedef{"QRgb", parseSingleTypeString("unsigned int")}
KnownTypedefs["WId"] = CppTypedef{"WId", parseSingleTypeString("uintptr_t")}
// QString is deleted from this binding
KnownTypedefs["QStringList"] = CppTypedef{"QStringList", parseSingleTypeString("QList<QString>")}
// Not sure why this isn't picked up automatically
// FIXME because QFile inherits QFileDevice(!!) and the name refers to its parent class
KnownTypedefs["QFile::FileTime"] = CppTypedef{"QFile::FileTime", parseSingleTypeString("QFileDevice::FileTime")}
// n.b. Qt 5 only
KnownTypedefs["QLineF::IntersectionType"] = CppTypedef{"QLineF::IntersectionType", parseSingleTypeString("QLineF::IntersectType")}
// Not sure the reason for this one
KnownTypedefs["QSocketDescriptor::DescriptorType"] = CppTypedef{"QSocketDescriptor::DescriptorType", parseSingleTypeString("QSocketNotifier::Type")}
} }
type CppParameter struct { type CppParameter struct {

2
cmd/genbindings/main.go
View File

@ -88,6 +88,8 @@ func main() {
preserve: make(map[string]*CppEnum), preserve: make(map[string]*CppEnum),
} }
InsertTypedefs()
for _, inputHeader := range includeFiles { for _, inputHeader := range includeFiles {
// If we have a cached clang AST, use that instead // If we have a cached clang AST, use that instead

3
cmd/genbindings/transformtypedefs_test.go
View File

@ -52,6 +52,9 @@ func TestTransformTypedefs(t *testing.T) {
} }
} }
InsertTypedefs()
KnownTypedefs["WId"] = CppTypedef{"WId", parseSingleTypeString("uintptr_t")}
runTest("WId", "uintptr_t") runTest("WId", "uintptr_t")
runTest("QList<WId>", "QList<uintptr_t>") runTest("QList<WId>", "QList<uintptr_t>")
runTest("QStringList", "QList<QString>") runTest("QStringList", "QList<QString>")