TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

interrogate: Support explicit cls parameter for static methods

Browse Source
This commit is contained in:
rdb 2023-05-05 10:55:06 +02:00
parent 45fbfab094
commit 5d833c988a
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dtool/src/interrogate/functionRemap.cxx
View File

@ -479,6 +479,10 @@ get_call_str(const string &container, const vector_string &pexprs) const {
call << separator << "self"; call << separator << "self";
separator = ", "; separator = ", ";
} }
if (_flags & F_explicit_cls) {
call << separator << "cls";
separator = ", ";
}
size_t pn = _first_true_parameter; size_t pn = _first_true_parameter;
size_t num_parameters = pexprs.size(); size_t num_parameters = pexprs.size();
@ -807,14 +811,20 @@ setup_properties(const InterrogateFunction &ifunc, InterfaceMaker *interface_mak
first_param = 1; first_param = 1;
} }
if (_parameters.size() > first_param && _parameters[first_param]._name == "self" && if (_parameters.size() > first_param &&
TypeManager::is_pointer_to_PyObject(_parameters[first_param]._remap->get_orig_type())) { TypeManager::is_pointer_to_PyObject(_parameters[first_param]._remap->get_orig_type())) {
// Here's a special case. If the first parameter of a nonstatic method // Here's a special case. If the first parameter of a nonstatic method
// is a PyObject * called "self", then we will automatically fill it in // is a PyObject * called "self", then we will automatically fill it in
// from the this pointer, and remove it from the generated parameter // from the this pointer, and remove it from the generated parameter list.
// list. // For static methods, we offer "cls" instead, containing the type object.
_parameters.erase(_parameters.begin() + first_param); if (_parameters[first_param]._name == "self") {
_flags |= F_explicit_self; _parameters.erase(_parameters.begin() + first_param);
_flags |= F_explicit_self;
}
else if (!_has_this && _parameters[first_param]._name == "cls") {
_parameters.erase(_parameters.begin() + first_param);
_flags |= F_explicit_cls;
}
} }
if (_parameters.size() == first_param) { if (_parameters.size() == first_param) {

1
dtool/src/interrogate/functionRemap.h
View File

@ -101,6 +101,7 @@ public:
F_divide_float = 0x2000, F_divide_float = 0x2000,
F_hash = 0x4000, F_hash = 0x4000,
F_explicit_args = 0x8000, F_explicit_args = 0x8000,
F_explicit_cls =0x10000,
}; };
typedef std::vector<Parameter> Parameters; typedef std::vector<Parameter> Parameters;

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

@ -1669,7 +1669,11 @@ write_module_class(ostream &out, Object *obj) {
} }
if (!func->_has_this) { if (!func->_has_this) {
flags += " | METH_STATIC"; if (func->_flags & FunctionRemap::F_explicit_cls) {
flags += " | METH_CLASS";
} else {
flags += " | METH_STATIC";
}
// Skip adding this entry if we also have a property with the same name. // Skip adding this entry if we also have a property with the same name.
// In that case, we will use a Dtool_StaticProperty to disambiguate // In that case, we will use a Dtool_StaticProperty to disambiguate
@ -3527,6 +3531,9 @@ write_function_for_top(ostream &out, InterfaceMaker::Object *obj, InterfaceMaker
if (func->_has_this) { if (func->_has_this) {
prototype += "self"; prototype += "self";
} }
else if (func->_flags & FunctionRemap::F_explicit_cls) {
prototype += "cls";
}
switch (func->_args_type) { switch (func->_args_type) {
case AT_keyword_args: case AT_keyword_args: