TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-26 06:31:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

interrogate: Fix some pointless code generation case

Browse Source 
Some cases of eg. inplace ternary operator would needlessly construct and then immediately destruct a tuple
This commit is contained in:
rdb 2024-01-05 14:52:52 +01:00
parent 37c9e58ea0
commit 7926a3a929
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -2192,12 +2192,16 @@ write_module_class(ostream &out, Object *obj) {
string expected_params;
bool always_returns = true;
out << " if (arg2 != nullptr) { // __setitem__\n";
out << " PyObject *args = PyTuple_Pack(2, arg, arg2);\n";
if (!write_function_forset(out, setitem_remaps, 2, 2, expected_params, 4,
true, true, AT_varargs, RF_int | RF_decref_args, false)) {
if (setitem_remaps.empty()) {
always_returns = false;
} else {
out << " PyObject *args = PyTuple_Pack(2, arg, arg2);\n";
if (!write_function_forset(out, setitem_remaps, 2, 2, expected_params, 4,
true, true, AT_varargs, RF_int | RF_decref_args, false)) {
always_returns = false;
}
out << " Py_DECREF(args);\n";
}
out << " Py_DECREF(args);\n";
out << " } else { // __delitem__\n";
if (!write_function_forset(out, delitem_remaps, 1, 1, expected_params, 4,
true, true, AT_single_arg, RF_int, false)) {
@ -2434,12 +2438,16 @@ write_module_class(ostream &out, Object *obj) {
string expected_params;
bool always_returns = true;
out << " if (arg2 != nullptr && arg2 != Py_None) {\n";
out << " PyObject *args = PyTuple_Pack(2, arg, arg2);\n";
if (!write_function_forset(out, two_param_remaps, 2, 2, expected_params, 4,
true, true, AT_varargs, return_flags | RF_decref_args, true)) {
if (two_param_remaps.empty()) {
always_returns = false;
} else {
out << " PyObject *args = PyTuple_Pack(2, arg, arg2);\n";
if (!write_function_forset(out, two_param_remaps, 2, 2, expected_params, 4,
true, true, AT_varargs, return_flags | RF_decref_args, true)) {
always_returns = false;
}
out << " Py_DECREF(args);\n";
}
out << " Py_DECREF(args);\n";
out << " } else {\n";
if (!write_function_forset(out, one_param_remaps, 1, 1, expected_params, 4,
true, true, AT_single_arg, return_flags, true)) {