RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

interrogate: Wrap anonymous parameter names as positional-only args

This commit is contained in:
rdb 2021-03-01 15:07:40 +01:00
parent 402c303dba
commit 179f316b36
2 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4662,7 +4662,8 @@ write_function_instance(ostream &out, FunctionRemap *remap,
bool check_exceptions,
const string &first_pexpr) {
string format_specifiers;
string keyword_list;
string keyword_list_old;
string keyword_list_new;
string parameter_list;
string container;
string type_check;
@ -4820,14 +4821,20 @@ write_function_instance(ostream &out, FunctionRemap *remap,
}
string reported_name = remap->_parameters[pn]._name;
if (!keyword_list.empty()) {
keyword_list += ", \"" + reported_name + "\"";
} else {
keyword_list = "\"" + reported_name + "\"";
if (!keyword_list_old.empty()) {
keyword_list_old += ", ";
keyword_list_new += ", ";
}
if (remap->_parameters[pn]._has_name) {
has_keywords = true;
}
keyword_list_old += "\"" + reported_name + "\"";
if (has_keywords) {
keyword_list_new += "\"" + reported_name + "\"";
} else {
// Positional-only argument.
keyword_list_new += "\"\"";
}
if (param->new_type_is_atomic_string()) {
@ -5882,16 +5889,26 @@ write_function_instance(ostream &out, FunctionRemap *remap,
// case we have implemented ourselves.
if (min_num_args == 1) {
indent(out, indent_level)
<< "if (Dtool_ExtractArg(&" << param_name << ", args, kwds, " << keyword_list << ")) {\n";
<< "if (Dtool_ExtractArg(&" << param_name << ", args, kwds, " << keyword_list_new << ")) {\n";
} else {
indent(out, indent_level)
<< "if (Dtool_ExtractOptionalArg(&" << param_name << ", args, kwds, " << keyword_list << ")) {\n";
<< "if (Dtool_ExtractOptionalArg(&" << param_name << ", args, kwds, " << keyword_list_new << ")) {\n";
}
} else {
// We have to use the more expensive PyArg_ParseTupleAndKeywords.
clear_error = true;
indent(out, indent_level)
<< "static const char *keyword_list[] = {" << keyword_list << ", nullptr};\n";
if (keyword_list_new != keyword_list_old) {
out << "#if PY_VERSION_HEX >= 0x03060000\n";
indent(out, indent_level)
<< "static const char *keyword_list[] = {" << keyword_list_new << ", nullptr};\n";
out << "#else\n";
indent(out, indent_level)
<< "static const char *keyword_list[] = {" << keyword_list_old << ", nullptr};\n";
out << "#endif\n";
} else {
indent(out, indent_level)
<< "static const char *keyword_list[] = {" << keyword_list_new << ", nullptr};\n";
}
indent(out, indent_level)
<< "if (PyArg_ParseTupleAndKeywords(args, kwds, \""
<< format_specifiers << ":" << method_name

12
dtool/src/interrogatedb/py_panda.cxx
View File

@ -785,7 +785,11 @@ bool Dtool_ExtractArg(PyObject **result, PyObject *args, PyObject *kwds,
*result = PyTuple_GET_ITEM(args, 0);
return true;
}
} else if (PyTuple_GET_SIZE(args) == 0) {
}
else if (!keyword || !keyword[0]) {
return false;
}
else if (PyTuple_GET_SIZE(args) == 0) {
PyObject *key;
Py_ssize_t ppos = 0;
if (kwds != nullptr && PyDict_GET_SIZE(kwds) == 1 &&
@ -831,7 +835,11 @@ bool Dtool_ExtractOptionalArg(PyObject **result, PyObject *args, PyObject *kwds,
*result = PyTuple_GET_ITEM(args, 0);
return true;
}
} else if (PyTuple_GET_SIZE(args) == 0) {
}
else if (!keyword || !keyword[0]) {
return (kwds == nullptr || PyDict_GET_SIZE(kwds) == 0);
}
else if (PyTuple_GET_SIZE(args) == 0) {
if (kwds != nullptr && PyDict_GET_SIZE(kwds) == 1) {
PyObject *key;
Py_ssize_t ppos = 0;