code.ivysaur.me/miqt
1
0
Fork 0
mirror of https://github.com/mappu/miqt.git synced 2024-12-22 17:08:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

genbindings/cabi: merge and refactor qlist parameter handling

Browse Source
This commit is contained in:
mappu 2024-09-17 19:43:22 +12:00
parent 398ddf7a51
commit 4ec56ad303
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
cmd/genbindings/emitcabi.go
View File

@ -181,45 +181,29 @@ func emitParametersCABI2CppForwarding(params []CppParameter, indent string) (pre
func emitCABI2CppForwarding(p CppParameter, indent string) (preamble string, forwarding string) { func emitCABI2CppForwarding(p CppParameter, indent string) (preamble string, forwarding string) {
nameprefix := strings.Replace(strings.Replace(p.ParameterName, `[`, `_`, -1), `]`, "", -1)
if p.ParameterType == "QString" { if p.ParameterType == "QString" {
// The CABI has accepted two parameters - need to convert to one real QString // The CABI has accepted two parameters - need to convert to one real QString
// Create it on the stack // Create it on the stack
preamble += indent + "QString " + p.ParameterName + "_QString = QString::fromUtf8(&" + p.ParameterName + "->data, " + p.ParameterName + "->len);\n" preamble += indent + "QString " + nameprefix + "_QString = QString::fromUtf8(&" + p.ParameterName + "->data, " + p.ParameterName + "->len);\n"
return preamble, p.ParameterName + "_QString" return preamble, nameprefix + "_QString"
} else if listType, ok := p.QListOf(); ok { } else if listType, ok := p.QListOf(); ok {
if listType.ParameterType == "QString" { preamble += indent + p.ParameterType + " " + nameprefix + "_QList;\n"
preamble += indent + nameprefix + "_QList.reserve(" + p.ParameterName + "->len);\n"
// miqt_array<miqt_string*> preamble += indent + listType.RenderTypeCabi() + "* " + nameprefix + "_arr = static_cast<" + listType.RenderTypeCabi() + "*>(" + p.ParameterName + "->data);\n"
preamble += indent + "for(size_t i = 0; i < " + p.ParameterName + "->len; ++i) {\n"
// Combo (3 parameters) listType.ParameterName = nameprefix + "_arr[i]"
preamble += indent + p.ParameterType + " " + p.ParameterName + "_QList;\n" addPre, addFwd := emitCABI2CppForwarding(listType, indent+"\t")
preamble += indent + p.ParameterName + "_QList.reserve(" + p.ParameterName + "->len);\n" preamble += addPre
preamble += indent + "miqt_string** " + p.ParameterName + "_arr = static_cast<miqt_string**>(" + p.ParameterName + "->data);\n" preamble += indent + "\t" + nameprefix + "_QList.push_back(" + addFwd + ");\n"
preamble += indent + "for(size_t i = 0; i < " + p.ParameterName + "->len; ++i) {\n"
preamble += indent + "\t" + p.ParameterName + "_QList.push_back(QString::fromUtf8(& " + p.ParameterName + "_arr[i]->data, " + p.ParameterName + "_arr[i]->len));\n"
preamble += indent + "}\n"
return preamble, p.ParameterName + "_QList"
} else { preamble += indent + "}\n"
return preamble, nameprefix + "_QList"
// The CABI has accepted two parameters - need to convert to one real QList<>
// Create it on the stack
preamble += indent + p.ParameterType + " " + p.ParameterName + "_QList;\n"
preamble += indent + p.ParameterName + "_QList.reserve(" + p.ParameterName + "->len);\n"
preamble += indent + listType.RenderTypeCabi() + "* " + p.ParameterName + "_arr = static_cast<" + listType.RenderTypeCabi() + "*>(" + p.ParameterName + "->data);\n"
preamble += indent + "for(size_t i = 0; i < " + p.ParameterName + "->len; ++i) {\n"
if listType.QtClassType() && !listType.Pointer {
preamble += indent + "\t" + p.ParameterName + "_QList.push_back(*(" + p.ParameterName + "_arr[i]));\n"
} else if listType.IsFlagType() {
preamble += indent + "\t" + p.ParameterName + "_QList.push_back(static_cast<" + listType.RenderTypeQtCpp() + ">(" + p.ParameterName + "_arr[i]));\n"
} else {
preamble += indent + "\t" + p.ParameterName + "_QList.push_back(" + p.ParameterName + "_arr[i]);\n"
}
preamble += indent + "}\n"
return preamble, p.ParameterName + "_QList"
}
} else if p.IntType() { } else if p.IntType() {
// Use the raw ParameterType to select an explicit integer overload // Use the raw ParameterType to select an explicit integer overload
@ -265,6 +249,9 @@ func emitCABI2CppForwarding(p CppParameter, indent string) (preamble string, for
} else if p.QtClassType() && !p.Pointer { } else if p.QtClassType() && !p.Pointer {
// CABI takes all Qt types by pointer, even if C++ wants them by value // CABI takes all Qt types by pointer, even if C++ wants them by value
// Dereference the passed-in pointer // Dereference the passed-in pointer
if strings.Contains(p.ParameterName, `[`) {
return preamble, "*(" + p.ParameterName + ")" // Extra brackets aren't necessary, just nice
}
return preamble, "*" + p.ParameterName return preamble, "*" + p.ParameterName
} else { } else {